1
0
Fork 0
Commit Graph

349 Commits

Author SHA1 Message Date
Guido Reina 528bb85b30 Implemented function for shutting down the statistics.
The new function is called by ShutdownRest() and releases the memory allocated by TRI_InitialiseStatistics().
2013-05-01 11:03:40 +02:00
a-brandt 7a0a9ff3b4 Merge branch 'devel' of github.com:triAGENS/ArangoDB into multiple_databases 2013-04-22 14:53:33 +02:00
Jan Steemann 4527348f71 changed text on startup 2013-04-22 08:38:08 +02:00
a-brandt fcae2b2961 added RequestContext 2013-04-17 16:56:48 +02:00
a-brandt 4675dcc036 added negative expire time 2013-04-10 17:09:14 +02:00
a-brandt 2d8c547fc8 added cookie support 2013-04-10 16:23:42 +02:00
Jan Steemann ce4ec381fc updated list of HTTP status codes 2013-04-05 11:28:06 +02:00
Frank Celler f810711a79 FreeBSD port 2013-04-02 18:43:10 +02:00
Frank Celler 557184631d more fox-manager, added files section 2013-03-26 13:58:00 +01:00
Jan Steemann 124d7cb29f fixed file uploads 2013-03-24 18:13:13 +01:00
Frank Celler 891cac01b2 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	arangod/VocBase/collection.c
2013-03-13 17:05:59 +01:00
Frank Celler 1aa5109fa3 updated disclaimer 2013-03-13 17:03:18 +01:00
a-brandt 62b72d17a1 #344 added missing support of array-url-parameters 2013-03-13 14:20:01 +01:00
Jan Steemann cd5a675f62 fixed making arangoirb 2013-03-11 09:39:42 +01:00
Jan Steemann b66a7492b9 addendum for issue #443 2013-03-08 22:30:35 +01:00
Jan Steemann 99630450c2 removed checks for TRI_HAVE_ICU because ICU is a prerequisite for using ArangoDB 2013-03-08 16:03:54 +01:00
Frank Celler 60037971dc rewrote statistics 2013-03-03 22:39:41 +01:00
Oreste Panaia fc5e1ba623 merge conflicts with devel 2013-02-28 19:42:58 +08:00
Oreste Panaia a48696ec28 network modifications required for windows 2013-02-28 17:43:39 +08:00
Frank Celler fe9f10af8d Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.2
Conflicts:
	CHANGELOG
	Documentation/Manual/arangodb_1.2_shell_reference_card.pdf
	Makefile.in
	aclocal.m4
	config/compile
	config/config.guess
	config/config.sub
	config/depcomp
	config/missing
	configure
	lib/JsonParser/json-parser.c
2013-02-21 14:21:59 +01:00
Frank Celler 2553b572ab fixed mode 2013-02-21 14:14:20 +01:00
Jan Steemann 3fdebb38ee issue #393, issue #128
Added a REST API for user management
The REST API exposes the functionality available in module "users" for HTTP access.

The following methods are available:
* GET /_api/user/username: fetch user information
* POST /_api/user: create new user
* PUT /_api/user: replace an existing user
* PATCH /_api/user: (partially) update an existing user
* DELETE /_api/user: remove an existing user

Additionally, a module "crypto" is introduced and exposed for Javascript actions.
The crypto module provides the following functions:
* require("org/arangodb/crypto").md5();
* require("org/arangodb/crypto").sha256();
* require("org/arangodb/crypto").rand();
2013-02-20 11:56:26 +01:00
Oreste Panaia 2c12f63d7f libev interface 2013-02-19 20:58:21 +08:00
Jan Steemann 382047dbd6 issue #404 2013-02-18 14:28:19 +01:00
Frank Celler 45c815b7eb fixed issue #403: Usage of exit() etc. 2013-02-15 12:19:09 +01:00
Frank Celler cf9a942417 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	CHANGELOG
2013-02-15 11:52:53 +01:00
Frank Celler e4d1c8a6bd partly fix for issue #333: [debian] Group arangodb is not used when starting vie init.d script 2013-02-15 11:50:05 +01:00
Jan Steemann d321f32523 moved some const value out of loop 2013-02-15 11:35:48 +01:00
Frank Celler 069dcdfc94 changed logging of fatal errors 2013-02-14 16:47:35 +01:00
Jan Steemann 5e6b73e2d3 do not close descriptors 2013-02-06 10:16:57 +01:00
Oreste Panaia 3c8093849a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-01-31 00:07:19 +08:00
Oreste Panaia e0b7fbbf8d windows icu 2013-01-31 00:04:20 +08:00
Jan Steemann e8b0a548d6 removed tabs 2013-01-28 13:48:20 +01:00
Jan Steemann 17098dd4ef added support for HTTP OPTIONS method, pt 1 2013-01-25 19:11:33 +01:00
Jan Steemann a27387e2ca comment about HTTP HEAD response 2013-01-23 18:03:34 +01:00
Jan Steemann 5d093576e2 fix a few -pedantic errors 2013-01-23 08:58:54 +01:00
Frank Celler 7380ddfabe Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	arangosh/V8Client/arangosh.cpp
	bin/arango32.msi
	bin/arango64.msi
	lib/BasicsC/win-utils.c
2013-01-15 15:50:47 +01:00
Oreste Panaia c01a5c6275 arango shell and import 2013-01-14 20:16:09 +08:00
Frank Celler 503e0ff8fe fixed merge conflicts 2013-01-02 18:07:57 +01:00
Frank Celler d5f24ce13c Merge remote-tracking branch 'origin/windows' into HEAD
Conflicts:
	CHANGELOG
	Documentation/InstallationManual/Installing.md
	Documentation/Makefile.files
	Documentation/Scripts/generateTOC.py
	Documentation/header.html
	Installation/OBS/clean-repo.sh
	Installation/OBS/create-repo.sh
	Installation/OBS/create-ymp.sh
	Installation/OBS/index.html
	Installation/OBS/load-repo.sh
	Makefile.in
	VERSION
	aclocal.m4
	arangod/Ahuacatl/ahuacatl-functions.c
	arangod/Documentation/user-manual.dox
	arangod/V8Server/v8-actions.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/collection.c
	arangod/VocBase/datafile.c
	arangosh/V8Client/arangosh.cpp
	config/compile
	config/config.guess
	config/config.sub
	config/depcomp
	config/install-sh
	config/missing
	configure
	configure.ac
	js/server/arango-upgrade.js
	js/server/modules/org/arangodb/actions.js
	lib/BasicsC/logging.c
	lib/Utilities/ScriptLoader.cpp
2012-12-20 11:11:47 +01:00
Oreste Panaia 83ded3fc1f windows fixes 2012-12-20 17:17:30 +08:00
Achim Brandt 143f7675ee avoid Valgrind warning 2012-12-18 12:33:43 +01:00
Jan Steemann 9155b400c2 some fixes for readline 2012-12-18 12:25:04 +01:00
Jan Steemann 9a9e8c3214 added test case for absolute path 2012-12-10 15:39:57 +01:00
Jan Steemann b16f672902 fixed some log errors on startup & shutdown 2012-12-10 15:18:35 +01:00
Oreste Panaia 857b66c490 windows version 2012-12-06 20:44:01 +08:00
Jan Steemann 242a16d6f5 proper naming of ICU functions 2012-12-06 12:27:22 +01:00
Jan Steemann 3882129fad unused 2012-12-04 21:23:42 +01:00
Frank Celler 249492a89c Merge remote-tracking branch 'origin/1.1' into devel
Conflicts:
	CHANGELOG
	Documentation/Manual/GlossaryCollectionName.md
	Documentation/Manual/NewFeatures11.md
	Documentation/UserManual/FirstStepsArangoDB.md
	VERSION
	arangod/Documentation/api-blueprints.dox
	arangod/HashIndex/hasharray.c
	arangod/RestHandler/RestVocbaseBaseHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/v8-actions.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/compactor.c
	arangod/VocBase/document-collection.c
	configure.ac
	html/admin/js/master.js
	js/server/ahuacatl.js
	js/server/arango-upgrade.js
	lib/BasicsC/voc-errors.h
	lib/V8/V8LineEditor.cpp
	lib/V8/v8-utils.cpp
2012-11-27 12:34:58 +01:00
Jan Steemann e7f8543d81 moved documentation changes from 1.1 to devel 2012-11-23 10:18:47 +01:00
Frank Celler cccb3511c5 fixed documentation again 2012-11-21 17:42:13 +01:00
Frank Celler 18bfd048ef fixed documentation 2012-11-21 10:58:29 +01:00
Jan Steemann b416bc1a4b removed JsonContainer, introduced more general ResourceHolder class 2012-11-16 13:29:19 +01:00
a-brandt cf89b42da9 added missing url decode and utf8 normalize 2012-11-14 13:35:20 +01:00
Oreste Panaia 4d8d78e880 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	VisualStudio/Arango Front End Library/Arango Front End Library.vcxproj
	arangod/Actions/RestActionHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	lib/ApplicationServer/ApplicationServer.cpp
2012-10-22 21:04:12 +08:00
Oreste Panaia aad73db128 various changes for windows 2012-10-22 20:51:31 +08:00
Frank Celler 3b5a0967bc Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	CHANGELOG
	Documentation/Makefile.files
	Installation/build.sh
	arangod/Documentation/communication.dox
	arangod/HashIndex/hasharray.c
	arangod/HashIndex/hashindex.c
	lib/Rest/Endpoint.cpp
	lib/Rest/Endpoint.h
	lib/Rest/EndpointIp.h
	lib/Rest/EndpointIpV4.h
	lib/Rest/EndpointIpV6.h
	lib/Rest/EndpointUnixDomain.cpp
2012-10-20 22:37:25 +02:00
Frank Celler e8093d68fe upgraded to Doxygen 1.8.x 2012-10-18 16:38:20 +02:00
Jan Steemann d2d7896846 moved classes to separate files 2012-10-17 15:23:10 +02:00
a-brandt 33a463e4d1 Merge branch '1.1' of github.com:triAGENS/ArangoDB into 1.1 2012-10-17 10:28:43 +02:00
a-brandt 45c0f7d937 updates 2012-10-17 10:27:50 +02:00
a-brandt 38fc1d21f5 bugfix IPv6 addresses 2012-10-17 10:23:03 +02:00
Achim Brandt 5c3e10de70 bugfix IPv6 endpoint 2012-10-16 21:14:18 +02:00
Frank Celler f1eaaa7f04 fixed doc issue, doxygen sometimes does not recognize the used namespace 2012-10-16 17:34:54 +02:00
Jan Steemann 7fc079d30a merge several fixes from devel into 1.1 2012-10-16 11:44:39 +02:00
Jan Steemann 29571a2e3a issue #231: handle more client error cases 2012-10-16 11:33:49 +02:00
Jan Steemann 1b93b7379a issue #231: handle some obviously invalid requests 2012-10-15 19:10:00 +02:00
Jan Steemann d23555cfe1 issue #231: handle some obviously invalid requests 2012-10-15 19:09:01 +02:00
Jan Steemann 224e37a1ba fix some memory issues 2012-10-11 22:49:46 +02:00
Jan Steemann 97723bbdf6 removed --enable-ssl configure option
having OpenSSL installed is now a requirement for compiling ArangoDB
2012-10-10 14:55:18 +02:00
Jan Steemann 994a3e3424 issue #224: allow optional content-id for batches
this allows clients to send a content-id for each batch part
the server will return the content-id in each part response so the client can more easily map requests and responses

the content-id will not be validated or checked for uniqueness by the server. it is up to the client to send sensible content-ids to the server
currently, the server will not store the content-ids anywhere. they are just used within one batch request and then "forgotten"
2012-10-09 14:50:20 +02:00
Oreste Panaia aac17f7b55 wrapper for memory mapped files add 2012-10-05 18:31:13 +08:00
Oreste Panaia fd497eccae VS 2012-09-28 23:46:33 +08:00
Jan Steemann 3801d6df8a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-28 11:58:45 +02:00
Oreste Panaia 928ee5525a Don't ask 2012-09-28 18:53:17 +08:00
Oreste Panaia 6bdf3ae565 usual mysteries with git
Conflicts:
	lib/Rest/Endpoint.cpp
2012-09-28 17:56:05 +08:00
Oreste Panaia 2a71a3c371 minor changes for windows compatability 2012-09-28 17:34:22 +08:00
Jan Steemann 66d91c4677 also allow \n as delimiters 2012-09-28 11:32:42 +02:00
Jan Steemann c7b2c506af added startup option --server.backlog-size 2012-09-27 17:06:24 +02:00
Jan Steemann bcd521f44f removed unused subclass HttpRequestPlain. we only have HttpRequest from now on 2012-09-27 11:24:20 +02:00
Jan Steemann 5a4a1b5fce added test cases, removed class HttpResponsePart 2012-09-27 11:04:15 +02:00
Oreste Panaia a4d551653d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-26 19:11:18 +08:00
Oreste Panaia ba63b36b53 With git you never know 2012-09-26 19:10:48 +08:00
Jan Steemann 210bfe7771 generalised arangob test cases 2012-09-26 10:29:32 +02:00
Jan Steemann 6def99c226 changed method visibility, cleanup 2012-09-26 09:32:42 +02:00
Jan Steemann a57a7bdb8a micro optimisations (root of all ...) 2012-09-25 19:08:00 +02:00
Jan Steemann 0619c9960c fixed arangob for batch requests 2012-09-25 11:46:15 +02:00
Jan Steemann bf7ddd5356 added X-Arango headers 2012-09-25 09:41:29 +02:00
Jan Steemann 4ad85e7037 added HttpResponsePart class 2012-09-24 16:59:19 +02:00
Jan Steemann f08a788f7c removed protocol buffers 2012-09-24 13:44:30 +02:00
Jan Steemann bea699b734 some fix for json conversion 2012-09-21 09:26:53 +02:00
Jan Steemann 18cd515737 added protobuf to json converter 2012-09-20 18:14:00 +02:00
Jan Steemann 29778d0b4d added binary client 2012-09-19 18:03:43 +02:00
Jan Steemann 7bd8063468 before adding binary protocol 2012-09-19 15:48:24 +02:00
Frank Celler 5c32ae5869 removed boost exceptions 2012-09-13 15:09:02 +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 f812c6bd04 use caps, log warning when using unknown HTTP response codes 2012-09-10 22:06:22 +02:00
Jan Steemann a02905d12a use caps 2012-09-10 22:04:17 +02:00
Jan Steemann 4dd8f64d87 fixed incorrect response message for HTTP 405 2012-09-10 22:01:16 +02:00
Jan Steemann 442c033122 start statistics thread even in supervisor mode 2012-09-07 15:29:30 +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 d602942925 preparation for issue #110: added HTTP patch method 2012-08-20 13:50:24 +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
Frank Celler 69a8e64f9b Merge branch 'master' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	.gitignore
	Makefile.in
	Makefile.local
	Makefile.unittests
2012-08-09 15:25:29 +02:00
Frank Celler aef20e2887 Merge branch 'master' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	Makefile.local
	arangod/Documentation/command-line-options.dox
	arangod/RestServer/ArangoServer.cpp
	build.sh
	html/admin/js/master.js
2012-08-05 22:46:55 +02:00
Frank Celler 85ff668369 fixed pid removal 2012-08-05 20:41:46 +02:00
Frank Celler 640e2a3587 fixed pid file 2012-08-03 12:58:59 +02:00
Jan Steemann 590855f633 made BatchJob and BatchSubjob template classes, fixed unittests 2012-07-31 11:00:05 +02:00
Jan Steemann cf47541e1e added debug output 2012-07-27 13:52:18 +02:00
Jan Steemann a2ddf69ba3 unit test for Endpoint classes 2012-07-26 16:41:45 +02:00
Jan Steemann 8d8044ba47 added proper SSL support for arangosh and arangoimp 2012-07-25 17:47:54 +02:00
Jan Steemann ceda8b686a ssl connections 2012-07-25 15:08:17 +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 9a72ea4496 added https@ and http@ endpoints, https still unfinished 2012-07-23 17:32:59 +02:00
Jan Steemann a40b1ed511 renamed classes 2012-07-23 15:58:08 +02:00
Jan Steemann dca96749ff default value cleanup 2012-07-23 15:39:52 +02:00
Jan Steemann c079eda53b fixed doxygen errors 2012-07-23 15:24:53 +02:00
Jan Steemann ac0e4c1f59 removed AddressPort class 2012-07-23 14:04:58 +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 743a025e67 added EndpointSpecification classes 2012-07-20 14:51:03 +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 5ffff9edc4 added process title for supervisor 2012-07-11 10:46:04 +02:00
Frank Celler 58d29a78ef fixed privileges 2012-07-10 18:27:50 +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
Jan Steemann 75bd9acfba fixed some things in the batch handler 2012-06-27 15:19:09 +02:00
Jan Steemann 5cbc0ad3c7 added some error messages when using --pid-file 2012-06-27 11:38:43 +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 5b07a9dea6 removed ZeroMQ / ProtoBuf coupling 2012-06-25 16:24:43 +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 f100e2ad82 changed async task handling 2012-06-21 16:32:54 +02:00
Frank Celler a10151c26a added handler factory 2012-06-19 16:26:51 +02:00
Frank Celler a3dae7083b ZeroMQ batch job and threads 2012-06-19 12:01:05 +02:00
Frank Celler 20e022125f added HttpRequestProtobuf 2012-06-17 21:50:03 +02:00
Frank Celler 704f921d0f new HttpRequest 2012-06-14 15:03:17 +02:00
Frank Celler 02e8d7382f trying to get an abstact class for HttpRequest 2012-06-13 23:29:27 +02:00
Frank Celler 54826adb83 cleanup HttpRequest as prep for ZeroMQ 2012-06-13 21:51:27 +02:00
Frank Celler dd7fa848c0 alternative version if mruby supports define_method and attrib_reader 2012-06-12 17:28:53 +02:00
Frank Celler a92cd9ffd2 preparations for ZeroMQ, removed Scheduler and Dispatcher from ApplicationServer 2012-06-12 17:10:49 +02:00
Frank Celler d2c758d663 the great rename 2012-06-08 15:01:25 +02:00