svn commit: r733221 - in /httpd/apreq/branches/v2_10: include/apreq_version.h library/module_cgi.c library/parser.c module/apache2/handle.c

[joes]

Author: joes
Date: Fri Jan  9 17:42:05 2009
New Revision: 733221

URL: http://svn.apache.org/viewvc?rev=733221&view=rev
Log:
backport r733216 to v2_10 branch

Modified:
    httpd/apreq/branches/v2_10/include/apreq_version.h
    httpd/apreq/branches/v2_10/library/module_cgi.c
    httpd/apreq/branches/v2_10/library/parser.c
    httpd/apreq/branches/v2_10/module/apache2/handle.c

Modified: httpd/apreq/branches/v2_10/include/apreq_version.h
URL: 
http://svn.apache.org/viewvc/httpd/apreq/branches/v2_10/include/apreq_version.h?rev=733221&r1=733220&r2=733221&view=diff
==============================================================================
--- httpd/apreq/branches/v2_10/include/apreq_version.h (original)
+++ httpd/apreq/branches/v2_10/include/apreq_version.h Fri Jan  9 17:42:05 2009
@@ -62,7 +62,7 @@
 #define APREQ_MINOR_VERSION       6
 
 /** patch level */
-#define APREQ_PATCH_VERSION       3
+#define APREQ_PATCH_VERSION       4
 
 /**
  *  This symbol is defined for internal, "development" copies of libapreq.

Modified: httpd/apreq/branches/v2_10/library/module_cgi.c
URL: 
http://svn.apache.org/viewvc/httpd/apreq/branches/v2_10/library/module_cgi.c?rev=733221&r1=733220&r2=733221&view=diff
==============================================================================
--- httpd/apreq/branches/v2_10/library/module_cgi.c (original)
+++ httpd/apreq/branches/v2_10/library/module_cgi.c Fri Jan  9 17:42:05 2009
@@ -474,11 +474,11 @@
         h = req->find_param;
         h->next = req->parser->hook;
         req->parser->hook = h;
-        h->ctx = (void *)name;
+        h->ctx = &name;
 
         do {
             cgi_read(handle, APREQ_DEFAULT_READ_BLOCK_SIZE);
-            if (h->ctx != name) {
+            if (h->ctx != &name) {
                 req->parser->hook = h->next;
                 return h->ctx;
             }

Modified: httpd/apreq/branches/v2_10/library/parser.c
URL: 
http://svn.apache.org/viewvc/httpd/apreq/branches/v2_10/library/parser.c?rev=733221&r1=733220&r2=733221&view=diff
==============================================================================
--- httpd/apreq/branches/v2_10/library/parser.c (original)
+++ httpd/apreq/branches/v2_10/library/parser.c Fri Jan  9 17:42:05 2009
@@ -341,7 +341,7 @@
 
 APREQ_DECLARE_HOOK(apreq_hook_find_param)
 {
-    const char *key = hook->ctx;
+    const char *key = *(const char **)hook->ctx;
     int is_final = (bb == NULL) || APR_BUCKET_IS_EOS(APR_BRIGADE_LAST(bb));
     apr_status_t s = (hook->next == NULL)
         ? APR_SUCCESS : apreq_hook_run(hook->next, param, bb);

Modified: httpd/apreq/branches/v2_10/module/apache2/handle.c
URL: 
http://svn.apache.org/viewvc/httpd/apreq/branches/v2_10/module/apache2/handle.c?rev=733221&r1=733220&r2=733221&view=diff
==============================================================================
--- httpd/apreq/branches/v2_10/module/apache2/handle.c (original)
+++ httpd/apreq/branches/v2_10/module/apache2/handle.c Fri Jan  9 17:42:05 2009
@@ -207,11 +207,11 @@
         h = ctx->find_param;
         h->next = ctx->parser->hook;
         ctx->parser->hook = h;
-        h->ctx = (void *)name;
+        h->ctx = &name;
 
         do {
             apreq_filter_prefetch(f, APREQ_DEFAULT_READ_BLOCK_SIZE);
-            if (h->ctx != name) {
+            if (h->ctx != &name) {
                 ctx->parser->hook = h->next;
                 return h->ctx;
             }