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

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

This commit is contained in:
Willi Goesgens 2015-01-14 17:20:27 +01:00
parent c641b2214b 7518f09895
commit 3a1a0b5c29
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -7,6 +7,8 @@ v2.5.0 (XXXX-XX-XX)
v2.4.1 (XXXX-XX-XX) v2.4.1 (XXXX-XX-XX)
------------------- -------------------
* fixed invalid result of HTTP REST API method `/_admin/foxx/rescan`
* fixed possible segmentation fault when passing a Buffer object into a V8 function * fixed possible segmentation fault when passing a Buffer object into a V8 function
as a parameter as a parameter

1
UnitTests/Makefile.unittests
View File

@ -447,6 +447,7 @@ SHELL_COMMON = \
@top_srcdir@/js/common/tests/shell-index.js \ @top_srcdir@/js/common/tests/shell-index.js \
@top_srcdir@/js/common/tests/shell-index-geo.js \ @top_srcdir@/js/common/tests/shell-index-geo.js \
@top_srcdir@/js/common/tests/shell-cap-constraint.js \ @top_srcdir@/js/common/tests/shell-cap-constraint.js \
@top_srcdir@/js/common/tests/shell-cap-constraint-timecritical.js \
@top_srcdir@/js/common/tests/shell-unique-constraint.js \ @top_srcdir@/js/common/tests/shell-unique-constraint.js \
@top_srcdir@/js/common/tests/shell-hash-index.js \ @top_srcdir@/js/common/tests/shell-hash-index.js \
@top_srcdir@/js/common/tests/shell-fulltext.js \ @top_srcdir@/js/common/tests/shell-fulltext.js \

2
js/actions/api-foxx.js
View File

@ -155,7 +155,7 @@ actions.defineHttp({
body: true, body: true,
callback: function () { callback: function () {
foxxManager.scanAppDirectory(); foxxManager.scanAppDirectory();
return true; return { };
} }
}) })
}); });

2
js/server/modules/org/arangodb/foxx/base_middleware.js
View File

@ -152,7 +152,7 @@ BaseMiddleware = function () {
/// ///
/// `request.requestParts()` /// `request.requestParts()`
/// ///
/// Returns a list containing the individual parts of a multi-part request. /// Returns an array containing the individual parts of a multi-part request.
/// Each part contains a `headers` attribute with all headers of the part, /// Each part contains a `headers` attribute with all headers of the part,
/// and a `data` attribute with the content of the part in a Buffer object. /// and a `data` attribute with the content of the part in a Buffer object.
/// If the request is not a multi-part request, this function will throw an /// If the request is not a multi-part request, this function will throw an