1
0
Fork 0
Commit Graph

199 Commits

Author SHA1 Message Date
Jan Steemann 243aa0242c removed ApplicationHttpsServer 2012-07-27 15:59:58 +02:00
Jan Steemann 3b7b14454c added abstract EndpointServer, starting to combine ApplicationHttpServer and ApplicationHttpsServer 2012-07-27 15:38:27 +02:00
Jan Steemann 570e0a5189 virtual 2012-07-27 11:41:37 +02:00
Jan Steemann 4f2229124f added --server.disable-authentication option 2012-07-26 08:49:56 +02:00
Jan Steemann 435a01b6b3 added authorization for arangosh and arangoimp 2012-07-25 19:49:52 +02:00
Jan Steemann 8d8044ba47 added proper SSL support for arangosh and arangoimp 2012-07-25 17:47:54 +02:00
Frank Celler 97ff940736 fixed merge 2012-07-24 23:07:31 +02:00
Frank Celler 4605fbba9a Merge branch '1.1' of github.com:triAGENS/ArangoDB into 1.1
Conflicts:
	CHANGELOG
	Doxygen/Examples.ArangoDB/startup1
	Makefile.in
	arangod/Documentation/command-line-options.dox
	arangod/Documentation/install-manual.dox
	arangod/Makefile.files
	arangod/RestServer/ArangoServer.cpp
	arangod/VocBase/auth.h
	arangosh/V8Client/arangosh.cpp
	html/admin/css/layout.css
	lib/Basics/ssl-helper.h
	lib/HttpServer/ApplicationHttpServer.cpp
	lib/HttpServer/ApplicationHttpServer.h
	lib/HttpServer/HttpServer.cpp
	lib/HttpsServer/ApplicationHttpsServer.cpp
	lib/HttpsServer/ApplicationHttpsServer.h
2012-07-24 22:56:03 +02:00
Frank Celler 041eb53b10 Merge branch '1.0' of github.com:triAGENS/ArangoDB into 1.1
Conflicts:
	Makefile.in
	arangod/RestServer/ArangoServer.cpp
	arangoirb/MRClient/arangoirb.cpp
	lib/GeneralServer/GeneralServer.h
	lib/HttpServer/ApplicationHttpServer.cpp
	lib/HttpServer/HttpCommTask.cpp
	lib/HttpServer/HttpHandler.cpp
	lib/HttpServer/HttpHandlerFactory.cpp
	lib/HttpServer/HttpHandlerFactory.h
	lib/HttpsServer/ApplicationHttpsServer.cpp
2012-07-24 22:19:46 +02:00
Jan Steemann 33839809ab ssl 2012-07-23 18:17:45 +02:00
Jan Steemann 4e6c8024f6 added support for unix sockets, switched connection strings to endpoint syntax 2012-07-23 13:54:35 +02:00
Jan Steemann 07595218eb removed non-existing class 2012-07-20 12:26:49 +02:00
Jan Steemann 824206dd54 removed server startup options --server.require-keep-alive and --server.secure-require-keep-alive, small optimisations for HTTP request parsing and response header handling 2012-07-18 12:13:12 +02:00
Jan Steemann 6a4cb8625f further implementation of batch processing, still has segfaults 2012-07-16 17:53:04 +02:00
Jan Steemann 83f018e9ad batch job code can now be compiled without errors but still does not work 2012-07-16 13:23:39 +02:00
Frank Celler f7e1388e93 updated documentation 2012-07-15 17:31:59 +02:00
Frank Celler a02faec3a3 added basic authentication 2012-07-15 17:06:59 +02:00
Frank Celler 1df2799005 added --javascript.script
renamed --unit-tests to --javascript.unit-tests
2012-07-15 00:50:05 +02:00
Frank Celler 58d29a78ef fixed privileges 2012-07-10 18:27:50 +02:00
Frank Celler 3612c93cf0 fixed race condition 2012-07-09 16:41:31 +02:00
Frank Celler ab4d52963e fixed statistics: no deviation for request-statistics, distribution for connection-statistics 2012-07-09 15:24:28 +02:00
Frank Celler 957bc347dc added connection statistics 2012-07-05 17:48:12 +02:00
Jan Steemann 82ca4f24ce fixed compile errors 2012-07-04 23:22:07 +02:00
Frank Celler 935926bd8b added statistics 2012-07-03 16:34:49 +02:00
Frank Celler e9e4e555a3 fixed uninit mem 2012-07-01 17:39:52 +02:00
Frank Celler 479cb7b8b8 fixed shutdown 2012-07-01 14:10:01 +02:00
Frank Celler d0459a0851 new HttpServer & co implementation 2012-07-01 11:17:16 +02:00
Frank Celler fb4a7618e4 the great Scheduler & Dispatcher refactoring 2012-06-30 23:52:49 +02:00
Oreste Panaia 9a8c0a4cd0 still trying to get this code up to github (maybe one day) 2012-06-27 14:43:00 +08:00
Frank Celler f35a0dc67f Merge branch 'master' of github.com:fceller/ArangoDB into devel
Conflicts:
	lib/HttpServer/HttpHandler.cpp
2012-06-26 23:23:33 +02:00
Jan Steemann aa282cfcf9 some cleanup to reduce diff size 2012-06-26 17:25:25 +02:00
Jan Steemann af73c747a3 some cleanup to reduce diff size 2012-06-26 17:18:40 +02:00
Jan Steemann 3f36f50baf whitespace etc. to reduce diff size 2012-06-26 16:50:04 +02:00
Frank Celler 6d21cbc1c3 removed duplicate includes 2012-06-26 12:07:54 +02:00
Frank Celler 0bde0c1c00 Merge branch 'master' of github.com:triAGENS/ArangoDB 2012-06-26 12:04:32 +02:00
Jan Steemann c858d39adc issue #115 2012-06-26 11:17:29 +02:00
Frank Celler be421504ab added missing include for CLANG 2012-06-26 10:37:59 +02:00
Frank Celler af60ebe612 fixed doc errors 2012-06-24 16:43:20 +02:00
Frank Celler f99409f146 fixed unregistering of handlers 2012-06-22 17:08:52 +02:00
Frank Celler 4e6f4a74a6 fixed memory leaks 2012-06-22 13:38:55 +02:00
Frank Celler 37d3ad8dc2 Merge branch 'devel' of github.com:triAGENS/ArangoDB
Conflicts:
	Makefile.in
	arangod/RestServer/ArangoServer.cpp
	arangod/RestServer/JavascriptDispatcherThread.cpp
	lib/Dispatcher/DispatcherQueue.cpp
	lib/HttpServer/HttpCommTask.cpp
2012-06-21 23:17:48 +02:00
Jan Steemann 074d0538e9 removed bogus FIXME comments 2012-06-21 16:46:57 +02:00
Jan Steemann f100e2ad82 changed async task handling 2012-06-21 16:32:54 +02:00
Frank Celler 3fc8118904 cleanup ApplicationFeature 2012-06-20 20:52:15 +02:00
Frank Celler 0e7d6f8f2a added prepare and open 2012-06-19 23:20:33 +02:00
Frank Celler 704f921d0f new HttpRequest 2012-06-14 15:03:17 +02:00
Frank Celler a92cd9ffd2 preparations for ZeroMQ, removed Scheduler and Dispatcher from ApplicationServer 2012-06-12 17:10:49 +02:00
Frank Celler 55ebf00dbd Merge branch 'devel' of github.com:triAGENS/ArangoDB
Conflicts:
	Actions/RestActionHandler.cpp
	Actions/RestActionHandler.h
	Makefile.files
	Makefile.in
	RestHandler/RestActionHandler.cpp
	RestHandler/RestActionHandler.h
	RestServer/ActionDispatcherThread.cpp
	RestServer/ActionDispatcherThread.h
	RestServer/RubyDispatcherThread.cpp
	RestServer/RubyDispatcherThread.h
	arangod/RestHandler/RestActionHandler.cpp
	arangod/RestHandler/RestActionHandler.h
	arangod/RestServer/ActionDispatcherThread.cpp
	arangod/RestServer/ActionDispatcherThread.h
	arangod/RestServer/ArangoServer.cpp
2012-06-08 15:57:33 +02:00
Frank Celler d2c758d663 the great rename 2012-06-08 15:01:25 +02:00