Author: rjung
Date: Fri Dec 14 19:26:30 2007
New Revision: 604383
URL: http://svn.apache.org/viewvc?rev=604383&view=rev
Log:
Make http status code names consistent.
Modified:
tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
tomcat/connectors/trunk/jk/native/common/jk_global.h
Modified: tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c?rev=604383&r1=604382&r2=604383&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c Fri Dec 14
19:26:30 2007
@@ -1929,7 +1929,7 @@
* return value is_error op->recoverable reason
* JK_FALSE JK_HTTP_SERVER_ERROR UNDEF Invalid
Parameters (null values)
* JK_SERVER_ERROR JK_HTTP_OK UNDEF Error during
initializing empty request, response or post body objects
- * JK_CLIENT_ERROR JK_REQUEST_TOO_LARGE JK_TRUE Request doesn't
fit into buffer (error during ajp_marshal_into_msgb())
+ * JK_CLIENT_ERROR JK_HTTP_REQUEST_TOO_LARGE JK_TRUE Request doesn't
fit into buffer (error during ajp_marshal_into_msgb())
* JK_CLIENT_ERROR JK_HTTP_BAD_REQUEST JK_FALSE Error during
reading parts of POST body from client
* JK_SERVER_ERROR JK_HTTP_SERVER_ERROR JK_FALSE If
ajp_send_request() returns JK_TRUE but !op->recoverable.
* This should never happen.
@@ -2036,7 +2036,7 @@
* We get here initial request (in op->request)
*/
if (!ajp_marshal_into_msgb(op->request, s, l, p)) {
- *is_error = JK_REQUEST_TOO_LARGE;
+ *is_error = JK_HTTP_REQUEST_TOO_LARGE;
jk_log(l, JK_LOG_INFO,
"Creating AJP message failed, "
"without recovery");
Modified: tomcat/connectors/trunk/jk/native/common/jk_global.h
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_global.h?rev=604383&r1=604382&r2=604383&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_global.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_global.h Fri Dec 14 19:26:30
2007
@@ -214,14 +214,14 @@
/* HTTP Error codes
*/
-#define JK_HTTP_OK 200
-#define JK_HTTP_BAD_REQUEST 400
-#define JK_REQUEST_TOO_LARGE 413
-#define JK_HTTP_SERVER_ERROR 500
-#define JK_HTTP_NOT_IMPLEMENTED 501
-#define JK_HTTP_BAD_GATEWAY 502
-#define JK_HTTP_SERVER_BUSY 503
-#define JK_HTTP_GATEWAY_TIME_OUT 504
+#define JK_HTTP_OK 200
+#define JK_HTTP_BAD_REQUEST 400
+#define JK_HTTP_REQUEST_TOO_LARGE 413
+#define JK_HTTP_SERVER_ERROR 500
+#define JK_HTTP_NOT_IMPLEMENTED 501
+#define JK_HTTP_BAD_GATEWAY 502
+#define JK_HTTP_SERVER_BUSY 503
+#define JK_HTTP_GATEWAY_TIME_OUT 504
/*
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
