Update of /cvsroot/monetdb/pathfinder/runtime
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv7764/runtime
Modified Files:
Tag: M5XQ
xrpc_server.mx
Log Message:
propagated changes of Wednesday Jul 22 2009
from the development trunk to the M5XQ branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/07/22 - sjoerd: runtime/xrpc_server.mx,1.90
propagated changes of Tuesday Jul 21 2009 - Wednesday Jul 22 2009
from the May2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/07/21 - yingying: runtime/xrpc_server.mx,1.89.4.1
Return correct HTTP status code for 'Bad Request', i.e., 400, i.s.o. 404
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
U xrpc_server.mx
Index: xrpc_server.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/xrpc_server.mx,v
retrieving revision 1.89
retrieving revision 1.89.2.1
diff -u -d -r1.89 -r1.89.2.1
--- xrpc_server.mx 17 Mar 2009 15:09:11 -0000 1.89
+++ xrpc_server.mx 22 Jul 2009 07:45:52 -0000 1.89.2.1
@@ -270,7 +270,7 @@
bit verbose = FALSE;
if(!reqmsg){
- send_err(out, ERR404, "env:Sender", "No request message!");
+ send_err(out, ERR400, "env:Sender", "No XRPC request message found in
the HTTP message body!");
return NULL;
}
@@ -280,7 +280,7 @@
strptr = reqmsg + 7; /* strlen("<?xml...?>") >= 7 */
if( (strstr(reqmsg, "<?xml") != reqmsg) ||
(strptr = strchr(strptr, (int)'<')) == NULL ) {
- send_err(out, ERR404, "env:Sender", NOT_WELL_FORMED);
+ send_err(out, ERR400, "env:Sender", NOT_WELL_FORMED);
return NULL;
}
if (!(shredBAT = BATnew(TYPE_str, TYPE_bat, 32))) {
@@ -289,7 +289,7 @@
}
if( CMDshred_str(shredBAT, strptr, &percentage, NULL, &verbose) ==
GDK_FAIL ) {
- send_err(out, ERR404, "env:Sender", NOT_WELL_FORMED);
+ send_err(out, ERR400, "env:Sender", NOT_WELL_FORMED);
BBPreclaim(shredBAT);
shredBAT = NULL;
}
@@ -368,7 +368,7 @@
if(strcmp(err, OUT_OF_MEM) == 0)
send_err(out, ERR500, "env:Receiver", err);
else
- send_err(out, ERR404, "env:Sender", err);
+ send_err(out, ERR400, "env:Sender", err);
}
if(!isAdmin && !isTrusted(out, req->location)) {
XRPCreq_free(req);
@@ -427,7 +427,7 @@
"Error occurred during execution.\n%s\n%s",
*errbuf ? errbuf : "",
err == ((char*)-1) ? "" : err);
- send_err(mc->c->fdout, ERR404, "env:Sender", errbuf_all);
+ send_err(mc->c->fdout, ERR400, "env:Sender", errbuf_all);
}
GDKsetbuf(errbuf_bak);
return ret;
@@ -536,7 +536,7 @@
BBPreclaim(shredBAT);
return GDK_FAIL;
} else if (req->qid) {
- send_err(mc->c->fdout, ERR404, "env:Sender",
+ send_err(mc->c->fdout, ERR403, "env:Sender",
"Multi-request transaction not allowed for admin functions");
BBPreclaim(shredBAT);
XRPCreq_free(req);
@@ -544,7 +544,7 @@
}
if(strcmp(req->module, MXQ_ADMIN) != 0){
- send_err(mc->c->fdout, ERR404, "env:Sender", "Invalid namespace of
admin module");
+ send_err(mc->c->fdout, ERR400, "env:Sender", "Invalid namespace of
admin module");
BBPreclaim(shredBAT);
XRPCreq_free(req);
return GDK_FAIL;
@@ -677,7 +677,7 @@
c.qid = qid;
c.start = GDKusec();
seqnr = xquery_2pc_exec(mc, qid, (ptr) &c);
- if (seqnr == 0) send_err(c.s, ERR404, "env:Sender", "prepare
failed");
+ if (seqnr == 0) send_err(c.s, ERR500, "env:Receiver", "prepare
failed");
/* log the request */
if (mode && strstr(mode, "trace")) {
------------------------------------------------------------------------------
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
