Update of /cvsroot/monetdb/pathfinder/runtime
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv31144
Modified Files:
Tag: May2009
xrpc_common.mx xrpc_server.mx
Log Message:
Return correct HTTP status code for 'Bad Request', i.e., 400, i.s.o. 404
U xrpc_common.mx
Index: xrpc_common.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/xrpc_common.mx,v
retrieving revision 1.12
retrieving revision 1.12.4.1
diff -u -d -r1.12 -r1.12.4.1
--- xrpc_common.mx 13 Apr 2009 23:40:10 -0000 1.12
+++ xrpc_common.mx 21 Jul 2009 14:54:22 -0000 1.12.4.1
@@ -39,8 +39,9 @@
#define XRPC_WSAT_CALLBACK "/xrpc/wsat"
#define XRPC_REQ_CALLBACK "/xrpc"
+#define ERR400 "400 Bad Request"
#define ERR403 "403 Forbidden"
-#define ERR404 "404 Bad Request"
+#define ERR404 "404 Not Found"
#define ERR408 "408 Request Timeout"
#define ERR500 "500 Internal Server Error"
#define ERR504 "504 Gateway Timeout"
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.4.1
diff -u -d -r1.89 -r1.89.4.1
--- xrpc_server.mx 17 Mar 2009 15:09:11 -0000 1.89
+++ xrpc_server.mx 21 Jul 2009 14:54:24 -0000 1.89.4.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")) {
------------------------------------------------------------------------------
Enter the BlackBerry Developer Challenge
This is your chance to win up to $100,000 in prizes! For a limited time,
vendors submitting new applications to BlackBerry App World(TM) will have
the opportunity to enter the BlackBerry Developer Challenge. See full prize
details at: http://p.sf.net/sfu/Challenge
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
