From 01b67654a6414c78b60e9415b160a71ae6109337 Mon Sep 17 00:00:00 2001 From: mwilliams Date: Wed, 10 Jul 2013 10:53:10 -0700 Subject: [PATCH] Revert "Fix duplicate HTTP headers" This reverts commit e265247f34572eedd087ee01c8e43bdab319b322. --- hphp/runtime/base/server/http_protocol.cpp | 5 ++--- hphp/runtime/ext/ext_apache.cpp | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/hphp/runtime/base/server/http_protocol.cpp b/hphp/runtime/base/server/http_protocol.cpp index 536b1838f..07f8e9a9b 100644 --- a/hphp/runtime/base/server/http_protocol.cpp +++ b/hphp/runtime/base/server/http_protocol.cpp @@ -29,7 +29,6 @@ #include "hphp/runtime/base/server/replay_transport.h" #include "hphp/runtime/base/server/virtual_host.h" #include "hphp/runtime/base/util/http_client.h" -#include "folly/String.h" #define DEFAULT_POST_CONTENT_TYPE "application/x-www-form-urlencoded" @@ -282,10 +281,10 @@ void HttpProtocol::PrepareSystemVariables(Transport *transport, } } - { + for (unsigned int i = 0; i < values.size(); i++) { String key = "HTTP_"; key += StringUtil::ToUpper(iter->first).replace("-", "_"); - server.set(key, String(folly::join(", ", values))); + server.set(key, String(values[i])); } } diff --git a/hphp/runtime/ext/ext_apache.cpp b/hphp/runtime/ext/ext_apache.cpp index 001f97b34..5809544ca 100644 --- a/hphp/runtime/ext/ext_apache.cpp +++ b/hphp/runtime/ext/ext_apache.cpp @@ -20,7 +20,6 @@ #include "hphp/runtime/base/runtime_option.h" #include "hphp/runtime/base/server/server_note.h" #include "hphp/runtime/base/server/transport.h" -#include "folly/String.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// @@ -46,7 +45,7 @@ Array f_apache_request_headers() { for (HeaderMap::const_iterator iter = headers.begin(); iter != headers.end(); ++iter) { const vector &values = iter->second; - ret.set(String(iter->first), String(folly::join(", ", values))); + ret.set(String(iter->first), String(values.back())); } return ret; }