costin 01/11/20 16:09:22
Modified: jk/native/apache-2.0 mod_jk.c
jk/native/common jk_global.h
jk/native/apache-1.3 mod_jk.c
Log:
Moved the duplicated declaration in jk_global.
Revision Changes Path
1.37 +4 -13 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- mod_jk.c 2001/11/16 22:55:34 1.36
+++ mod_jk.c 2001/11/21 00:09:21 1.37
@@ -60,13 +60,12 @@
* Description: Apache 2 plugin for Jakarta/Tomcat *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.36 $ *
+ * Version: $Revision: 1.37 $ *
***************************************************************************/
/*
* mod_jk: keeps all servlet/jakarta related ramblings together.
*/
-
#include "apu_compat.h"
#include "ap_config.h"
#include "apr_lib.h"
@@ -89,14 +88,6 @@
/*
* Jakarta (jk_) include files
*/
-#ifdef NETWARE
-#define _SYS_TYPES_H_
-#define _NETDB_H_INCLUDED
-#define _IN_
-#define _INET_
-#define _SYS_TIMEVAL_H_
-#define _SYS_SOCKET_H_
-#endif
#include "jk_global.h"
#include "jk_util.h"
#include "jk_map.h"
@@ -253,7 +244,7 @@
/* this NOP function was removed in apache 2.0 alpha14 */
/* ap_send_http_header(r); */
- p->response_started = JK_TRUE;
+ p->response_started = JK_TRUE;
return JK_TRUE;
}
@@ -1284,7 +1275,7 @@
#endif
{
int is_recoverable_error = JK_FALSE;
- rc = end->service(end, &s, xl, &is_recoverable_error);
+ rc = end->service(end, &s, xl, &is_recoverable_error);
if (s.content_read < s.content_length ||
(s.is_chunked && ! s.no_more_chunks)) {
@@ -1578,7 +1569,7 @@
/* bypass the directory_walk and file_walk for non-file requests */
static int jk_map_to_storage(request_rec *r)
{
- if (apr_table_get(r->notes, JK_WORKER_ID)) {
+ if (apr_table_get(r->notes, JK_WORKER_ID) != NULL ) {
r->filename = (char *)apr_filename_of_pathname(r->uri);
return OK;
}
1.13 +10 -1 jakarta-tomcat-connectors/jk/native/common/jk_global.h
Index: jk_global.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_global.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jk_global.h 2001/10/31 14:03:22 1.12
+++ jk_global.h 2001/11/21 00:09:21 1.13
@@ -59,11 +59,20 @@
* Description: Global definitions and include files that should exist *
* anywhere *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.12 $ *
+ * Version: $Revision: 1.13 $ *
***************************************************************************/
#ifndef JK_GLOBAL_H
#define JK_GLOBAL_H
+
+#ifdef NETWARE
+#define _SYS_TYPES_H_
+#define _NETDB_H_INCLUDED
+#define _IN_
+#define _INET_
+#define _SYS_TIMEVAL_H_
+#define _SYS_SOCKET_H_
+#endif
#include "jk_version.h"
1.21 +1 -9 jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c
Index: mod_jk.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mod_jk.c 2001/10/31 14:03:22 1.20
+++ mod_jk.c 2001/11/21 00:09:22 1.21
@@ -61,7 +61,7 @@
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Dan Milstein <[EMAIL PROTECTED]> *
* Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.20 $ *
+ * Version: $Revision: 1.21 $ *
***************************************************************************/
/*
@@ -83,14 +83,6 @@
/*
* Jakarta (jk_) include files
*/
-#ifdef NETWARE
-#define _SYS_TYPES_H_
-#define _NETDB_H_INCLUDED
-#define _IN_
-#define _INET_
-#define _SYS_TIMEVAL_H_
-#define _SYS_SOCKET_H_
-#endif
#include "jk_global.h"
#include "jk_util.h"
#include "jk_map.h"
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
