Merge branch 'branch_0.12.0' into sandbox

[modchxj/mod_chxj.git] / src / mod_chxj.c

diff --git a/src/mod_chxj.c b/src/mod_chxj.c
index bcf2906..2f9c1f4 100644 (file)
--- a/src/mod_chxj.c
+++ b/src/mod_chxj.c
@@ -559,7 +559,7 @@ chxj_convert_input_header(request_rec *r,chxjconvrule_entry *entryp)
         cookie = chxj_load_cookie(r, value);
         DBG(r, "REQ[%X] call end   chxj_load_cookie()", (unsigned int)(apr_size_t)r);
         if (! no_update_flag && cookie) {
-          chxj_update_cookie(r, cookie);
+          cookie = chxj_update_cookie(r, cookie);
         }
         chxj_cookie_unlock(r, lock);
       }
@@ -636,8 +636,13 @@ chxj_input_convert(
   DBG(r, "REQ[%X] +-------------------------------------------------------------------+", (unsigned int)(apr_size_t)r);
   for (ii=0; ii<ilen-64; ii+=64) {
     DBG(r, "REQ[%X] | [%-*.*s] |", (unsigned int)(apr_size_t)r, 64, 64, &s[ii]);
+    if (ilen < 64) {
+      break;
+    }
+  }
+  if (ilen >= 64 && ((ilen-64) % 64 != 0)) {
+    DBG(r, "REQ[%X] | [%-*.*s] |", (unsigned int)(apr_size_t)r, 64, 64, &s[ii]);
   }
-  DBG(r, "REQ[%X] | [%-*.*s] |", (unsigned int)(apr_size_t)r, 64, 64, &s[ii]);
   DBG(r, "REQ[%X] +--------------------------------------------------------------------+", (unsigned int)(apr_size_t)r);
 
   for (;;) {
@@ -746,7 +751,7 @@ chxj_input_convert(
         cookie = chxj_load_cookie(r, value);
         DBG(r, "REQ[%X] call end   chxj_load_cookie()", (unsigned int)(apr_size_t)r);
         if (! no_update_flag && cookie) {
-          chxj_update_cookie(r, cookie);
+          cookie = chxj_update_cookie(r, cookie);
         }
         chxj_cookie_unlock(r, lock);
       }
@@ -1252,7 +1257,7 @@ chxj_input_handler(request_rec *r)
     url_path = apr_psprintf(pool, "%s%s", dconf->forward_url_base, r->uri);
   }
   else {
-    url_path = apr_psprintf(pool, "%s://%s:%d%s", chxj_apache_run_http_scheme(r), ap_get_server_name(r), ap_get_server_port(r), r->uri);
+    url_path = apr_psprintf(pool, "%s://%s:%d%s", chxj_apache_run_http_scheme(r), "127.0.0.1", ap_get_server_port(r), r->uri);
   }
   if (r->args) {
     url_path = apr_pstrcat(pool, url_path, "?", r->args, NULL);