From 94b14f209c2b19d2a7d00074a4ffb52a26da65fb Mon Sep 17 00:00:00 2001 From: areq Date: Tue, 28 Dec 2004 16:38:56 +0000 Subject: [PATCH] - 1.2.8 Changed files: apache1-mod_jk.spec -> 1.6 jakarta-tomcat-connectors-jk-jkpass.patch -> 1.4 --- apache1-mod_jk.spec | 10 +++--- jakarta-tomcat-connectors-jk-jkpass.patch | 44 +++++++++++------------ 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/apache1-mod_jk.spec b/apache1-mod_jk.spec index efc417f..603dcbb 100644 --- a/apache1-mod_jk.spec +++ b/apache1-mod_jk.spec @@ -3,12 +3,12 @@ Summary: Apache module that handles communication between Tomcat and Apache 1.3. Summary(pl): Modu³ Apache'a obs³uguj±cy komunikacjê miêdzy Tomcatem a Apachem 1.3.x %define mod_name jk Name: apache1-mod_%{mod_name} -Version: 1.2.6 +Version: 1.2.8 Release: 1 License: Apache Group: Networking/Daemons -Source0: http://www.apache.org/dist/jakarta/tomcat-connectors/jk/source/jakarta-tomcat-connectors-jk-%{version}-src.tar.gz -# Source0-md5: 018b91a0ce874cbc3dae7700f452838b +Source0: http://www.apache.org/dist/jakarta/tomcat-connectors/jk/source/jk-%{version}/jakarta-tomcat-connectors-%{version}-src.tar.gz +# Source0-md5: eb579c47f8dd71e526d7561c919ce06d Source1: %{name}.conf Patch0: jakarta-tomcat-connectors-jk-jkpass.patch URL: http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/doc/ @@ -39,7 +39,7 @@ JK jest zamiennikiem starego mod_jserv. Jest ca Tomcat-Apache obs³uguj±c± komunikacjê miêdzy Tomcatem a Apachem. %prep -%setup -q -n jakarta-tomcat-connectors-jk-%{version}-src +%setup -q -n jakarta-tomcat-connectors-%{version}-src %patch0 -p1 %build @@ -92,7 +92,7 @@ fi %files %defattr(644,root,root,755) -%doc jk/native/{README,CHANGES.txt} jk/doc/* +%doc jk/native/{README,CHANGES.txt} doc/* %config(noreplace) %{_apacheconfdir}/mod_jk.conf %attr(755,root,root) %{_pkglibdir}/* %attr(750,http,http) /var/lock/mod_jk diff --git a/jakarta-tomcat-connectors-jk-jkpass.patch b/jakarta-tomcat-connectors-jk-jkpass.patch index 07ca992..c276692 100644 --- a/jakarta-tomcat-connectors-jk-jkpass.patch +++ b/jakarta-tomcat-connectors-jk-jkpass.patch @@ -1,8 +1,8 @@ diff -Nru jakarta-tomcat-connectors-jk-1.2.5-src.orig/jk/native/apache-1.3/mod_jk.c jakarta-tomcat-connectors-jk-1.2.5-src/jk/native/apache-1.3/mod_jk.c --- jakarta-tomcat-connectors-jk-1.2.5-src.orig/jk/native/apache-1.3/mod_jk.c 2004-05-14 15:02:21.110892712 +0000 +++ jakarta-tomcat-connectors-jk-1.2.5-src/jk/native/apache-1.3/mod_jk.c 2004-05-14 19:43:05.275190512 +0000 -@@ -134,8 +134,14 @@ - table *envvars; +@@ -135,8 +135,14 @@ + table *envvars; server_rec *s; + @@ -16,7 +16,7 @@ diff -Nru jakarta-tomcat-connectors-jk-1.2.5-src.orig/jk/native/apache-1.3/mod_j /* * The "private", or subclass portion of the web server service class for -@@ -1355,6 +1361,18 @@ +@@ -1414,6 +1420,18 @@ return NULL; } @@ -35,9 +35,9 @@ diff -Nru jakarta-tomcat-connectors-jk-1.2.5-src.orig/jk/native/apache-1.3/mod_j /* * JkEnvVar Directive Handling * -@@ -1475,6 +1493,9 @@ - {"JkEnvVar", jk_add_env_var, NULL, RSRC_CONF, TAKE2, - "Adds a name of environment variable that should be sent to servlet-engine"}, +@@ -1564,6 +1582,9 @@ + {"JkWorkerProperty", jk_set_worker_property, NULL, RSRC_CONF, RAW_ARGS, + "Set workers.properties formated directive"}, + {"JkPass", jk_set_pass_prefix, NULL, RSRC_CONF, TAKE1, + "Set the prefix for URIs that shouldn't be procceded to a servlet-engine worker (multiple)" }, @@ -45,7 +45,7 @@ diff -Nru jakarta-tomcat-connectors-jk-1.2.5-src.orig/jk/native/apache-1.3/mod_j {NULL} }; -@@ -1490,11 +1511,30 @@ +@@ -1579,11 +1600,30 @@ /* Retrieve the worker name stored by jk_translate() */ const char *worker_name = ap_table_get(r->notes, JK_WORKER_ID); int rc; @@ -55,28 +55,28 @@ diff -Nru jakarta-tomcat-connectors-jk-1.2.5-src.orig/jk/native/apache-1.3/mod_j + pass_prefix *item; + int i; - if(r->proxyreq) { + if (r->proxyreq) { return HTTP_INTERNAL_SERVER_ERROR; } + s = r->server; + c = (jk_server_conf_t *) ap_get_module_config(s->module_config, &jk_module); + list = (pass_prefix *) c->pass_prefixes->elts; -+ for (i = 0; i < c->pass_prefixes->nelts; ++i) { -+ item = &list[i]; -+ if (item->prefix) { -+ char *pass = strstr(r->uri, item->prefix); -+ if (pass && pass == r->uri) { -+ ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, s, "Skipping URI: %s", r->uri); -+ return DECLINED; -+ } -+ } -+ } -+ ++ for (i = 0; i < c->pass_prefixes->nelts; ++i) { ++ item = &list[i]; ++ if (item->prefix) { ++ char *pass = strstr(r->uri, item->prefix); ++ if (pass && pass == r->uri) { ++ ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, s, "Skipping URI: %s", r->uri); ++ return DECLINED; ++ } ++ } ++ } ++ /* Set up r->read_chunked flags for chunked encoding, if present */ - if(rc = ap_setup_client_block(r, REQUEST_CHUNKED_DECHUNK)) { - return rc; -@@ -1651,6 +1691,9 @@ + if ((rc = ap_setup_client_block(r, REQUEST_CHUNKED_DECHUNK))) { + return rc; +@@ -1771,6 +1811,9 @@ c->s = s; -- 2.43.0