Author: rhuijben
Date: Wed Nov 18 10:34:10 2015
New Revision: 1714962

URL: http://svn.apache.org/viewvc?rev=1714962&view=rev
Log:
Fix two cases where buckets didn't properly handle config.

* buckets/event_buckets.c
  (serf_event_set_config): New function.
  (serf_bucket_type__event): Add function.

* buckets/fcgi_buckets.c
  (serf__bucket_fcgi_frame_create): Initialize config to NULL.

Modified:
    serf/trunk/buckets/event_buckets.c
    serf/trunk/buckets/fcgi_buckets.c

Modified: serf/trunk/buckets/event_buckets.c
URL: 
http://svn.apache.org/viewvc/serf/trunk/buckets/event_buckets.c?rev=1714962&r1=1714961&r2=1714962&view=diff
==============================================================================
--- serf/trunk/buckets/event_buckets.c (original)
+++ serf/trunk/buckets/event_buckets.c Wed Nov 18 10:34:10 2015
@@ -199,6 +199,17 @@ static apr_uint64_t serf_event_get_remai
     }
 }
 
+apr_status_t serf_event_set_config(serf_bucket_t *bucket,
+                                   serf_config_t *config)
+{
+    event_context_t *ctx = bucket->data;
+
+    if (ctx->stream)
+        return serf_bucket_set_config(ctx->stream, config);
+
+    return APR_SUCCESS;
+}
+
 static void serf_event_destroy(serf_bucket_t *bucket)
 {
     event_context_t *ctx = bucket->data;
@@ -223,5 +234,5 @@ const serf_bucket_type_t serf_bucket_typ
     serf_event_destroy,
     serf_default_read_bucket,
     serf_event_get_remaining,
-    serf_default_ignore_config,
+    serf_event_set_config
 };

Modified: serf/trunk/buckets/fcgi_buckets.c
URL: 
http://svn.apache.org/viewvc/serf/trunk/buckets/fcgi_buckets.c?rev=1714962&r1=1714961&r2=1714962&view=diff
==============================================================================
--- serf/trunk/buckets/fcgi_buckets.c (original)
+++ serf/trunk/buckets/fcgi_buckets.c Wed Nov 18 10:34:10 2015
@@ -634,6 +634,7 @@ serf__bucket_fcgi_frame_create(serf_buck
     ctx->send_eof = send_eof;
     ctx->at_eof = false;
     ctx->agg = NULL;
+    ctx->config = NULL;
 
     return serf_bucket_create(&serf_bucket_type__fcgi_frame, alloc, ctx);
 }


Reply via email to