Skip to content
Permalink
Browse files

Add new options for curl v7.62.0 to HHVM

Summary:
Grabbing new options from https://curl.haxx.se/libcurl/c/symbols-in-versions.html and adding them here.

`BountyCon{AauQctM8u8Mpr2bkrj3PniXEbj9hXnwXW1nO1z119aZSKns-Fhx9rgfW5TFnYHSpLOwhoM5mH51sz4Bl4CgwubXGW4C0Bjg3ZBgYFndzivsWXDA4BQ_1UvNUMC8}`

Reviewed By: Orvid

Differential Revision: D13233466

fbshipit-source-id: db861b389866623feca182d0a70f22c989cb340c
  • Loading branch information...
FBNeal authored and hhvm-bot committed Dec 16, 2018
1 parent f0c7893 commit 6e3dbe7925723860718c8e673f2c03f81188276a
@@ -88,6 +88,7 @@ const int CURLOPT_BINARYTRANSFER = 0;
const int CURLOPT_COOKIESESSION = 0;
const int CURLOPT_CRLF = 0;
const int CURLOPT_DNS_USE_GLOBAL_CACHE = 0;
const int CURLOPT_DOH_URL = 0;
const int CURLOPT_FAILONERROR = 0;
const int CURLOPT_FILETIME = 0;
const int CURLOPT_FOLLOWLOCATION = 0;
@@ -290,6 +291,8 @@ const int CURLOPT_TLSAUTH_PASSWORD = 0;
const int CURLOPT_TLSAUTH_TYPE = 0;
const int CURLOPT_TLSAUTH_USERNAME = 0;
const int CURLOPT_TRANSFER_ENCODING = 0;
const int CURLOPT_UPKEEP_INTERVAL_MS = 0;
const int CURLOPT_UPLOAD_BUFFERSIZE = 0;
const int CURLOPT_UNIX_SOCKET_PATH = 0;
const int CURLOPT_USERNAME = 0;
const int CURLOPT_USE_SSL = 0;
@@ -546,6 +546,10 @@ bool CurlResource::isLongOption(long option) {
#if LIBCURL_VERSION_NUM >= 0x073d00 /* Available since 7.61.0 */
case CURLOPT_DISALLOW_USERNAME_IN_URL:
#endif
#if LIBCURL_VERSION_NUM >= 0x073e00 /* Available since 7.62.0 */
case CURLOPT_UPKEEP_INTERVAL_MS:
case CURLOPT_UPLOAD_BUFFERSIZE:
#endif
#if CURLOPT_MUTE != 0
case CURLOPT_MUTE:
#endif
@@ -681,6 +685,9 @@ bool CurlResource::isStringOption(long option) {
#if LIBCURL_VERSION_NUM >= 0x073d00 /* Available since 7.61.0 */
case CURLOPT_PROXY_TLS13_CIPHERS:
case CURLOPT_TLS13_CIPHERS:
#endif
#if LIBCURL_VERSION_NUM >= 0x073e00 /* Available since 7.62.0 */
case CURLOPT_DOH_URL:
#endif
return true;
default:
@@ -1483,6 +1483,12 @@ struct CurlExtension final : Extension {
HHVM_RC_INT_SAME(CURLOPT_TLS13_CIPHERS)
#endif

#if LIBCURL_VERSION_NUM >= 0x073e00 /* Available since 7.62.0 */
HHVM_RC_INT_SAME(CURLOPT_DOH_URL);
HHVM_RC_INT_SAME(CURLOPT_UPKEEP_INTERVAL_MS);
HHVM_RC_INT_SAME(CURLOPT_UPLOAD_BUFFERSIZE);
#endif

#if CURLOPT_FTPASCII != 0
HHVM_RC_INT_SAME(CURLOPT_FTPASCII);
#endif

0 comments on commit 6e3dbe7

Please sign in to comment.
You can’t perform that action at this time.