1
0
Fork 0
Commit Graph

74 Commits

Author SHA1 Message Date
Jan Steemann 9bc99b7c9d renamed document collection to primary collection 2012-09-14 10:19:41 +02:00
Jan Steemann 3deebd06de fixed authentication 2012-09-13 14:19:26 +02:00
Frank Celler 49b19e4657 Merge branch 'devel' of github.com:triAGENS/ArangoDB
Conflicts:
	lib/BasicsC/terminal-utils-posix.c
	lib/BasicsC/terminal-utils.c
	lib/SimpleHttpClient/SimpleHttpResult.cpp
2012-09-12 23:49:14 +02:00
Frank Celler e8089d86a7 removed user manager 2012-09-12 23:37:39 +02:00
Jan Steemann f8deb40580 issue #193: REST API HEAD request returns a message body on 404 2012-09-11 00:11:26 +02:00
Jan Steemann dff40494c3 issue #175: add hidden option --server.http-port for downwards compatibility 2012-08-31 18:21:34 +02:00
Frank Celler d26b082ef6 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	CHANGELOG
	Makefile.in
	UnitTests/Makefile.files
2012-08-24 09:59:16 +02:00
Jan Steemann b36776efb3 issue #110: add PATCH method for documents 2012-08-20 19:16:45 +02:00
Jan Steemann 4b16882b44 issue #131: make keep alive timeout configurable 2012-08-20 15:42:11 +02:00
Frank Celler fa41864b7a Merge remote-tracking branch 'origin/1.0' into devel
Conflicts:
	Installation/MacOSX/MacPorts/arango.conf
	Installation/arangod.conf.in
	Makefile.in
	arangod/RestServer/ArangoServer.h
	configure
	lib/V8/v8-utils.cpp
2012-08-18 09:00:43 +02:00
Jan Steemann 590855f633 made BatchJob and BatchSubjob template classes, fixed unittests 2012-07-31 11:00:05 +02:00
Jan Steemann 6b5b2cdea7 removed dependency on scheduler 2012-07-30 17:17:30 +02:00
Jan Steemann 020480bfe7 binary listeners are now started, but do not work 2012-07-30 16:01:25 +02:00
Jan Steemann 5c24872306 moved endpoint option parsing into ApplicationEndpointServer class 2012-07-30 15:50:34 +02:00
Jan Steemann acdfbf8a20 more refactoring 2012-07-30 15:37:54 +02:00
Jan Steemann 2d480a4350 added binary servers 2012-07-30 15:33:19 +02:00
Jan Steemann e47b44bedc more refactoring 2012-07-30 15:03:36 +02:00
Jan Steemann 603747b024 refactoring 2012-07-30 14:56:02 +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 ddc8703d54 renamed HttpsAsyncCommTask to SslAsyncCommTask 2012-07-30 08:39:21 +02:00
Jan Steemann 404a80bc84 moved files from HttpsServer to HttpServer directory 2012-07-30 08:32:53 +02:00
Jan Steemann 9d87988bf5 renamed ApplicationHttpServer to ApplicationEndpointServer 2012-07-30 08:26:16 +02:00
Frank Celler 818b6d9ec2 datafile debugger 2012-07-28 09:32:45 +02:00
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