Author: mturk
Date: Fri Feb 17 04:24:44 2006
New Revision: 378495
URL: http://svn.apache.org/viewcvs?rev=378495&view=rev
Log:
Report unknown errors.
Modified:
tomcat/connectors/trunk/jni/native/src/error.c
Modified: tomcat/connectors/trunk/jni/native/src/error.c
URL:
http://svn.apache.org/viewcvs/tomcat/connectors/trunk/jni/native/src/error.c?rev=378495&r1=378494&r2=378495&view=diff
==============================================================================
--- tomcat/connectors/trunk/jni/native/src/error.c (original)
+++ tomcat/connectors/trunk/jni/native/src/error.c Fri Feb 17 04:24:44 2006
@@ -22,13 +22,13 @@
#include "tcn.h"
static const char *tcn_errors[] = {
- "Unknown user error",
+ "Unknow user error",
/* TCN_TIMEUP */ "Operation timed out",
/* TCN_EAGAIN */ "There is no data ready",
/* TCN_EINTR */ "Interrupted system call",
- /* TCN_EINPROGRESS */ "Operation in prrogress",
+ /* TCN_EINPROGRESS */ "Operation in progress",
/* TCN_ETIMEDOUT */ "Connection timed out",
- NULL,
+ NULL
};
/* Merge IS_ETIMEDOUT with APR_TIMEUP
@@ -133,7 +133,10 @@
UNREFERENCED(o);
if (err >= TCN_TIMEUP && err <= TCN_ETIMEDOUT) {
err -= TCN_TIMEUP;
- jerr = AJP_TO_JSTRING(tcn_errors[err]);
+ jerr = AJP_TO_JSTRING(tcn_errors[err + 1]);
+ }
+ else if (err > TCN_ETIMEDOUT) {
+ jerr = AJP_TO_JSTRING(tcn_errors[0]);
}
else {
apr_strerror(err, serr, 512);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
