Skip to content

Instantly share code, notes, and snippets.

diff --git a/hphp/runtime/server/fastcgi/fastcgi-transport.cpp b/hphp/runtime/server/fastcgi/fastcgi-transport.cpp
index ae0dddf..28e719a 100644
--- a/hphp/runtime/server/fastcgi/fastcgi-transport.cpp
+++ b/hphp/runtime/server/fastcgi/fastcgi-transport.cpp
@@ -303,6 +303,7 @@ void FastCGITransport::onBodyComplete() {
const std::string FastCGITransport::k_requestURIKey = "REQUEST_URI";
const std::string FastCGITransport::k_remoteHostKey = "REMOTE_HOST";
+const std::string FastCGITransport::k_remoteAddrKey = "REMOTE_ADDR";
const std::string FastCGITransport::k_remotePortKey = "REMOTE_PORT";
-------------------------- after initial translation ---------------------------
B0:
Method public (leaf) A::c at 27
--- bc 27, spOff 0 (A::c)
27: String "b.php"
(00) t0:FramePtr = DefFP
(01) t1:StkPtr = DefSP<0> t0:FramePtr
--- bc 32, spOff 1 (A::c)
diff --git a/hphp/runtime/server/fastcgi/fastcgi-transport.cpp b/hphp/runtime/server/fastcgi/fastcgi-transport.cpp
index d7f7501..39b1f84 100644
--- a/hphp/runtime/server/fastcgi/fastcgi-transport.cpp
+++ b/hphp/runtime/server/fastcgi/fastcgi-transport.cpp
@@ -315,12 +315,6 @@ void FastCGITransport::onHeader(std::unique_ptr<folly::IOBuf> key_chain,
std::unique_ptr<folly::IOBuf> value_chain) {
Cursor cursor(key_chain.get());
std::string key = cursor.readFixedString(key_chain->computeChainDataLength());
-
- // HTTP has case insensitive header keys
diff --git a/hphp/runtime/server/fastcgi/fastcgi-transport.cpp b/hphp/runtime/server/fastcgi/fastcgi-transport.cpp
index 0dcff6f..0a01bc0 100644
--- a/hphp/runtime/server/fastcgi/fastcgi-transport.cpp
+++ b/hphp/runtime/server/fastcgi/fastcgi-transport.cpp
@@ -56,8 +56,8 @@ const char *FastCGITransport::getUrl() {
return m_requestURI.c_str();
}
-const std::string FastCGITransport::getScriptFilename() {
- return m_scriptFilename;
diff --git a/hphp/runtime/server/fastcgi/fastcgi-transport.cpp b/hphp/runtime/server/fastcgi/fastcgi-transport.cpp
index 0dcff6f..4c1e392 100644
--- a/hphp/runtime/server/fastcgi/fastcgi-transport.cpp
+++ b/hphp/runtime/server/fastcgi/fastcgi-transport.cpp
@@ -56,8 +56,8 @@ const char *FastCGITransport::getUrl() {
return m_requestURI.c_str();
}
-const std::string FastCGITransport::getScriptFilename() {
- return m_scriptFilename;
diff --git i/hphp/runtime/server/http-protocol.cpp w/hphp/runtime/server/http-protocol.cpp
index 205ab06..cc0342d 100644
--- i/hphp/runtime/server/http-protocol.cpp
+++ w/hphp/runtime/server/http-protocol.cpp
@@ -558,7 +558,10 @@ void HttpProtocol::CopyPathInfo(Variant& server,
server.set(s_SCRIPT_NAME, r.resolvedURL());
}
- if (r.rewritten()) {
+ auto scriptFilename = transport->getPathTranslated();
enum Mode {
PHP_INI_NONE = 0,
PHP_INI_ONLY = 1,
PHP_INI_SYSTEM = 2,
PHP_INI_PERDIR = 4,
PHP_INI_USER = 8,
PHP_INI_ALL = 16,
};
some_function(Mode mode) {
diff --git a/hphp/runtime/ext/ext_pdo.cpp b/hphp/runtime/ext/ext_pdo.cpp
index c49fd8f..81a4d73 100644
--- a/hphp/runtime/ext/ext_pdo.cpp
+++ b/hphp/runtime/ext/ext_pdo.cpp
@@ -2025,7 +2025,7 @@ static bool do_fetch(sp_PDOStatement stmt, bool do_bind, Variant &ret,
static int register_bound_param(CVarRef paramno, VRefParam param, int64_t type,
int64_t max_value_len, CVarRef driver_params,
sp_PDOStatement stmt, bool is_param) {
- SmartResource<PDOBoundParam> p(new PDOBoundParam);
+ SmartResource<PDOBoundParam> p(NEWOBJ(PDOBoundParam));
diff --git a/hphp/runtime/ext/ext_pdo.cpp b/hphp/runtime/ext/ext_pdo.cpp
index c49fd8f..81a4d73 100644
--- a/hphp/runtime/ext/ext_pdo.cpp
+++ b/hphp/runtime/ext/ext_pdo.cpp
@@ -2025,7 +2025,7 @@ static bool do_fetch(sp_PDOStatement stmt, bool do_bind, Variant &ret,
static int register_bound_param(CVarRef paramno, VRefParam param, int64_t type,
int64_t max_value_len, CVarRef driver_params,
sp_PDOStatement stmt, bool is_param) {
- SmartResource<PDOBoundParam> p(new PDOBoundParam);
+ SmartResource<PDOBoundParam> p(NEWOBJ(PDOBoundParam));
diff --git a/hphp/runtime/ext/ext_pdo.cpp b/hphp/runtime/ext/ext_pdo.cpp
index c49fd8f..81a4d73 100644
--- a/hphp/runtime/ext/ext_pdo.cpp
+++ b/hphp/runtime/ext/ext_pdo.cpp
@@ -2025,7 +2025,7 @@ static bool do_fetch(sp_PDOStatement stmt, bool do_bind, Variant &ret,
static int register_bound_param(CVarRef paramno, VRefParam param, int64_t type,
int64_t max_value_len, CVarRef driver_params,
sp_PDOStatement stmt, bool is_param) {
- SmartResource<PDOBoundParam> p(new PDOBoundParam);
+ SmartResource<PDOBoundParam> p(NEWOBJ(PDOBoundParam));