Merge branch 'branch_0.13.0' into branch_0.13.0-svn

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/branches/RELEASE_0_13_0@4817 1a406e8e-add9-4483-a2c8-d8cac5b7c224

diff --git a/ChangeLog b/ChangeLog
index 347fd16..754ed50 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,7 +7,10 @@ libapache2-mod-chxj (0.12.37-1) unstable; urgency=low
     - Content-Type is not seen when there is Location header.
   * Fixed Bug.
     - Cookie is deleted though it is not CookieOn.
+      (Reported by isssk. Thanks!)
     - Fixed url dencode bug.
+    - received SIGSEGV when connection was refused within libserf-0.2.0.
+      (Reported by kamiya. Thanks!)
 
  -- Atsushi Konno <konn@users.sourceforge.jp>  Mon, 15 Jun 2009 09:48:10 +0900
 

diff --git a/debian-sarge/changelog b/debian-sarge/changelog
index 864fdca..53805ee 100644 (file)
--- a/debian-sarge/changelog
+++ b/debian-sarge/changelog
@@ -7,7 +7,10 @@ libapache2-mod-chxj (0.12.37-1) unstable; urgency=low
     - Content-Type is not seen when there is Location header.
   * Fixed Bug.
     - Cookie is deleted though it is not CookieOn.
+      (Reported by isssk. Thanks!)
     - Fixed url dencode bug.
+    - received SIGSEGV when connection was refused within libserf-0.2.0.
+      (Reported by kamiya. Thanks!)
 
  -- Atsushi Konno <konn@users.sourceforge.jp>  Mon, 15 Jun 2009 09:48:10 +0900
 

diff --git a/debian/changelog b/debian/changelog
index 9e038d5..6b9523f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,10 @@ libapache2-mod-chxj (0.12.37-1) unstable; urgency=low
     - Content-Type is not seen when there is Location header.
   * Fixed Bug.
     - Cookie is deleted though it is not CookieOn.
+      (Reported by isssk. Thanks!)
     - Fixed url dencode bug.
+    - received SIGSEGV when connection was refused within libserf-0.2.0.
+      (Reported by kamiya. Thanks!)
 
  -- Atsushi Konno <konn@users.sourceforge.jp>  Mon, 15 Jun 2009 09:48:10 +0900
 

diff --git a/src/chxj_serf.c b/src/chxj_serf.c
index 67582cd..1b89ec5 100644 (file)
--- a/src/chxj_serf.c
+++ b/src/chxj_serf.c
@@ -485,7 +485,7 @@ default_chxj_serf_post(request_rec *r, apr_pool_t *ppool, const char *url_path,
   else {
     ret = apr_pstrdup(ppool, "");
   }
-  if (set_headers_flag) {
+  if (set_headers_flag && !rv) {
     r->headers_out = apr_table_copy(pool, handler_ctx.headers_out);
     *response_len = handler_ctx.response_len;
     char *contentType = (char *)apr_table_get(handler_ctx.headers_out, "Content-Type");
@@ -494,6 +494,9 @@ default_chxj_serf_post(request_rec *r, apr_pool_t *ppool, const char *url_path,
       chxj_set_content_type(r, apr_pstrdup(r->pool, contentType));
     }
   }
+  if (rv) {
+    *response_len = 0;
+  }
   *response_code = handler_ctx.response_code;
   DBG(r, "REQ:[%X] end chxj_serf_post()", (unsigned int)(apr_size_t)r);
   return ret;

diff --git a/src/serf/buckets/ssl_buckets.c b/src/serf/buckets/ssl_buckets.c
index 1cea83c..bbf31a1 100644 (file)
--- a/src/serf/buckets/ssl_buckets.c
+++ b/src/serf/buckets/ssl_buckets.c
@@ -215,19 +215,20 @@ static int bio_bucket_read(BIO *bio, char *in, int inlen)
 static int bio_bucket_write(BIO *bio, const char *in, int inl)
 {
     serf_ssl_context_t *ctx = bio->ptr;
-    serf_bucket_t *tmp;
+    serf_bucket_t *tmp = NULL;
 
 #ifdef SSL_VERBOSE
     printf("bio_bucket_write called for %d bytes\n", inl);
 #endif
     BIO_clear_retry_flags(bio);
 
-    tmp = serf_bucket_simple_copy_create(in, inl,
-                                         ctx->encrypt.pending->allocator);
-
-    serf_bucket_aggregate_append(ctx->encrypt.pending, tmp);
-
-    return inl;
+    if (ctx && ctx->encrypt.pending && ctx->encrypt.pending->allocator) {
+      tmp = serf_bucket_simple_copy_create(in, inl,
+                                           ctx->encrypt.pending->allocator);
+      serf_bucket_aggregate_append(ctx->encrypt.pending, tmp);
+      return inl;
+    }
+    return 0;
 }
 
 /* Returns the amount read. */