Skip to content

Commit e5ff3f1

Browse files
committed
Update bad versions for cURL constants
This was updated according to the cURL symbol tables located here : http://curl.haxx.se/libcurl/c/symbols-in-versions.html
1 parent 2a2e31d commit e5ff3f1

File tree

1 file changed

+20
-13
lines changed

1 file changed

+20
-13
lines changed

ext/curl/interface.c

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -925,7 +925,11 @@ PHP_MINIT_FUNCTION(curl)
925925
#endif
926926

927927
#if LIBCURL_VERSION_NUM >= 0x071001 /* Available since 7.16.1 */
928+
REGISTER_CURL_CONSTANT(CURLE_SSH);
928929
REGISTER_CURL_CONSTANT(CURLOPT_FTP_SSL_CCC);
930+
REGISTER_CURL_CONSTANT(CURLOPT_SSH_AUTH_TYPES);
931+
REGISTER_CURL_CONSTANT(CURLOPT_SSH_PRIVATE_KEYFILE);
932+
REGISTER_CURL_CONSTANT(CURLOPT_SSH_PUBLIC_KEYFILE);
929933
REGISTER_CURL_CONSTANT(CURLFTPSSL_CCC_ACTIVE);
930934
REGISTER_CURL_CONSTANT(CURLFTPSSL_CCC_NONE);
931935
REGISTER_CURL_CONSTANT(CURLFTPSSL_CCC_PASSIVE);
@@ -940,13 +944,13 @@ PHP_MINIT_FUNCTION(curl)
940944

941945
#if LIBCURL_VERSION_NUM >= 0x071004 /* Available since 7.16.4 */
942946
REGISTER_CURL_CONSTANT(CURLOPT_KRBLEVEL);
947+
REGISTER_CURL_CONSTANT(CURLOPT_NEW_DIRECTORY_PERMS);
948+
REGISTER_CURL_CONSTANT(CURLOPT_NEW_FILE_PERMS);
943949
#endif
944950

945951
#if LIBCURL_VERSION_NUM >= 0x071100 /* Available since 7.17.0 */
946952
REGISTER_CURL_CONSTANT(CURLOPT_APPEND);
947953
REGISTER_CURL_CONSTANT(CURLOPT_DIRLISTONLY);
948-
REGISTER_CURL_CONSTANT(CURLOPT_NEW_DIRECTORY_PERMS);
949-
REGISTER_CURL_CONSTANT(CURLOPT_NEW_FILE_PERMS);
950954
REGISTER_CURL_CONSTANT(CURLOPT_USE_SSL);
951955
/* Curl SSL Constants */
952956
REGISTER_CURL_CONSTANT(CURLUSESSL_ALL);
@@ -955,6 +959,10 @@ PHP_MINIT_FUNCTION(curl)
955959
REGISTER_CURL_CONSTANT(CURLUSESSL_TRY);
956960
#endif
957961

962+
#if LIBCURL_VERSION_NUM >= 0x071101 /* Available since 7.17.1 */
963+
REGISTER_CURL_CONSTANT(CURLOPT_SSH_HOST_PUBLIC_KEY_MD5);
964+
#endif
965+
958966
#if LIBCURL_VERSION_NUM >= 0x071200 /* Available since 7.18.0 */
959967
REGISTER_CURL_CONSTANT(CURLOPT_PROXY_TRANSFER_MODE);
960968
#endif
@@ -964,18 +972,13 @@ PHP_MINIT_FUNCTION(curl)
964972
#endif
965973

966974
#if LIBCURL_VERSION_NUM >= 0x071300 /* Available since 7.19.0 */
967-
REGISTER_CURL_CONSTANT(CURLE_SSH);
968975
REGISTER_CURL_CONSTANT(CURLINFO_APPCONNECT_TIME);
969976
REGISTER_CURL_CONSTANT(CURLINFO_PRIMARY_IP);
970977

971978
REGISTER_CURL_CONSTANT(CURLOPT_ADDRESS_SCOPE);
972979
REGISTER_CURL_CONSTANT(CURLOPT_CRLFILE);
973980
REGISTER_CURL_CONSTANT(CURLOPT_ISSUERCERT);
974981
REGISTER_CURL_CONSTANT(CURLOPT_KEYPASSWD);
975-
REGISTER_CURL_CONSTANT(CURLOPT_SSH_AUTH_TYPES);
976-
REGISTER_CURL_CONSTANT(CURLOPT_SSH_HOST_PUBLIC_KEY_MD5);
977-
REGISTER_CURL_CONSTANT(CURLOPT_SSH_PRIVATE_KEYFILE);
978-
REGISTER_CURL_CONSTANT(CURLOPT_SSH_PUBLIC_KEYFILE);
979982

980983
REGISTER_CURL_CONSTANT(CURLSSH_AUTH_ANY);
981984
REGISTER_CURL_CONSTANT(CURLSSH_AUTH_DEFAULT);
@@ -2085,13 +2088,18 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
20852088
#endif
20862089
#if LIBCURL_VERSION_NUM >= 0x071001 /* Available since 7.16.1 */
20872090
case CURLOPT_FTP_SSL_CCC:
2091+
case CURLOPT_SSH_AUTH_TYPES:
20882092
#endif
20892093
#if LIBCURL_VERSION_NUM >= 0x071002 /* Available since 7.16.2 */
20902094
case CURLOPT_CONNECTTIMEOUT_MS:
20912095
case CURLOPT_HTTP_CONTENT_DECODING:
20922096
case CURLOPT_HTTP_TRANSFER_DECODING:
20932097
case CURLOPT_TIMEOUT_MS:
20942098
#endif
2099+
#if LIBCURL_VERSION_NUM >= 0x071004 /* Available since 7.16.4 */
2100+
case CURLOPT_NEW_DIRECTORY_PERMS:
2101+
case CURLOPT_NEW_FILE_PERMS:
2102+
#endif
20952103
#if LIBCURL_VERSION_NUM >= 0x071100 /* Available since 7.17.0 */
20962104
case CURLOPT_USE_SSL:
20972105
#elif LIBCURL_VERSION_NUM >= 0x070b00 /* Available since 7.11.0 */
@@ -2100,8 +2108,6 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
21002108
#if LIBCURL_VERSION_NUM >= 0x071100 /* Available since 7.17.0 */
21012109
case CURLOPT_APPEND:
21022110
case CURLOPT_DIRLISTONLY:
2103-
case CURLOPT_NEW_DIRECTORY_PERMS:
2104-
case CURLOPT_NEW_FILE_PERMS:
21052111
#else
21062112
case CURLOPT_FTPAPPEND:
21072113
case CURLOPT_FTPLISTONLY:
@@ -2111,7 +2117,6 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
21112117
#endif
21122118
#if LIBCURL_VERSION_NUM >= 0x071300 /* Available since 7.19.0 */
21132119
case CURLOPT_ADDRESS_SCOPE:
2114-
case CURLOPT_SSH_AUTH_TYPES:
21152120
#endif
21162121
#if LIBCURL_VERSION_NUM > 0x071301 /* Available since 7.19.1 */
21172122
case CURLOPT_CERTINFO:
@@ -2187,7 +2192,7 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
21872192
#else
21882193
case CURLOPT_KRB4LEVEL:
21892194
#endif
2190-
#if LIBCURL_VERSION_NUM >= 0x071300 /* Available since 7.19.0 */
2195+
#if LIBCURL_VERSION_NUM >= 0x071101 /* Available since 7.17.1 */
21912196
case CURLOPT_SSH_HOST_PUBLIC_KEY_MD5:
21922197
#endif
21932198
#if LIBCURL_VERSION_NUM >= 0x071301 /* Available since 7.19.1 */
@@ -2631,11 +2636,13 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
26312636
#if LIBCURL_VERSION_NUM >= 0x070b00 /* Available since 7.11.0 */
26322637
case CURLOPT_NETRC_FILE:
26332638
#endif
2639+
#if LIBCURL_VERSION_NUM >= 0x071001 /* Available since 7.16.1 */
2640+
case CURLOPT_SSH_PRIVATE_KEYFILE:
2641+
case CURLOPT_SSH_PUBLIC_KEYFILE:
2642+
#endif
26342643
#if LIBCURL_VERSION_NUM >= 0x071300 /* Available since 7.19.0 */
26352644
case CURLOPT_CRLFILE:
26362645
case CURLOPT_ISSUERCERT:
2637-
case CURLOPT_SSH_PRIVATE_KEYFILE:
2638-
case CURLOPT_SSH_PUBLIC_KEYFILE:
26392646
#endif
26402647
#if LIBCURL_VERSION_NUM >= 0x071306 /* Available since 7.19.6 */
26412648
case CURLOPT_SSH_KNOWNHOSTS:

0 commit comments

Comments
 (0)