incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From o..@apache.org
Subject svn commit: r1293238 - in /incubator/ooo/trunk/ext_libraries/serf: makefile.mk serf-1.0.0.nochunkedtransferencoding.patch
Date Fri, 24 Feb 2012 13:08:51 GMT
Author: orw
Date: Fri Feb 24 13:08:50 2012
New Revision: 1293238

URL: http://svn.apache.org/viewvc?rev=1293238&view=rev
Log:
patch serf library - disable default used Transfer-Encoding = chunked for sending requests

Added:
    incubator/ooo/trunk/ext_libraries/serf/serf-1.0.0.nochunkedtransferencoding.patch
Modified:
    incubator/ooo/trunk/ext_libraries/serf/makefile.mk

Modified: incubator/ooo/trunk/ext_libraries/serf/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/serf/makefile.mk?rev=1293238&r1=1293237&r2=1293238&view=diff
==============================================================================
--- incubator/ooo/trunk/ext_libraries/serf/makefile.mk (original)
+++ incubator/ooo/trunk/ext_libraries/serf/makefile.mk Fri Feb 24 13:08:50 2012
@@ -37,11 +37,14 @@ LIBSERFVERSION=$(SERF_MAJOR).$(SERF_MINO
 TARFILE_NAME=$(PRJNAME)-$(LIBSERFVERSION)
 TARFILE_MD5=3b179ed18f65c43141528aa6d2440db4
 
+# disable default used Transfer-Encoding = chunked for sending requests.
+PATCH_FILES=$(TARFILE_NAME).nochunkedtransferencoding.patch
+
 .IF "$(OS)"=="WNT"
 
 ADDITIONAL_FILES=Makefile Module_serf.mk Library_serf.mk Package_inc.mk
 
-PATCH_FILES=$(TARFILE_NAME).makewin32.patch
+PATCH_FILES+=$(TARFILE_NAME).makewin32.patch
 
 CONFIGURE_DIR=
 CONFIGURE_ACTION=
@@ -56,10 +59,10 @@ BUILD_FLAGS+= -j$(EXTMAXPROCESS)
 .IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
 # Do not link against expat.  It is not necessary (apr-util is already linked against it)
 # and does not work (we use a different expat library schema.)
-PATCH_FILES=$(TARFILE_NAME).mac.patch
+PATCH_FILES+=$(TARFILE_NAME).mac.patch
 .ELSE
 # Add -ldl as last library so that the linker has no trouble resolving dependencies.
-PATCH_FILES=$(TARFILE_NAME).ldl.patch
+PATCH_FILES+=$(TARFILE_NAME).ldl.patch
 .ENDIF
 
 CONFIGURE_DIR=

Added: incubator/ooo/trunk/ext_libraries/serf/serf-1.0.0.nochunkedtransferencoding.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/serf/serf-1.0.0.nochunkedtransferencoding.patch?rev=1293238&view=auto
==============================================================================
--- incubator/ooo/trunk/ext_libraries/serf/serf-1.0.0.nochunkedtransferencoding.patch (added)
+++ incubator/ooo/trunk/ext_libraries/serf/serf-1.0.0.nochunkedtransferencoding.patch Fri
Feb 24 13:08:50 2012
@@ -0,0 +1,16 @@
+--- misc/serf-1.0.0/buckets/request_buckets.c	2011-06-24 04:03:57.000000000 +0200
++++ misc/build/serf-1.0.0/buckets/request_buckets.c	2012-02-24 08:56:44.086383000 +0100
+@@ -112,9 +112,10 @@
+     serf_bucket_aggregate_append(bucket, new_bucket);
+     serf_bucket_aggregate_append(bucket, ctx->headers);
+     if (ctx->body != NULL) {
+-        /* Morph the body bucket to a chunked encoding bucket for now. */
+-        serf_bucket_headers_set(ctx->headers, "Transfer-Encoding", "chunked");
+-        ctx->body = serf_bucket_chunk_create(ctx->body, bucket->allocator);
++        // no chunked transfer encoding for AOO - orw at apache dot org
++        ///* Morph the body bucket to a chunked encoding bucket for now. */
++        //serf_bucket_headers_set(ctx->headers, "Transfer-Encoding", "chunked");
++        //ctx->body = serf_bucket_chunk_create(ctx->body, bucket->allocator);
+         serf_bucket_aggregate_append(bucket, ctx->body);
+     }
+ 



Mime
View raw message