diff options
| -rw-r--r-- | apps/couch/CHANGES | 4 | ||||
| -rw-r--r-- | apps/couch/NEWS | 4 | ||||
| -rw-r--r-- | couchjs/c_src/help.h | 2 | ||||
| -rw-r--r-- | couchjs/c_src/http.c | 12 | ||||
| -rw-r--r-- | couchjs/c_src/sm185.c | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/apps/couch/CHANGES b/apps/couch/CHANGES index 0c619ab9..8e89305f 100644 --- a/apps/couch/CHANGES +++ b/apps/couch/CHANGES @@ -4,8 +4,7 @@ Apache CouchDB CHANGES Version 1.1.1 ------------- -This version has not been released yet. - +* Support SpiderMonkey 1.8.5 * Add configurable maximum to the number of bytes returned by _log. * Allow CommonJS modules to be an empty string. * Bump minimum Erlang version to R13B02. @@ -29,6 +28,7 @@ This version has not been released yet. * Fix replication crash when source database has a document with empty ID. * Fix deadlock when assigning couchjs processes to serve requests. * Fixes to the document multipart PUT API. +* Fixes regarding file descriptor leaks for databases with views. Version 1.1.0 ------------- diff --git a/apps/couch/NEWS b/apps/couch/NEWS index 13e6ac56..e62289ed 100644 --- a/apps/couch/NEWS +++ b/apps/couch/NEWS @@ -10,8 +10,7 @@ Each release section notes when backwards incompatible changes have been made. Version 1.1.1 ------------- -This version has not been released yet. - +* Support SpiderMonkey 1.8.5 * Add configurable maximum to the number of bytes returned by _log. * Allow CommonJS modules to be an empty string. * Bump minimum Erlang version to R13B02. @@ -35,6 +34,7 @@ This version has not been released yet. * Fix replication crash when source database has a document with empty ID. * Fix deadlock when assigning couchjs processes to serve requests. * Fixes to the document multipart PUT API. +* Fixes regarding file descriptor leaks for databases with views. Version 1.1.0 ------------- diff --git a/couchjs/c_src/help.h b/couchjs/c_src/help.h index 84c83c06..c42c9f59 100644 --- a/couchjs/c_src/help.h +++ b/couchjs/c_src/help.h @@ -51,7 +51,7 @@ static const char USAGE_TEMPLATE[] = " -H enable %s cURL bindings (only avaiable\n" " if package was built with cURL available)\n" " -S SIZE specify that the interpreter should set the\n" - " the stack quota for JS contexts to SIZE bytes\n" + " stack quota for JS contexts to SIZE bytes\n" "\n" "Report bugs at <%s>.\n"; diff --git a/couchjs/c_src/http.c b/couchjs/c_src/http.c index aa21515c..44df3a33 100644 --- a/couchjs/c_src/http.c +++ b/couchjs/c_src/http.c @@ -181,7 +181,7 @@ http_open(JSContext* cx, JSObject* req, jsval mth, jsval url, jsval snc) goto done; } - if(mth == JSVAL_VOID) { + if(JSVAL_IS_VOID(mth)) { JS_ReportError(cx, "You must specify a method."); goto done; } @@ -203,7 +203,7 @@ http_open(JSContext* cx, JSObject* req, jsval mth, jsval url, jsval snc) http->method = methid; - if(url == JSVAL_VOID) { + if(JSVAL_IS_VOID(url)) { JS_ReportError(cx, "You must specify a URL."); goto done; } @@ -219,7 +219,7 @@ http_open(JSContext* cx, JSObject* req, jsval mth, jsval url, jsval snc) goto done; } - if(snc != JSVAL_FALSE) { + if(JSVAL_IS_BOOLEAN(snc) && JSVAL_TO_BOOLEAN(snc)) { JS_ReportError(cx, "Synchronous flag must be false."); goto done; } @@ -255,7 +255,7 @@ http_set_hdr(JSContext* cx, JSObject* req, jsval name, jsval val) goto done; } - if(name == JSVAL_VOID) + if(JSVAL_IS_VOID(name)) { JS_ReportError(cx, "You must speciy a header name."); goto done; @@ -268,7 +268,7 @@ http_set_hdr(JSContext* cx, JSObject* req, jsval name, jsval val) goto done; } - if(val == JSVAL_VOID) + if(JSVAL_IS_VOID(val)) { JS_ReportError(cx, "You must specify a header value."); goto done; @@ -313,7 +313,7 @@ http_send(JSContext* cx, JSObject* req, jsval body) goto done; } - if(body != JSVAL_VOID && body != JS_GetEmptyStringValue(cx)) { + if(!JSVAL_IS_VOID(body)) { bodystr = enc_string(cx, body, &bodylen); if(!bodystr) { JS_ReportError(cx, "Failed to encode body."); diff --git a/couchjs/c_src/sm185.c b/couchjs/c_src/sm185.c index 9815f15c..a7258460 100644 --- a/couchjs/c_src/sm185.c +++ b/couchjs/c_src/sm185.c @@ -310,7 +310,7 @@ main(int argc, const char* argv[]) JSObject* global = NULL; JSCrossCompartmentCall *call = NULL; JSObject* klass = NULL; - JSObject* script; + JSSCRIPT_TYPE script; JSString* scriptsrc; const jschar* schars; size_t slen; |