From b27b3f67e5e439dcd702986ac1c040fab23b700c Mon Sep 17 00:00:00 2001
From: Noah Levitt <nlevitt@archive.org>
Date: Fri, 15 Jun 2012 18:29:21 -0700
Subject: [PATCH] continuing to mess with httpcomponents

---
 dist/src/main/conf/logging.properties              |  4 ++++
 .../org/archive/modules/fetcher/FetchHTTP2.java    | 14 ++++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/dist/src/main/conf/logging.properties b/dist/src/main/conf/logging.properties
index 5a8e7af6..0238eeed 100644
--- a/dist/src/main/conf/logging.properties
+++ b/dist/src/main/conf/logging.properties
@@ -11,3 +11,7 @@ org.archive.level = INFO
 handlers = java.util.logging.ConsoleHandler
 java.util.logging.ConsoleHandler.level = ALL
 java.util.logging.ConsoleHandler.formatter= org.archive.util.OneLineSimpleLogger
+
+org.apache.http.level = ALL
+org.archive.modules.fetcher.level = ALL
+# org.apache.http.impl.conn.level = ALL
diff --git a/modules/src/main/java/org/archive/modules/fetcher/FetchHTTP2.java b/modules/src/main/java/org/archive/modules/fetcher/FetchHTTP2.java
index 0d3490de..46eedea3 100644
--- a/modules/src/main/java/org/archive/modules/fetcher/FetchHTTP2.java
+++ b/modules/src/main/java/org/archive/modules/fetcher/FetchHTTP2.java
@@ -17,6 +17,7 @@ import java.util.Map;
 
 import org.apache.commons.httpclient.HttpStatus;
 import org.apache.http.Header;
+import org.apache.http.HttpException;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.HttpClient;
@@ -150,10 +151,7 @@ public class FetchHTTP2 extends Processor implements Lifecycle {
         HttpResponse response = null;
         try {
             response = httpClient.execute(request);
-            
             addResponseContent(response, curi);
-
-            rec.markContentBegin();
         } catch (ClientProtocolException e) {
             failedExecuteCleanup(request, curi, e);
             return;
@@ -223,7 +221,7 @@ public class FetchHTTP2 extends Processor implements Lifecycle {
                 };
             }
         };
-        
+
         // never retry (heritrix handles this elsewhere)
         httpClient.setHttpRequestRetryHandler(new HttpRequestRetryHandler() {
             @Override
@@ -351,6 +349,13 @@ public class FetchHTTP2 extends Processor implements Lifecycle {
                     OutputStream ros = rec.outputWrap(new IdentityOutputStream(sob));
                     return new HcOutputWrapper(ros, buffersize, params);
                 }
+                
+                @Override
+                public void receiveResponseEntity(HttpResponse response)
+                        throws HttpException, IOException {
+                    rec.markContentBegin();
+                    super.receiveResponseEntity(response);
+                }
             };
         }
     }
@@ -371,4 +376,5 @@ public class FetchHTTP2 extends Processor implements Lifecycle {
             this.init(out, buffersize, params);
         }
     }
+
 }