cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 jk_service_apache2.c
hgomez 2004/02/24 07:51:23
Modified:jk/native2/server/apache2 jk_service_apache2.c
Log:
Should fix problem fix mod_deflate and jk2
Revision ChangesPath
1.41 +5 -1
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.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- jk_service_apache2.c 24 Feb 2004 08:44:42 - 1.40
+++ jk_service_apache2.c 24 Feb 2004 15:51:23 - 1.41
@@ -107,6 +107,10 @@
/* XXX should be done in handler ! */
char *tmp = apr_pstrdup(r-pool, val);
ap_content_type_tolower(tmp);
+/* It should be done like this in Apache 2.0 */
+/* This way, Apache 2.0 will be able to set the output filter */
+/* and it make jk useable with deflate using AddOutputFilterByType
DEFLATE text/html */
+ap_set_content_type(r, tmp);
r-content_type = tmp;
apr_table_set(r-headers_out, name, val);
} else if(!strcasecmp(name, Location)) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 jk_service_apache2.c
mmanders2004/02/02 10:23:55
Modified:jk/native2/server/apache2 jk_service_apache2.c
Log:
Updated how we get the server port to work with APR 1.0 as well as previous
versions.Patch submitted by Guenter Knauf.
Revision ChangesPath
1.38 +2 -4
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.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- jk_service_apache2.c 22 Jan 2004 09:19:55 - 1.37
+++ jk_service_apache2.c 2 Feb 2004 18:23:55 - 1.38
@@ -343,7 +343,6 @@
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;
char *ssl_temp = NULL;
jk_workerEnv_t *workerEnv;
request_rec *r=serverObj;
@@ -376,8 +375,7 @@
s-server_name= (char *)ap_get_server_name(r);
/* get the real port (otherwise redirect failed) */
-apr_sockaddr_port_get(port,r-connection-local_addr);
-s-server_port = port;
+s-server_port = r-connection-local_addr-port;
s-server_software = (char *)ap_get_server_version();
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 jk_service_apache2.c
hgomez 2004/01/22 01:19:55 Modified:jk/native2/server/apache2 jk_service_apache2.c Log: Get server name from Apache, the same way that JK 1.2.x. Port correction should now be studied Revision ChangesPath 1.37 +3 -4 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.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- jk_service_apache2.c 30 Sep 2003 13:42:02 - 1.36 +++ jk_service_apache2.c 22 Jan 2004 09:19:55 - 1.37 @@ -372,9 +372,8 @@ s-remote_host = NULL_FOR_EMPTY(s-remote_host); s-remote_addr = NULL_FOR_EMPTY(r-connection-remote_ip); -/* get server name */ -s-server_name= (char *)(r-hostname ? r-hostname : - r-server-server_hostname); +/* get server name like in jk 1.2.x */ +s-server_name= (char *)ap_get_server_name(r); /* get the real port (otherwise redirect failed) */ apr_sockaddr_port_get(port,r-connection-local_addr); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 jk_service_apache2.c
hgomez 2002/12/09 05:23:20
Modified:jk/native2/server/apache2 jk_service_apache2.c
Log:
Make jk2 works with filters in Apache 2.0, ie mod_deflate and
AddOutputFilterByType DEFLATE text/html.
Revision ChangesPath
1.33 +5 -2
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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- jk_service_apache2.c 22 Nov 2002 16:04:06 - 1.32
+++ jk_service_apache2.c 9 Dec 2002 13:23:19 - 1.33
@@ -105,7 +105,10 @@
if( val!=NULL ) {
char *tmp = apr_pstrdup(r-pool, val);
ap_content_type_tolower(tmp);
-r-content_type = tmp;
+/* It should be done like this in Apache 2.0 */
+/* This way, Apache 2.0 will be able to set the output filter */
+/* and it make jk useable with deflate using AddOutputFilterByType
DEFLATE text/html */
+ap_set_content_type(r, tmp);
}
val= headers-get( env, headers, Last-Modified);
if( val!=NULL ) {
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 jk_service_apache2.c
jfclere 2002/11/22 08:04:06
Modified:jk/native2/server/apache13 jk_service_apache13.c
jk/native2/server/apache2 jk_service_apache2.c
Log:
Fix 14293 - Copied from mod_jk -
Revision ChangesPath
1.9 +6 -4
jakarta-tomcat-connectors/jk/native2/server/apache13/jk_service_apache13.c
Index: jk_service_apache13.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/jk_service_apache13.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jk_service_apache13.c 27 Sep 2002 17:49:01 - 1.8
+++ jk_service_apache13.c 22 Nov 2002 16:04:05 - 1.9
@@ -215,8 +215,6 @@
return JK_ERR;
{
-/* BUFF *bf = p-r-connection-client; */
-/* size_t w = (size_t)l; */
size_t rd = 0;
long ll=len;
char *bb=(char *)b;
@@ -232,11 +230,15 @@
return rc;
}
}
+if (rr-header_only) {
+ap_bflush(rr);
+return JK_OK;
+}
/* Debug - try to get around rwrite */
while( ll 0 ) {
unsigned long toSend=(llCHUNK_SIZE) ? CHUNK_SIZE : ll;
-rd = ap_rwrite((const char *)bb, toSend, s-ws_private );
+rd = ap_rwrite((const char *)bb, toSend, rr );
if( s-uriEnv-mbean-debug 0 )
env-l-jkLog(env, env-l, JK_LOG_INFO,
service.write() %ld (%ld) out of %ld \n,toSend,
rd, ll );
@@ -252,7 +254,7 @@
/*
* To allow server push. After writing full buffers
*/
-ap_bflush(s-ws_private);
+ap_bflush(rr);
}
return JK_OK;
}
1.32 +8 -3
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.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- jk_service_apache2.c 26 Oct 2002 12:38:45 - 1.31
+++ jk_service_apache2.c 22 Nov 2002 16:04:06 - 1.32
@@ -282,11 +282,16 @@
}
}
}
+
+if (rr-header_only) {
+ap_rflush(rr);
+return JK_OK;
+}
/* Debug - try to get around rwrite */
while( ll 0 ) {
unsigned long toSend=(llCHUNK_SIZE) ? CHUNK_SIZE : ll;
-r = ap_rwrite((const char *)bb, toSend, s-ws_private );
+r = ap_rwrite((const char *)bb, toSend, rr );
/* env-l-jkLog(env, env-l, JK_LOG_INFO, */
/* service.write() %ld (%ld) out of %ld \n,toSend, r, ll ); */
ll-=CHUNK_SIZE;
@@ -301,7 +306,7 @@
/*
* To allow server push. After writing full buffers
*/
-if(ap_rflush(s-ws_private) != APR_SUCCESS) {
+if(ap_rflush(rr) != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0,
NULL, mod_jk: Error flushing \n );
return JK_ERR;
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 jk_service_apache2.c
mturk 2002/10/18 00:35:06
Modified:jk/native2/server/apache2 jk_service_apache2.c
Log:
Fix the bug 12699.
Use the table_add instead of table_set for multivalue headers.
Revision ChangesPath
1.30 +7 -4
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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- jk_service_apache2.c 27 Sep 2002 13:14:09 - 1.29
+++ jk_service_apache2.c 18 Oct 2002 07:35:06 - 1.30
-163,9 +163,12
ap_update_mtime(r, ap_parseHTTPdate(val));
ap_set_last_modified(r);
apr_table_set(r-headers_out, name, val);
-} else {
-/* apr_table_add(r-headers_out, name, val); */
- apr_table_set(r-headers_out, name, val);
+} else {
+/* All other headers may have multiple values like
+ * Set-Cookie, so use the table_add to allow that.
+ */
+ apr_table_add(r-headers_out, name, val);
+/* apr_table_set(r-headers_out, name, val); */
}
}
#endif
--
To unsubscribe, e-mail: mailto:tomcat-dev-unsubscribe;jakarta.apache.org
For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 jk_service_apache2.c
mturk 2002/09/27 06:14:09
Modified:jk/native2/server/apache2 jk_service_apache2.c
Log:
Fix the compile warning unsigned - int
Revision ChangesPath
1.29 +3 -3
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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- jk_service_apache2.c 14 Jul 2002 13:37:28 - 1.28
+++ jk_service_apache2.c 27 Sep 2002 13:14:09 - 1.29
@@ -230,7 +230,7 @@
#endif
static int JK_METHOD jk2_service_apache2_write(jk_env_t *env, jk_ws_service_t *s,
- const void *b, int len)
+ const void *b, unsigned int len)
{
size_t r = 0;
long ll=len;
@@ -315,7 +315,7 @@
static long jk2_get_content_length(jk_env_t *env, request_rec *r)
{
if(r-clength 0) {
-return r-clength;
+return (long)(r-clength);
} else {
char *lenp = (char *)apr_table_get(r-headers_in, Content-Length);
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 jk_service_apache2.c
mturk 2002/07/14 06:37:28
Modified:jk/native2/server/apache2 jk_service_apache2.c
Log:
Move the jvm detaching to the service afterRequest.
That way we are sure that the detaching is in the same thread.
Revision ChangesPath
1.28 +8 -1
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.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- jk_service_apache2.c 8 Jul 2002 13:30:56 - 1.27
+++ jk_service_apache2.c 14 Jul 2002 13:37:28 - 1.28
@@ -585,6 +585,13 @@
}
}
}
+if (s-realWorker) {
+struct jk_worker *w = s-realWorker;
+if (w != NULL w-channel != NULL
+ w-channel-afterRequest != NULL) {
+w-channel-afterRequest( env, w-channel, w, NULL, s );
+}
+}
}
int JK_METHOD jk2_service_apache2_init(jk_env_t *env, jk_ws_service_t *s)
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 jk_service_apache2.c
mturk 2002/07/08 06:30:57
Modified:jk/native2/server/apache2 jk_service_apache2.c
Log:
no message
Revision ChangesPath
1.27 +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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- jk_service_apache2.c 10 Jun 2002 21:55:08 - 1.26
+++ jk_service_apache2.c 8 Jul 2002 13:30:56 - 1.27
@@ -126,7 +126,7 @@
numheaders = headers-size(env, headers);
/* XXX As soon as we switch to jk_map_apache2, this will not be needed ! */
if( debug 0 )
-env-l-jkLog(env, env-l, JK_LOG_INFO,
+env-l-jkLog(env, env-l, JK_LOG_DEBUG,
service.head() %d %d %#lx\n, s-status,
numheaders, s-uriEnv);
@@ -137,7 +137,7 @@
val=s-pool-pstrdup( env, s-pool, val );
if( debug 0 )
-env-l-jkLog(env, env-l, JK_LOG_INFO,
+env-l-jkLog(env, env-l, JK_LOG_DEBUG,
service.head() %s: %s %d %d\n, name, val, h,
headers-size( env, headers ));
/* the cmp can also be avoided in we do this earlier and use
@@ -257,7 +257,7 @@
if(!s-response_started) {
if( debug 0 )
-env-l-jkLog(env, env-l, JK_LOG_INFO,
+env-l-jkLog(env, env-l, JK_LOG_DEBUG,
service.write() default head\n);
rc=s-head(env, s);
if( rc != JK_OK) {
@@ -273,7 +273,7 @@
if( debug 0 ) {
for(i = 0 ; i t-nelts ; i++) {
-env-l-jkLog(env, env-l, JK_LOG_INFO, OutHeaders %s:
%s\n,
+env-l-jkLog(env, env-l, JK_LOG_DEBUG, OutHeaders %s:
%s\n,
elts[i].key, elts[i].val);
}
}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 jk_service_apache2.c
nacho 02/05/18 15:45:04 Modified:jk/native2/server/apache2 jk_service_apache2.c Log: * EOL problems Revision ChangesPath 1.23 +3 -2 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.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- jk_service_apache2.c 17 May 2002 00:31:55 - 1.22 +++ jk_service_apache2.c 18 May 2002 22:45:04 - 1.23 @@ -59,7 +59,7 @@ * Description: Apache 2 plugin for Jakarta/Tomcat * Author: Gal Shachor [EMAIL PROTECTED] * Henri Gomez [EMAIL PROTECTED] - * Version: $Revision: 1.22 $ + * Version: $Revision: 1.23 $ */ #include apu_compat.h @@ -74,7 +74,8 @@ #include http_core.h #include http_protocol.h #include http_main.h -#include http_log.h +#include http_log.h + #include scoreboard.h #include util_script.h -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 jk_service_apache2.c mod_jk2.c
costin 02/05/15 12:46:46
Modified:jk/native2/jni jk_jni_aprImpl.c
jk/native2/server/apache2 jk_service_apache2.c mod_jk2.c
Log:
Save the request start time.
Few small fixes.
Remove unused fields.
Revision ChangesPath
1.21 +0 -7 jakarta-tomcat-connectors/jk/native2/jni/jk_jni_aprImpl.c
Index: jk_jni_aprImpl.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/jni/jk_jni_aprImpl.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- jk_jni_aprImpl.c 14 May 2002 17:28:15 - 1.20
+++ jk_jni_aprImpl.c 15 May 2002 19:46:46 - 1.21
@@ -743,13 +743,6 @@
jkInvoke() NullPointerException 2\n);
return -1;
}
-
-/* Simulate a receive on the incoming packet. e-reply is what's
- used when receiving data from java.
-*/
-ep-currentData = nbuf;
-ep-currentOffset=0;
-/* This was an workaround, no longer used ! */
ep-reply-reset(env, ep-reply);
1.20 +2 -1
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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- jk_service_apache2.c 9 May 2002 21:13:12 - 1.19
+++ jk_service_apache2.c 15 May 2002 19:46:46 - 1.20
@@ -59,7 +59,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat
* Author: Gal Shachor [EMAIL PROTECTED]
* Henri Gomez [EMAIL PROTECTED]
- * Version: $Revision: 1.19 $
+ * Version: $Revision: 1.20 $
*/
#include apu_compat.h
@@ -388,6 +388,7 @@
s-no_more_chunks = 0;
s-query_string = r-args;
+s-startTime = r-request_time;
/*
* The 2.2 servlet spec errata says the uri from
* HttpServletRequest.getRequestURI() should remain encoded.
1.22 +4 -3 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
Index: mod_jk2.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mod_jk2.c 14 May 2002 20:44:21 - 1.21
+++ mod_jk2.c 15 May 2002 19:46:46 - 1.22
@@ -59,7 +59,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat *
* Author: Gal Shachor [EMAIL PROTECTED] *
* Henri Gomez [EMAIL PROTECTED] *
- * Version: $Revision: 1.21 $ *
+ * Version: $Revision: 1.22 $ *
***/
/*
@@ -106,8 +106,6 @@
*/
static jk_workerEnv_t *workerEnv;
-#define NO_APACHE_POOL 1
-
/* Options setters */
/*
@@ -441,6 +439,8 @@
/* This is the first step */
env-l-jkLog(env, env-l, JK_LOG_INFO,
mod_jk.post_config() first invocation\n);
+
+
apr_pool_userdata_set( INITOK, mod_jk_init, NULL, gPool );
return OK;
}
@@ -448,6 +448,7 @@
env-l-jkLog(env, env-l, JK_LOG_INFO,
mod_jk.post_config() second invocation\n );
+workerEnv-parentInit( env, workerEnv);
/* if(!workerEnv-was_initialized) { */
/* workerEnv-was_initialized = JK_OK; */
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 jk_service_apache2.c mod_jk2.c
costin 02/05/09 14:13:13
Modified:jk/native2/jni jk_jni_aprImpl.c
jk/native2/server/apache2 jk_service_apache2.c mod_jk2.c
Log:
As previously mentioned, less verbosity unless explicitely configured for debug
( and only debug on the targeted object )
Revision ChangesPath
1.15 +1 -1 jakarta-tomcat-connectors/jk/native2/jni/jk_jni_aprImpl.c
Index: jk_jni_aprImpl.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/jni/jk_jni_aprImpl.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jk_jni_aprImpl.c 9 May 2002 00:08:50 - 1.14
+++ jk_jni_aprImpl.c 9 May 2002 21:13:12 - 1.15
@@ -356,7 +356,7 @@
jlong poolJ, jstring hostJ )
{
apr_pool_t *pool=(apr_pool_t *)(void *)(long)poolJ;
-char *host;
+const char *host;
int status;
int unixSocket;
struct sockaddr_un unixAddr;
1.19 +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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- jk_service_apache2.c 9 May 2002 00:10:57 - 1.18
+++ jk_service_apache2.c 9 May 2002 21:13:12 - 1.19
@@ -59,7 +59,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat
* Author: Gal Shachor [EMAIL PROTECTED]
* Henri Gomez [EMAIL PROTECTED]
- * Version: $Revision: 1.18 $
+ * Version: $Revision: 1.19 $
*/
#include apu_compat.h
@@ -108,7 +108,7 @@
return JK_ERR;
if( s-uriEnv != NULL )
-debug=s-uriEnv-debug;
+debug=s-uriEnv-mbean-debug;
r = (request_rec *)s-ws_private;
@@ -146,8 +146,8 @@
/* XXX As soon as we switch to jk_map_apache2, this will not be needed ! */
if( debug 0 )
env-l-jkLog(env, env-l, JK_LOG_INFO,
- service.head() %d %d\n, s-status,
- numheaders);
+ service.head() %d %d %p\n, s-status,
+ numheaders, s-uriEnv);
for(h = 0 ; h numheaders; h++) {
char *name=headers-nameAt( env, headers, h );
@@ -258,7 +258,7 @@
return JK_ERR;
}
if( s-uriEnv != NULL )
-debug=s-uriEnv-debug;
+debug=s-uriEnv-mbean-debug;
if(len==0 ) {
return JK_OK;
1.18 +21 -17jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
Index: mod_jk2.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mod_jk2.c 9 May 2002 00:10:57 - 1.17
+++ mod_jk2.c 9 May 2002 21:13:12 - 1.18
@@ -59,7 +59,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat *
* Author: Gal Shachor [EMAIL PROTECTED] *
* Henri Gomez [EMAIL PROTECTED] *
- * Version: $Revision: 1.17 $ *
+ * Version: $Revision: 1.18 $ *
***/
/*
@@ -302,7 +302,7 @@
workerEnv-initData-add( env, workerEnv-initData, serverRoot,
workerEnv-pool-pstrdup( env, workerEnv-pool,
ap_server_root));
-env-l-jkLog(env, env-l, JK_LOG_ERROR, Set serverRoot %s\n, ap_server_root);
+env-l-jkLog(env, env-l, JK_LOG_INFO, Set serverRoot %s\n, ap_server_root);
/* Local initialization */
workerEnv-_private = s;
@@ -432,13 +432,13 @@
if( rc == JK_OK gPool != NULL ) {
/* This is the first step */
-env-l-jkLog(env, env-l, JK_LOG_ERROR,
+env-l-jkLog(env, env-l, JK_LOG_INFO,
mod_jk.post_config() first invocation\n);
apr_pool_userdata_set( INITOK, mod_jk_init, NULL, gPool );
return OK;
}
-env-l-jkLog(env, env-l, JK_LOG_ERROR,
+env-l-jkLog(env, env-l, JK_LOG_INFO,
mod_jk.post_config() second invocation\n );
@@ -524,12 +524,9 @@
r-uri, worker-mbean-name);
} else {
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 jk_service_apache2.c
costin 02/03/24 11:22:19
Modified:jk/native2/server/apache13 jk_service_apache13.c
jk/native2/server/apache2 jk_service_apache2.c
Log:
Fix - the headers are dumped for debugging, but only the first time.
Revision ChangesPath
1.3 +11 -13
jakarta-tomcat-connectors/jk/native2/server/apache13/jk_service_apache13.c
Index: jk_service_apache13.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/jk_service_apache13.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jk_service_apache13.c 19 Mar 2002 04:55:57 - 1.2
+++ jk_service_apache13.c 24 Mar 2002 19:22:19 - 1.3
@@ -219,19 +219,17 @@
if(!s-head(env, s)) {
return JK_FALSE;
}
-}
-
-
-{
-array_header *t = ap_table_elts(rr-headers_out);
-if(t t-nelts) {
-int i;
-
-table_entry *elts = (table_entry *)t-elts;
-
-for(i = 0 ; i t-nelts ; i++) {
-env-l-jkLog(env, env-l, JK_LOG_INFO, OutHeaders %s:
%s\n,
- elts[i].key, elts[i].val);
+{
+array_header *t = ap_table_elts(rr-headers_out);
+if(t t-nelts) {
+int i;
+
+table_entry *elts = (table_entry *)t-elts;
+
+for(i = 0 ; i t-nelts ; i++) {
+env-l-jkLog(env, env-l, JK_LOG_INFO, OutHeaders %s:
%s\n,
+ elts[i].key, elts[i].val);
+}
}
}
}
1.13 +12 -12
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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jk_service_apache2.c 18 Mar 2002 18:46:27 - 1.12
+++ jk_service_apache2.c 24 Mar 2002 19:22:19 - 1.13
@@ -59,7 +59,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat
* Author: Gal Shachor [EMAIL PROTECTED]
* Henri Gomez [EMAIL PROTECTED]
- * Version: $Revision: 1.12 $
+ * Version: $Revision: 1.13 $
*/
#include apu_compat.h
@@ -257,18 +257,18 @@
if(!s-head(env, s)) {
return JK_FALSE;
}
-}
-{
-const apr_array_header_t *t = apr_table_elts(rr-headers_out);
-if(t t-nelts) {
-int i;
-
-apr_table_entry_t *elts = (apr_table_entry_t *)t-elts;
-
-for(i = 0 ; i t-nelts ; i++) {
-env-l-jkLog(env, env-l, JK_LOG_INFO, OutHeaders %s:
%s\n,
- elts[i].key, elts[i].val);
+{
+const apr_array_header_t *t = apr_table_elts(rr-headers_out);
+if(t t-nelts) {
+int i;
+
+apr_table_entry_t *elts = (apr_table_entry_t *)t-elts;
+
+for(i = 0 ; i t-nelts ; i++) {
+env-l-jkLog(env, env-l, JK_LOG_INFO, OutHeaders %s:
%s\n,
+ elts[i].key, elts[i].val);
+}
}
}
}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 jk_service_apache2.c
costin 02/03/01 22:35:41
Modified:jk/native2/server/apache2 jk_service_apache2.c
Log:
There is something wrong with using APRTABLES, I suspect we're reusing
a buffer too much.
Reverted to jk maps until the rest is working, then I'll try again.
Revision ChangesPath
1.11 +31 -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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jk_service_apache2.c 28 Feb 2002 23:35:26 - 1.10
+++ jk_service_apache2.c 2 Mar 2002 06:35:41 - 1.11
@@ -59,7 +59,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat
* Author: Gal Shachor [EMAIL PROTECTED]
* Henri Gomez [EMAIL PROTECTED]
- * Version: $Revision: 1.10 $
+ * Version: $Revision: 1.11 $
*/
#include apu_compat.h
@@ -92,7 +92,7 @@
#include jk_apache2.h
-#define USE_APRTABLES
+/* #define USE_APRTABLES */
#define NULL_FOR_EMPTY(x) ((x !strlen(x)) ? NULL : x)
@@ -113,8 +113,31 @@
}
r-status = s-status;
r-status_line = apr_psprintf(r-pool, %d %s, s-status, s-msg);
-
headers=s-headers_out;
+
+#ifdef USE_APRTABLES
+{
+char *val= headers-get( env, headers, Content-Type);
+if( val!=NULL ) {
+char *tmp = apr_pstrdup(r-pool, val);
+ap_content_type_tolower(tmp);
+r-content_type = tmp;
+}
+val= headers-get( env, headers, Last-Modified);
+if( val!=NULL ) {
+/*
+ * If the script gave us a Last-Modified header, we can't just
+ * pass it on blindly because of restrictions on future values.
+ */
+ap_update_mtime(r, ap_parseHTTPdate(val));
+ap_set_last_modified(r);
+}
+
+/* No other change required - headers is the same as req-headers_out,
+ just with a different interface
+*/
+}
+#else
numheaders = headers-size(env, headers);
/* XXX As soon as we switch to jk_map_apache2, this will not be needed ! */
env-l-jkLog(env, env-l, JK_LOG_INFO,
@@ -124,7 +147,9 @@
for(h = 0 ; h numheaders; h++) {
char *name=headers-nameAt( env, headers, h );
char *val=headers-valueAt( env, headers, h );
-
+name=s-pool-pstrdup( env, s-pool, name );
+val=s-pool-pstrdup( env, s-pool, val );
+
env-l-jkLog(env, env-l, JK_LOG_INFO,
service.head() %s: %s %d %d\n, name, val, h, headers-size(
env, headers ));
@@ -156,7 +181,8 @@
apr_table_set(r-headers_out, name, val);
}
}
-
+#endif
+
/* this NOP function was removed in apache 2.0 alpha14 */
/* ap_send_http_header(r); */
s-response_started = JK_TRUE;
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 jk_service_apache2.c mod_jk2.c
costin 02/02/28 15:35:26
Modified:jk/native2/server/apache2 jk_service_apache2.c mod_jk2.c
Log:
Finally, the config changed we discussed.
There is only one config directive for mod_jk that we should care:
JkSet name value
JkSet workersFile ... will read properties from a file, you can
use it multiple times.
Also JkSet workersFile urimap.properties will read a file in the
style used by IIS ( /uri=worker ).
Or
JkSet /examples ajp13
will do the same as the old JkMount /examples ajp13 ( or /examples=ajp13
in any properties file ).
Properties file will hopefully be automatically generated, and this allows
httpd.conf to be used in the exact way with workers.properties ( and reverse).
The other special directive is JkSetUri, in a Location context, which will
set properties on a uriEnv.
I'll add an equivalent thing, properties-style, and that should be it.
Revision ChangesPath
1.10 +1 -2
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jk_service_apache2.c 22 Feb 2002 10:08:35 - 1.9
+++ jk_service_apache2.c 28 Feb 2002 23:35:26 - 1.10
@@ -59,7 +59,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat
* Author: Gal Shachor [EMAIL PROTECTED]
* Henri Gomez [EMAIL PROTECTED]
- * Version: $Revision: 1.9 $
+ * Version: $Revision: 1.10 $
*/
#include apu_compat.h
@@ -233,7 +233,6 @@
}
}
-
{
const apr_array_header_t *t = apr_table_elts(rr-headers_out);
if(t t-nelts) {
1.2 +101 -306 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
Index: mod_jk2.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mod_jk2.c 22 Feb 2002 10:04:34 - 1.1
+++ mod_jk2.c 28 Feb 2002 23:35:26 - 1.2
@@ -59,7 +59,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat *
* Author: Gal Shachor [EMAIL PROTECTED] *
* Henri Gomez [EMAIL PROTECTED] *
- * Version: $Revision: 1.1 $ *
+ * Version: $Revision: 1.2 $ *
***/
/*
@@ -132,184 +132,36 @@
* and is nowhere near the apache mapper.
*/
-/**
- * In order to define a webapp you must add Jk2Webapp directive
- * in a Location.
- *
- * Example:
- * VirtualHost foo.com
- * Location /examples
- * Jk2Webapp worker ajp13
- * /Location
- * /VirtualHost
- *
- * This is the best way to define a webapplication in apache. It is
- * scalable ( using apache native optimizations, you can have hundreds
- * of hosts and thousands of webapplications ), 'natural' to any
- * apache user.
- */
-static const char *jk2_setWebapp(cmd_parms *cmd, void *per_dir,
-const char *name, const char *val)
-{
-jk_uriEnv_t *uriEnv=(jk_uriEnv_t *)per_dir;
-
-if( uriEnv-webapp == NULL ) {
-/* Do we know the url ? */
-uriEnv-webapp=workerEnv-createWebapp( workerEnv-globalEnv, workerEnv,
-NULL, cmd-path, NULL );
-
-/* fprintf(stderr, New webapp %p %p\n,uriEnv, uriEnv-webapp); */
-} else {
-/* fprintf(stderr, Existing webapp %p\n,uriEnv-webapp); */
-}
-
-if( strcmp( name, worker) == 0 ) {
-uriEnv-webapp-workerName=ap_pstrdup(cmd-pool, val);
-} else {
-/* Generic properties */
-uriEnv-webapp-properties-add( workerEnv-globalEnv,
- uriEnv-webapp-properties,
- ap_pstrdup(cmd-pool, name),
- ap_pstrdup(cmd-pool, val));
-}
-
-fprintf(stderr, Jk2Webapp %s %s dir=%s args=%s\n,
-uriEnv-webapp-workerName, cmd-path,
-cmd-directive-directive,
-cmd-directive-args);
-
-return NULL;
-}
-
-/**
- * Associate a servlet to a
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 jk_service_apache2.c
hgomez 02/02/22 02:08:35
Modified:jk/native2/server/apache2 jk_service_apache2.c
Log:
Correct problems with headers handling, mod_jk2 was broken.
Now mod_jk 2.0.0 works correctly with Tomcat 3.3.1-b1
There is still a problem with Tomcat 4.0.2 and SessionId
Revision ChangesPath
1.9 +11 -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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jk_service_apache2.c 21 Feb 2002 11:18:59 - 1.8
+++ jk_service_apache2.c 22 Feb 2002 10:08:35 - 1.9
@@ -59,7 +59,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat
* Author: Gal Shachor [EMAIL PROTECTED]
* Henri Gomez [EMAIL PROTECTED]
- * Version: $Revision: 1.8 $
+ * Version: $Revision: 1.9 $
*/
#include apu_compat.h
@@ -99,6 +99,7 @@
static int JK_METHOD jk2_service_apache2_head(jk_env_t *env, jk_ws_service_t *s )
{
int h;
+int numheaders;
request_rec *r;
jk_map_t *headers;
@@ -114,17 +115,19 @@
r-status_line = apr_psprintf(r-pool, %d %s, s-status, s-msg);
headers=s-headers_out;
+numheaders = headers-size(env, headers);
/* XXX As soon as we switch to jk_map_apache2, this will not be needed ! */
env-l-jkLog(env, env-l, JK_LOG_INFO,
service.head() %d %d\n, s-status,
- headers-size(env, headers ));
+ numheaders);
-for(h = 0 ; h headers-size( env, headers ) ; h++) {
+for(h = 0 ; h numheaders; h++) {
char *name=headers-nameAt( env, headers, h );
char *val=headers-valueAt( env, headers, h );
env-l-jkLog(env, env-l, JK_LOG_INFO,
- service.head() %s: %s\n, name, val);
+ service.head() %s: %s %d %d\n, name, val, h, headers-size(
env, headers ));
+
/* the cmp can also be avoided in we do this earlier and use
the header id */
if(!strcasecmp(name, Content-type)) {
@@ -132,6 +135,7 @@
char *tmp = apr_pstrdup(r-pool, val);
ap_content_type_tolower(tmp);
r-content_type = tmp;
+apr_table_set(r-headers_out, name, val);
} else if(!strcasecmp(name, Location)) {
/* XXX setn */
apr_table_set(r-headers_out, name, val);
@@ -146,8 +150,10 @@
*/
ap_update_mtime(r, ap_parseHTTPdate(val));
ap_set_last_modified(r);
+apr_table_set(r-headers_out, name, val);
} else {
-apr_table_add(r-headers_out, name, val);
+/* apr_table_add(r-headers_out, name, val); */
+ apr_table_set(r-headers_out, name, val);
}
}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 jk_service_apache2.c
hgomez 02/02/21 03:18:59
Modified:jk/native2/server/apache2 jk_service_apache2.c
Log:
Still jk2 renaming, but also an update which use strcasecmp
in on/off/true/false util func
Revision ChangesPath
1.8 +26 -26
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jk_service_apache2.c 26 Jan 2002 07:13:47 - 1.7
+++ jk_service_apache2.c 21 Feb 2002 11:18:59 - 1.8
@@ -59,7 +59,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat
* Author: Gal Shachor [EMAIL PROTECTED]
* Henri Gomez [EMAIL PROTECTED]
- * Version: $Revision: 1.7 $
+ * Version: $Revision: 1.8 $
*/
#include apu_compat.h
@@ -96,7 +96,7 @@
#define NULL_FOR_EMPTY(x) ((x !strlen(x)) ? NULL : x)
-static int JK_METHOD jk_service_apache2_head(jk_env_t *env, jk_ws_service_t *s )
+static int JK_METHOD jk2_service_apache2_head(jk_env_t *env, jk_ws_service_t *s )
{
int h;
request_rec *r;
@@ -167,9 +167,9 @@
* the jk_ws_service class. Think of the *s param as a this or self
* pointer.
*/
-static int JK_METHOD jk_service_apache2_read(jk_env_t *env, jk_ws_service_t *s,
- void *b, unsigned len,
- unsigned *actually_read)
+static int JK_METHOD jk2_service_apache2_read(jk_env_t *env, jk_ws_service_t *s,
+ void *b, unsigned len,
+ unsigned *actually_read)
{
if(s s-ws_private b actually_read) {
if(!s-read_body_started) {
@@ -207,8 +207,8 @@
#define CHUNK_SIZE 4096
#endif
-static int JK_METHOD jk_service_apache2_write(jk_env_t *env, jk_ws_service_t *s,
- const void *b, int len)
+static int JK_METHOD jk2_service_apache2_write(jk_env_t *env, jk_ws_service_t *s,
+ const void *b, int len)
{
if(s s-ws_private b) {
if(len) {
@@ -277,7 +277,7 @@
/* Utility functions */
/* = */
-static int get_content_length(jk_env_t *env, request_rec *r)
+static int jk2_get_content_length(jk_env_t *env, request_rec *r)
{
if(r-clength 0) {
return r-clength;
@@ -295,8 +295,8 @@
return 0;
}
-static int init_ws_service(jk_env_t *env, jk_ws_service_t *s,
- jk_worker_t *worker, void *serverObj)
+static int jk2_init_ws_service(jk_env_t *env, jk_ws_service_t *s,
+ jk_worker_t *worker, void *serverObj)
{
apr_port_t port;
char *ssl_temp = NULL;
@@ -306,7 +306,7 @@
/* Common initialization */
/* XXX Probably not needed, we're duplicating */
-jk_requtil_initRequest(env, s);
+jk2_requtil_initRequest(env, s);
s-ws_private = r;
s-response_started = JK_FALSE;
@@ -336,7 +336,7 @@
s-server_software = (char *)ap_get_server_version();
s-method = (char *)r-method;
-s-content_length = get_content_length(env, r);
+s-content_length = jk2_get_content_length(env, r);
s-is_chunked = r-read_chunked;
s-no_more_chunks = 0;
s-query_string = r-args;
@@ -427,14 +427,14 @@
/* We can't do that - the filtering should happen in
common to enable that.
- jk_map_aprtable_factory( workerEnv-env, s-pool,
+ jk2_map_aprtable_factory( workerEnv-env, s-pool,
s-attributes,
map, aprtable );
s-attributes-init( NULL, s-attributes, 0, XXX);
*/
-jk_map_default_create(env, s-attributes, s-pool );
+jk2_map_default_create(env, s-attributes, s-pool );
#else
-jk_map_default_create(env, s-attributes, s-pool );
+jk2_map_default_create(env, s-attributes, s-pool );
#endif
if(workerEnv-envvars_in_use) {
@@ -453,12 +453,12 @@
}
#ifdef USE_APRTABLES
-jk_map_aprtable_factory( env, s-pool,
+jk2_map_aprtable_factory( env, s-pool,
(void *)s-headers_in,
map, aprtable );
s-headers_in-init( env, s-headers_in, 0,
