Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

This commit is contained in:
Heiko Kernbach 2013-05-22 22:33:38 +02:00
parent bebef82c74 dcf113ca99
commit a10c802c07
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arangod/V8Server/ApplicationV8.cpp
View File

@ -527,7 +527,7 @@ void ApplicationV8::setupOptions (map<string, basics::ProgramOptionsDescription>
("javascript.gc-frequency", &_gcFrequency, "JavaScript time-based garbage collection frequency (each x seconds)")
("javascript.action-directory", &_actionPath, "path to the JavaScript action directory")
("javascript.app-path", &_appPath, "one directory for applications")
("javascript.dev-app-path", &_devAppPath, "one directory for dev aaplications")
("javascript.dev-app-path", &_devAppPath, "one directory for dev applications")
("javascript.modules-path", &_modulesPath, "one or more directories separated by semi-colons")
("javascript.package-path", &_packagePath, "one or more directories separated by semi-colons")
("javascript.startup-directory", &_startupPath, "path to the directory containing alternate JavaScript startup scripts")

4
lib/HttpServer/ApplicationEndpointServer.cpp
View File

@ -230,8 +230,8 @@ void ApplicationEndpointServer::setupOptions (map<string, ProgramOptionsDescript
("server.cafile", &_cafile, "file containing the CA certificates of clients")
("server.ssl-protocol", &_sslProtocol, "1 = SSLv2, 2 = SSLv23, 3 = SSLv3, 4 = TLSv1")
("server.ssl-cache", &_sslCache, "use SSL session caching")
("server.ssl-options", &_sslOptions, "ssl options, see OpenSSL documentation")
("server.ssl-cipher-list", &_sslCipherList, "ssl cipher list, see OpenSSL documentation")
("server.ssl-options", &_sslOptions, "SSL options, see OpenSSL documentation")
("server.ssl-cipher-list", &_sslCipherList, "SSL cipher list, see OpenSSL documentation")
;
}

5
lib/Zip/ioapi.h
View File

@ -21,6 +21,11 @@
#ifndef _ZLIBIOAPI64_H
#define _ZLIBIOAPI64_H
#ifdef _Z_OF
#undef OF
#define OF _Z_OF
#endif
#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__))
// Linux needs this to support file operation on files larger then 4+GB