Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Set SERVER_SOFTWARE to the value provided over FastCGI #2106

Closed
wants to merge 1 commit into from
Closed

Set SERVER_SOFTWARE to the value provided over FastCGI #2106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions hphp/runtime/server/fastcgi/fastcgi-transport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,11 @@ uint16_t FastCGITransport::getServerPort() {
return (m_serverPort != 0) ? m_serverPort : Transport::getServerPort();
}

const char *FastCGITransport::getServerSoftware() {
return (!m_serverSoftware.empty()) ? m_serverSoftware.c_str() :
Transport::getServerSoftware();
}

const void *FastCGITransport::getPostData(int &size) {
assert(!m_readMore);
return getPostDataImpl(size, false);
Expand Down Expand Up @@ -358,6 +363,7 @@ static const std::string
s_remoteAddr("REMOTE_ADDR"),
s_serverName("SERVER_NAME"),
s_serverAddr("SERVER_ADDR"),
s_serverSoftware("SERVER_SOFTWARE"),
s_extendedMethod("REQUEST_METHOD"),
s_httpVersion("HTTP_VERSION"),
s_documentRoot("DOCUMENT_ROOT"),
Expand All @@ -375,6 +381,7 @@ void FastCGITransport::onHeadersComplete() {
m_remoteAddr = getRawHeader(s_remoteAddr);
m_serverName = getRawHeader(s_serverName);
m_serverAddr = getRawHeader(s_serverAddr);
m_serverSoftware = getRawHeader(s_serverSoftware);
m_extendedMethod = getRawHeader(s_extendedMethod);
m_httpVersion = getRawHeader(s_httpVersion);
m_serverObject = getRawHeader(s_scriptName);
Expand Down
1 change: 1 addition & 0 deletions hphp/runtime/server/fastcgi/fastcgi-transport.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ class FastCGITransport
uint16_t m_remotePort;
std::string m_serverName;
std::string m_serverAddr;
std::string m_serverSoftware;
uint16_t m_serverPort;
Method m_method;
std::string m_extendedMethod;
Expand Down
2 changes: 1 addition & 1 deletion hphp/runtime/server/http-protocol.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,7 @@ static void CopyServerInfo(Array& server,
server.set(s_SERVER_ADDR, transport->getServerAddr());
server.set(s_SERVER_NAME, hostName);
server.set(s_SERVER_PORT, transport->getServerPort());
server.set(s_SERVER_SOFTWARE, s_HPHP);
server.set(s_SERVER_SOFTWARE, transport->getServerSoftware());
server.set(s_SERVER_PROTOCOL, "HTTP/" + transport->getHTTPVersion());
server.set(s_SERVER_ADMIN, empty_string);
server.set(s_SERVER_SIGNATURE, empty_string);
Expand Down
3 changes: 3 additions & 0 deletions hphp/runtime/server/transport.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,9 @@ class Transport : public IDebuggable {
virtual uint16_t getServerPort() {
return RuntimeOption::ServerPort;
};
virtual const char *getServerSoftware() {
return "HPHP";
};

/**
* POST request's data.
Expand Down