@@ -925,7 +925,11 @@ PHP_MINIT_FUNCTION(curl)
925
925
#endif
926
926
927
927
#if LIBCURL_VERSION_NUM >= 0x071001 /* Available since 7.16.1 */
928
+ REGISTER_CURL_CONSTANT (CURLE_SSH );
928
929
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 );
929
933
REGISTER_CURL_CONSTANT (CURLFTPSSL_CCC_ACTIVE );
930
934
REGISTER_CURL_CONSTANT (CURLFTPSSL_CCC_NONE );
931
935
REGISTER_CURL_CONSTANT (CURLFTPSSL_CCC_PASSIVE );
@@ -940,13 +944,13 @@ PHP_MINIT_FUNCTION(curl)
940
944
941
945
#if LIBCURL_VERSION_NUM >= 0x071004 /* Available since 7.16.4 */
942
946
REGISTER_CURL_CONSTANT (CURLOPT_KRBLEVEL );
947
+ REGISTER_CURL_CONSTANT (CURLOPT_NEW_DIRECTORY_PERMS );
948
+ REGISTER_CURL_CONSTANT (CURLOPT_NEW_FILE_PERMS );
943
949
#endif
944
950
945
951
#if LIBCURL_VERSION_NUM >= 0x071100 /* Available since 7.17.0 */
946
952
REGISTER_CURL_CONSTANT (CURLOPT_APPEND );
947
953
REGISTER_CURL_CONSTANT (CURLOPT_DIRLISTONLY );
948
- REGISTER_CURL_CONSTANT (CURLOPT_NEW_DIRECTORY_PERMS );
949
- REGISTER_CURL_CONSTANT (CURLOPT_NEW_FILE_PERMS );
950
954
REGISTER_CURL_CONSTANT (CURLOPT_USE_SSL );
951
955
/* Curl SSL Constants */
952
956
REGISTER_CURL_CONSTANT (CURLUSESSL_ALL );
@@ -955,6 +959,10 @@ PHP_MINIT_FUNCTION(curl)
955
959
REGISTER_CURL_CONSTANT (CURLUSESSL_TRY );
956
960
#endif
957
961
962
+ #if LIBCURL_VERSION_NUM >= 0x071101 /* Available since 7.17.1 */
963
+ REGISTER_CURL_CONSTANT (CURLOPT_SSH_HOST_PUBLIC_KEY_MD5 );
964
+ #endif
965
+
958
966
#if LIBCURL_VERSION_NUM >= 0x071200 /* Available since 7.18.0 */
959
967
REGISTER_CURL_CONSTANT (CURLOPT_PROXY_TRANSFER_MODE );
960
968
#endif
@@ -964,18 +972,13 @@ PHP_MINIT_FUNCTION(curl)
964
972
#endif
965
973
966
974
#if LIBCURL_VERSION_NUM >= 0x071300 /* Available since 7.19.0 */
967
- REGISTER_CURL_CONSTANT (CURLE_SSH );
968
975
REGISTER_CURL_CONSTANT (CURLINFO_APPCONNECT_TIME );
969
976
REGISTER_CURL_CONSTANT (CURLINFO_PRIMARY_IP );
970
977
971
978
REGISTER_CURL_CONSTANT (CURLOPT_ADDRESS_SCOPE );
972
979
REGISTER_CURL_CONSTANT (CURLOPT_CRLFILE );
973
980
REGISTER_CURL_CONSTANT (CURLOPT_ISSUERCERT );
974
981
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 );
979
982
980
983
REGISTER_CURL_CONSTANT (CURLSSH_AUTH_ANY );
981
984
REGISTER_CURL_CONSTANT (CURLSSH_AUTH_DEFAULT );
@@ -2085,13 +2088,18 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
2085
2088
#endif
2086
2089
#if LIBCURL_VERSION_NUM >= 0x071001 /* Available since 7.16.1 */
2087
2090
case CURLOPT_FTP_SSL_CCC :
2091
+ case CURLOPT_SSH_AUTH_TYPES :
2088
2092
#endif
2089
2093
#if LIBCURL_VERSION_NUM >= 0x071002 /* Available since 7.16.2 */
2090
2094
case CURLOPT_CONNECTTIMEOUT_MS :
2091
2095
case CURLOPT_HTTP_CONTENT_DECODING :
2092
2096
case CURLOPT_HTTP_TRANSFER_DECODING :
2093
2097
case CURLOPT_TIMEOUT_MS :
2094
2098
#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
2095
2103
#if LIBCURL_VERSION_NUM >= 0x071100 /* Available since 7.17.0 */
2096
2104
case CURLOPT_USE_SSL :
2097
2105
#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
2100
2108
#if LIBCURL_VERSION_NUM >= 0x071100 /* Available since 7.17.0 */
2101
2109
case CURLOPT_APPEND :
2102
2110
case CURLOPT_DIRLISTONLY :
2103
- case CURLOPT_NEW_DIRECTORY_PERMS :
2104
- case CURLOPT_NEW_FILE_PERMS :
2105
2111
#else
2106
2112
case CURLOPT_FTPAPPEND :
2107
2113
case CURLOPT_FTPLISTONLY :
@@ -2111,7 +2117,6 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
2111
2117
#endif
2112
2118
#if LIBCURL_VERSION_NUM >= 0x071300 /* Available since 7.19.0 */
2113
2119
case CURLOPT_ADDRESS_SCOPE :
2114
- case CURLOPT_SSH_AUTH_TYPES :
2115
2120
#endif
2116
2121
#if LIBCURL_VERSION_NUM > 0x071301 /* Available since 7.19.1 */
2117
2122
case CURLOPT_CERTINFO :
@@ -2187,7 +2192,7 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
2187
2192
#else
2188
2193
case CURLOPT_KRB4LEVEL :
2189
2194
#endif
2190
- #if LIBCURL_VERSION_NUM >= 0x071300 /* Available since 7.19.0 */
2195
+ #if LIBCURL_VERSION_NUM >= 0x071101 /* Available since 7.17.1 */
2191
2196
case CURLOPT_SSH_HOST_PUBLIC_KEY_MD5 :
2192
2197
#endif
2193
2198
#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
2631
2636
#if LIBCURL_VERSION_NUM >= 0x070b00 /* Available since 7.11.0 */
2632
2637
case CURLOPT_NETRC_FILE :
2633
2638
#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
2634
2643
#if LIBCURL_VERSION_NUM >= 0x071300 /* Available since 7.19.0 */
2635
2644
case CURLOPT_CRLFILE :
2636
2645
case CURLOPT_ISSUERCERT :
2637
- case CURLOPT_SSH_PRIVATE_KEYFILE :
2638
- case CURLOPT_SSH_PUBLIC_KEYFILE :
2639
2646
#endif
2640
2647
#if LIBCURL_VERSION_NUM >= 0x071306 /* Available since 7.19.6 */
2641
2648
case CURLOPT_SSH_KNOWNHOSTS :
0 commit comments