cks 2002/06/20 09:16:00
Modified: jk/native2/server/apache13 jk_service_apache13.c
Log:
ensure port set correctly so redirects work, use code from original mod_jk
Revision Changes Path
1.7 +2 -7
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jk_service_apache13.c 23 May 2002 23:33:50 -0000 1.6
+++ jk_service_apache13.c 20 Jun 2002 16:16:00 -0000 1.7
@@ -2,7 +2,7 @@
* *
* The Apache Software License, Version 1.1 *
* *
- * Copyright (c) 1999-2001 The Apache Software Foundation. *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. *
* All rights reserved. *
* *
* ========================================================================= *
@@ -282,7 +282,6 @@
static int JK_METHOD jk2_init_ws_service(jk_env_t *env, jk_ws_service_t *s,
jk_worker_t *worker, void *serverObj)
{
- /* ap_port_t port; */
char *ssl_temp = NULL;
jk_workerEnv_t *workerEnv=worker->workerEnv;
request_rec *r=serverObj;
@@ -313,11 +312,7 @@
/* get server name */
s->server_name= (char *)(r->hostname ? r->hostname :
r->server->server_hostname);
-
- /* get the real port (otherwise redirect failed) */
- /* apr_sockaddr_port_get(&port,r->connection->local_addr); */
- /* s->server_port = port; */
-
+ s->server_port = htons(r->connection->local_addr.sin_port);
s->server_software = (char *)ap_get_server_version();
s->method = (char *)r->method;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
