2008-04-21 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>

	Now HTTP status and version are a member variable of HttpHeader.
	HTTP status is processed as a string, not integer.
	* src/AbstractProxyResponseCommand.cc
	* src/HttpConnection.cc
	* src/HttpHeader.cc
	* src/HttpHeader.h
	* src/HttpHeaderProcessor.cc
	* src/HttpHeaderProcessor.h
	* src/HttpResponse.cc
	* src/HttpResponse.h
	* test/HttpHeaderProcessorTest.cc
	* test/HttpResponseTest.cc

1 files changed, 3 insertions, 4 deletions

diff --git a/src/HttpConnection.cc b/src/HttpConnection.cc
index e624a040..02a9e600 100644
--- a/src/HttpConnection.cc
+++ b/src/HttpConnection.cc
@@ -134,15 +134,14 @@ HttpResponseHandle HttpConnection::receiveResponse()
   // OK, we got all headers.
   logger->info(MSG_RECEIVE_RESPONSE, cuid, proc->getHeaderString().c_str());
 
-  std::pair<std::string, HttpHeaderHandle> httpStatusHeader = proc->getHttpStatusHeader();
-  if(Util::toLower(httpStatusHeader.second->getFirst("Connection")).find("close") != std::string::npos) {
+  SharedHandle<HttpHeader> httpHeader = proc->getHttpResponseHeader();
+  if(Util::toLower(httpHeader->getFirst("Connection")).find("close") != std::string::npos) {
     entry->getHttpRequest()->getRequest()->setKeepAlive(false);
   }
 
   HttpResponseHandle httpResponse(new HttpResponse());
   httpResponse->setCuid(cuid);
-  httpResponse->setStatus(Util::parseInt(httpStatusHeader.first));
-  httpResponse->setHttpHeader(httpStatusHeader.second);
+  httpResponse->setHttpHeader(httpHeader);
   httpResponse->setHttpRequest(entry->getHttpRequest());
 
   outstandingHttpRequests.pop_front();