Skip to content

Commit

Permalink
Bump Third Party SHA and remove proxygen secure transport workaround
Browse files Browse the repository at this point in the history
Summary: I updated hhvm-third-party to get the latest `thrift`, `proxygen`,
`wangle`, `squangle`, `mcrouter` and `folly` tags.

D2268791 was an interesting diff that required a couple extra
pushes to third-party.

Thrift was updated so now we can get rid of the workaround in
D2356336 that was causing the OSS build to fail without it.

Reviewed By: @jwatzman

Differential Revision: D2387115
  • Loading branch information
JoelMarcey committed Aug 27, 2015
1 parent 05514e3 commit cd27ed3
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 6 deletions.
2 changes: 0 additions & 2 deletions hphp/runtime/server/fastcgi/fastcgi-server.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,7 @@ void FastCGIAcceptor::onNewConnection(
folly::AsyncSocket::UniquePtr sock,
const folly::SocketAddress* peerAddress,
const std::string& nextProtocolName,
#ifdef HHVM_SECURE_PROTO_TYPE
SecureTransportType secureProtocolType,
#endif
const ::wangle::TransportInfo& tinfo)
{
folly::SocketAddress localAddress;
Expand Down
3 changes: 0 additions & 3 deletions hphp/runtime/server/fastcgi/fastcgi-server.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,7 @@ struct FastCGIAcceptor : public wangle::Acceptor {
void onNewConnection(folly::AsyncSocket::UniquePtr sock,
const folly::SocketAddress* peerAddress,
const std::string& nextProtocolName,
// This is a temporary workaround for dependent projects for OSS HHVM
#ifdef HHVM_SECURE_PROTO_TYPE
SecureTransportType secureProtocolType,
#endif
const wangle::TransportInfo& tinfo) override;
void onConnectionsDrained() override;

Expand Down
2 changes: 1 addition & 1 deletion third-party

0 comments on commit cd27ed3

Please sign in to comment.