Update serf to 1.3.8 from 1.1.0

DEPS

@@ -35,7 +35,7 @@ vars = {
   "modspdy_src": "https://svn.apache.org/repos/asf/httpd/mod_spdy/trunk",
   "modspdy_revision": "@1661925",
 
-  "serf_src": "https://svn.apache.org/repos/asf/serf/tags/1.1.0/",
+  "serf_src": "https://svn.apache.org/repos/asf/serf/tags/1.3.8/",
   "serf_revision": "@head",
 
   "apr_src": "https://svn.apache.org/repos/asf/apr/apr/tags/1.5.1/",

net/instaweb/instaweb.gyp

@@ -1738,6 +1738,7 @@
         'rewriter/cache_extender.cc',
         'rewriter/cache_html_filter.cc',
         'rewriter/cacheable_resource_base.cc',
+        'rewriter/central_controller.cc',
         'rewriter/collect_flush_early_content_filter.cc',
         'rewriter/common_filter.cc',
         'rewriter/compute_visible_text_filter.cc',

pagespeed/system/serf_url_async_fetcher.cc

@@ -440,10 +440,10 @@ apr_status_t SerfFetch::HandleResponse(serf_bucket_t* response) {
     return APR_EGENERAL;
   }
 
-  // The response-handling code must be robust to packets coming in all at
-  // once, one byte at a time, or anything in between.  EAGAIN indicates
-  // that more data is available in the socket so another read should
-  // be issued before returning.
+  // The response-handling code must be robust to packets coming in all at once,
+  // one byte at a time, or anything in between.  If we get EAGAIN we need to
+  // return it to our caller so it can do more work and call us again.  See the
+  // serf example code in serf_get.c.
   apr_status_t status = APR_EAGAIN;
   while (MoreDataAvailable(status) && (async_fetch_ != NULL) &&
          !parser_.headers_complete()) {
@@ -458,6 +458,10 @@ apr_status_t SerfFetch::HandleResponse(serf_bucket_t* response) {
     if (one_byte_read_ && !parser_.headers_complete()) {
       status = ReadHeaders(response);
     }
+
+    if (APR_STATUS_IS_EAGAIN(status)) {
+      return status;
+    }
   }
 
   if (parser_.headers_complete()) {
@@ -1170,13 +1174,14 @@ void SerfUrlAsyncFetcher::CancelActiveFetchesMutexHeld() {
 }
 
 bool SerfUrlAsyncFetcher::StartFetch(SerfFetch* fetch) {
+  active_fetches_.Add(fetch);
+  active_count_->Add(1);
   bool started = !shutdown_ && fetch->Start(this);
-  if (started) {
-    active_fetches_.Add(fetch);
-    active_count_->Add(1);
-  } else {
+  if (!started) {
     fetch->message_handler()->Message(kWarning, "Fetch failed to start: %s",
                                       fetch->DebugInfo().c_str());
+    active_fetches_.Remove(fetch);
+    active_count_->Add(-1);
     fetch->CallbackDone(false);
     delete fetch;
   }

third_party/aprutil/aprutil.gyp

@@ -84,6 +84,9 @@
             'src/buckets/apr_buckets_refcount.c',
             'src/buckets/apr_buckets_simple.c',
             'src/buckets/apr_buckets_socket.c',
+            'src/crypto/apr_md5.c',
+            'src/crypto/getuuid.c',
+            'src/crypto/uuid.c',
             'src/dbm/apr_dbm.c',
             'src/dbm/apr_dbm_sdbm.c',
             'src/dbm/sdbm/sdbm.c',