1
0
Fork 0
Commit Graph

21 Commits

Author SHA1 Message Date
Oreste Panaia fd497eccae VS 2012-09-28 23:46:33 +08:00
Jan Steemann 4b16882b44 issue #131: make keep alive timeout configurable 2012-08-20 15:42:11 +02:00
Jan Steemann e47b44bedc more refactoring 2012-07-30 15:03:36 +02:00
Jan Steemann 886739a679 further refactoring of HttpServer 2012-07-30 14:48:12 +02:00
Jan Steemann 7af489934e some refactoring of http and https servers 2012-07-30 14:07:59 +02:00
Jan Steemann 59484b82ba added GeneralHttpServer template class 2012-07-30 12:25:25 +02:00
Jan Steemann 3b7b14454c added abstract EndpointServer, starting to combine ApplicationHttpServer and ApplicationHttpsServer 2012-07-27 15:38:27 +02:00
Jan Steemann 8d8044ba47 added proper SSL support for arangosh and arangoimp 2012-07-25 17:47:54 +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 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
Frank Celler 1df2799005 added --javascript.script
renamed --unit-tests to --javascript.unit-tests
2012-07-15 00:50:05 +02:00
Frank Celler fb4a7618e4 the great Scheduler & Dispatcher refactoring 2012-06-30 23:52:49 +02: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 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
Jan Steemann c858d39adc issue #115 2012-06-26 11:17:29 +02:00
Frank Celler 3fc8118904 cleanup ApplicationFeature 2012-06-20 20:52:15 +02:00
Frank Celler d2c758d663 the great rename 2012-06-08 15:01:25 +02:00