nacho 02/04/24 16:12:50
Modified: jk/native2/common jk_uriMap.c jk_logger_file.c
jk/native2/server/apache2 jk_service_apache2.c
jk/native2/include jk_service.h
Log:
* Cosmetics
* win32 tweaks to build
Revision Changes Path
1.24 +2 -2 jakarta-tomcat-connectors/jk/native2/common/jk_uriMap.c
Index: jk_uriMap.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_uriMap.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- jk_uriMap.c 12 Apr 2002 23:09:50 -0000 1.23
+++ jk_uriMap.c 24 Apr 2002 23:12:50 -0000 1.24
@@ -67,7 +67,7 @@
* servlet container.
*
* Author: Gal Shachor <[EMAIL PROTECTED]>
- * Version: $Revision: 1.23 $
+ * Version: $Revision: 1.24 $
*/
#include "jk_pool.h"
@@ -417,7 +417,7 @@
/* This takes care of 'shorter' matches */
if( _this->debug > 0 )
env->l->jkLog(env, env->l, JK_LOG_INFO,
- "uriMap.mapUri() tentative prefix match %s",
+ "uriMap.mapUri() tentative prefix match %s\n",
uwr->prefix );
longest_match = uwr->prefix_len;
best_match = i;
1.19 +2 -2 jakarta-tomcat-connectors/jk/native2/common/jk_logger_file.c
Index: jk_logger_file.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_logger_file.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- jk_logger_file.c 12 Apr 2002 21:49:03 -0000 1.18
+++ jk_logger_file.c 24 Apr 2002 23:12:50 -0000 1.19
@@ -59,7 +59,7 @@
* Description: Utility functions (mainly configuration) *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Author: Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.18 $ *
+ * Version: $Revision: 1.19 $ *
***************************************************************************/
#include "jk_env.h"
@@ -163,7 +163,7 @@
return JK_FALSE;
}
_this->jkLog(env, _this,JK_LOG_ERROR,
- "Initilizing log file %s\n", _this->name );
+ "Initializing log file %s\n", _this->name );
_this->logger_private = f;
if( oldF!=NULL ) {
fclose( oldF );
1.16 +5 -5
jakarta-tomcat-connectors/jk/native2/server/apache2/jk_service_apache2.c
Index: jk_service_apache2.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/jk_service_apache2.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jk_service_apache2.c 12 Apr 2002 21:55:05 -0000 1.15
+++ jk_service_apache2.c 24 Apr 2002 23:12:50 -0000 1.16
@@ -59,7 +59,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat
* Author: Gal Shachor <[EMAIL PROTECTED]>
* Henri Gomez <[EMAIL PROTECTED]>
- * Version: $Revision: 1.15 $
+ * Version: $Revision: 1.16 $
*/
#include "apu_compat.h"
@@ -308,7 +308,7 @@
/* Utility functions */
/* ========================================================================= */
-static unsigned jk2_get_content_length(jk_env_t *env, request_rec *r)
+static long jk2_get_content_length(jk_env_t *env, request_rec *r)
{
if(r->clength > 0) {
return r->clength;
@@ -316,7 +316,7 @@
char *lenp = (char *)apr_table_get(r->headers_in, "Content-Length");
if(lenp) {
- int rc = atoi(lenp);
+ long rc = atol(lenp);
if(rc > 0) {
return rc;
}
@@ -326,7 +326,7 @@
return 0;
}
-static int jk2_init_ws_service(jk_env_t *env, jk_ws_service_t *s,
+static int JK_METHOD jk2_init_ws_service(jk_env_t *env, jk_ws_service_t *s,
jk_worker_t *worker, void *serverObj)
{
apr_port_t port;
@@ -534,7 +534,7 @@
* jk shouldn't do it instead, and the user should get the
* error message !
*/
-static void jk2_service_apache2_afterRequest(jk_env_t *env, jk_ws_service_t *s )
+static void JK_METHOD jk2_service_apache2_afterRequest(jk_env_t *env,
jk_ws_service_t *s )
{
if (s->content_read < s->content_length ||
1.12 +3 -3 jakarta-tomcat-connectors/jk/native2/include/jk_service.h
Index: jk_service.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_service.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jk_service.h 20 Apr 2002 22:57:16 -0000 1.11
+++ jk_service.h 24 Apr 2002 23:12:50 -0000 1.12
@@ -63,7 +63,7 @@
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Author: Dan Milstein <[EMAIL PROTECTED]> *
* Author: Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.11 $ *
+ * Version: $Revision: 1.12 $ *
***************************************************************************/
#ifndef JK_SERVICE_H
@@ -195,11 +195,11 @@
char *server_name;
unsigned server_port;
char *server_software;
- unsigned content_length; /* integer that represents the content */
+ long content_length; /* long that represents the content */
/* length should be 0 if unknown. */
unsigned is_chunked; /* 1 if content length is unknown (chunked rq) */
unsigned no_more_chunks; /* 1 if last chunk has been read */
- unsigned content_read; /* number of bytes read */
+ long content_read; /* number of bytes read */
/*
* SSL information
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
