Bump required libcurl version to 7.17.1

libcurl 7.17.1 has been released 12 years ago, so it doesn't seem
reasonable to still cater to older versions.  The main reason for this
version bump is to cater to a mass renaming of `CURLE_*` constants in
7.17.0 (and a single further renaming in 7.17.1), whereby many of the
old constants have been marked obsolete, and according to curl.h have
been scheduled for removal in 2009 already.

So we remove all respective PHP `CURLE_*` constants, and add not yet
available replacements, except for those constants which have been
marked as being obsolete (`CURLE_OBSOLETE*`), since these error codes
are not supposed to be returned ever.

Renamed constants:
* `CURLE_FTP_ACCESS_DENIED` → `CURLE_REMOTE_ACCESS_DENIED`
* `CURLE_FTP_BAD_DOWNLOAD_RESUME` → `CURLE_BAD_DOWNLOAD_RESUME`
* `CURLE_FTP_COULDNT_SET_BINARY` → `CURLE_FTP_COULDNT_SET_TYPE`
* `CURLE_FTP_COULDNT_STOR_FILE` → `CURLE_UPLOAD_FAILED`
* `CURLE_FTP_PARTIAL_FILE` → `CURLE_PARTIAL_FILE`
* `CURLE_FTP_QUOTE_ERROR` → `CURLE_QUOTE_ERROR`
* `CURLE_HTTP_NOT_FOUND` → `CURLE_HTTP_RETURNED_ERROR`
* `CURLE_HTTP_PORT_FAILED` → `CURLE_INTERFACE_FAILED`
* `CURLE_HTTP_RANGE_ERROR` → `CURLE_RANGE_ERROR`
* `CURLE_OPERATION_TIMEOUTED` → `CURLE_OPERATION_TIMEDOUT`
* `CURLE_SSL_PEER_CERTIFICATE` → `CURLE_PEER_FAILED_VERIFICATION`
* `CURLE_URL_MALFORMAT_USER` → `CURLE_NOT_BUILT_IN`
* `CURLE_FTP_SSL_FAILED` → `CURLE_USE_SSL_FAILED`

Removed constants:
* `CURLE_BAD_CALLING_ORDER`
* `CURLE_BAD_PASSWORD_ENTERED`
* `CURLE_FTP_CANT_RECONNECT`
* `CURLE_FTP_COULDNT_GET_SIZE`
* `CURLE_FTP_COULDNT_SET_ASCII`
* `CURLE_FTP_USER_PASSWORD_INCORRECT`
* `CURLE_FTP_WEIRD_USER_REPLY`
* `CURLE_FTP_WRITE_ERROR`
* `CURLE_LIBRARY_NOT_FOUND`
* `CURLE_OBSOLETE`
* `CURLE_SHARE_IN_USE`
* `CURLE_MALFORMAT_USER`

Author: cmb69

ext/curl/config.m4

@@ -4,7 +4,7 @@ PHP_ARG_WITH([curl],
     [Include cURL support])])
 
 if test "$PHP_CURL" != "no"; then
-  PKG_CHECK_MODULES([CURL], [libcurl >= 7.15.5])
+  PKG_CHECK_MODULES([CURL], [libcurl >= 7.17.1])
   PKG_CHECK_VAR([CURL_FEATURES], [libcurl], [supported_features])
 
   PHP_EVAL_LIBLINE($CURL_LIBS, CURL_SHARED_LIBADD)

ext/curl/interface.c

@@ -118,20 +118,16 @@ static int php_curl_option_str(php_curl *ch, zend_long option, const char *str,
 		return FAILURE;
 	}
 
-#if LIBCURL_VERSION_NUM >= 0x071100
 	if (make_copy) {
-#endif
 		char *copystr;
 
 		/* Strings passed to libcurl as 'char *' arguments, are copied by the library since 7.17.0 */
 		copystr = estrndup(str, len);
 		error = curl_easy_setopt(ch->cp, option, copystr);
 		zend_llist_add_element(&ch->to_free->str, &copystr);
-#if LIBCURL_VERSION_NUM >= 0x071100
 	} else {
 		error = curl_easy_setopt(ch->cp, option, str);
 	}
-#endif
 
 	SAVE_CURL_ERROR(ch, error);
 
@@ -544,64 +540,41 @@ PHP_MINIT_FUNCTION(curl)
 
 	/* */
 	REGISTER_CURL_CONSTANT(CURLE_ABORTED_BY_CALLBACK);
-	REGISTER_CURL_CONSTANT(CURLE_BAD_CALLING_ORDER);
 	REGISTER_CURL_CONSTANT(CURLE_BAD_CONTENT_ENCODING);
 	REGISTER_CURL_CONSTANT(CURLE_BAD_DOWNLOAD_RESUME);
 	REGISTER_CURL_CONSTANT(CURLE_BAD_FUNCTION_ARGUMENT);
-	REGISTER_CURL_CONSTANT(CURLE_BAD_PASSWORD_ENTERED);
 	REGISTER_CURL_CONSTANT(CURLE_COULDNT_CONNECT);
 	REGISTER_CURL_CONSTANT(CURLE_COULDNT_RESOLVE_HOST);
 	REGISTER_CURL_CONSTANT(CURLE_COULDNT_RESOLVE_PROXY);
 	REGISTER_CURL_CONSTANT(CURLE_FAILED_INIT);
 	REGISTER_CURL_CONSTANT(CURLE_FILE_COULDNT_READ_FILE);
-	REGISTER_CURL_CONSTANT(CURLE_FTP_ACCESS_DENIED);
-	REGISTER_CURL_CONSTANT(CURLE_FTP_BAD_DOWNLOAD_RESUME);
 	REGISTER_CURL_CONSTANT(CURLE_FTP_CANT_GET_HOST);
-	REGISTER_CURL_CONSTANT(CURLE_FTP_CANT_RECONNECT);
-	REGISTER_CURL_CONSTANT(CURLE_FTP_COULDNT_GET_SIZE);
 	REGISTER_CURL_CONSTANT(CURLE_FTP_COULDNT_RETR_FILE);
-	REGISTER_CURL_CONSTANT(CURLE_FTP_COULDNT_SET_ASCII);
-	REGISTER_CURL_CONSTANT(CURLE_FTP_COULDNT_SET_BINARY);
-	REGISTER_CURL_CONSTANT(CURLE_FTP_COULDNT_STOR_FILE);
 	REGISTER_CURL_CONSTANT(CURLE_FTP_COULDNT_USE_REST);
-	REGISTER_CURL_CONSTANT(CURLE_FTP_PARTIAL_FILE);
 	REGISTER_CURL_CONSTANT(CURLE_FTP_PORT_FAILED);
-	REGISTER_CURL_CONSTANT(CURLE_FTP_QUOTE_ERROR);
-	REGISTER_CURL_CONSTANT(CURLE_FTP_USER_PASSWORD_INCORRECT);
 	REGISTER_CURL_CONSTANT(CURLE_FTP_WEIRD_227_FORMAT);
 	REGISTER_CURL_CONSTANT(CURLE_FTP_WEIRD_PASS_REPLY);
 	REGISTER_CURL_CONSTANT(CURLE_FTP_WEIRD_PASV_REPLY);
 	REGISTER_CURL_CONSTANT(CURLE_FTP_WEIRD_SERVER_REPLY);
-	REGISTER_CURL_CONSTANT(CURLE_FTP_WEIRD_USER_REPLY);
-	REGISTER_CURL_CONSTANT(CURLE_FTP_WRITE_ERROR);
 	REGISTER_CURL_CONSTANT(CURLE_FUNCTION_NOT_FOUND);
 	REGISTER_CURL_CONSTANT(CURLE_GOT_NOTHING);
-	REGISTER_CURL_CONSTANT(CURLE_HTTP_NOT_FOUND);
-	REGISTER_CURL_CONSTANT(CURLE_HTTP_PORT_FAILED);
 	REGISTER_CURL_CONSTANT(CURLE_HTTP_POST_ERROR);
-	REGISTER_CURL_CONSTANT(CURLE_HTTP_RANGE_ERROR);
 	REGISTER_CURL_CONSTANT(CURLE_HTTP_RETURNED_ERROR);
 	REGISTER_CURL_CONSTANT(CURLE_LDAP_CANNOT_BIND);
 	REGISTER_CURL_CONSTANT(CURLE_LDAP_SEARCH_FAILED);
-	REGISTER_CURL_CONSTANT(CURLE_LIBRARY_NOT_FOUND);
-	REGISTER_CURL_CONSTANT(CURLE_MALFORMAT_USER);
-	REGISTER_CURL_CONSTANT(CURLE_OBSOLETE);
 	REGISTER_CURL_CONSTANT(CURLE_OK);
 	REGISTER_CURL_CONSTANT(CURLE_OPERATION_TIMEDOUT);
-	REGISTER_CURL_CONSTANT(CURLE_OPERATION_TIMEOUTED);
 	REGISTER_CURL_CONSTANT(CURLE_OUT_OF_MEMORY);
 	REGISTER_CURL_CONSTANT(CURLE_PARTIAL_FILE);
 	REGISTER_CURL_CONSTANT(CURLE_READ_ERROR);
 	REGISTER_CURL_CONSTANT(CURLE_RECV_ERROR);
 	REGISTER_CURL_CONSTANT(CURLE_SEND_ERROR);
-	REGISTER_CURL_CONSTANT(CURLE_SHARE_IN_USE);
 	REGISTER_CURL_CONSTANT(CURLE_SSL_CACERT);
 	REGISTER_CURL_CONSTANT(CURLE_SSL_CERTPROBLEM);
 	REGISTER_CURL_CONSTANT(CURLE_SSL_CIPHER);
 	REGISTER_CURL_CONSTANT(CURLE_SSL_CONNECT_ERROR);
 	REGISTER_CURL_CONSTANT(CURLE_SSL_ENGINE_NOTFOUND);
 	REGISTER_CURL_CONSTANT(CURLE_SSL_ENGINE_SETFAILED);
-	REGISTER_CURL_CONSTANT(CURLE_SSL_PEER_CERTIFICATE);
 #if LIBCURL_VERSION_NUM >= 0x072700 /* Available since 7.39.0 */
 	REGISTER_CURL_CONSTANT(CURLE_SSL_PINNEDPUBKEYNOTMATCH);
 #endif
@@ -610,7 +583,6 @@ PHP_MINIT_FUNCTION(curl)
 	REGISTER_CURL_CONSTANT(CURLE_UNKNOWN_TELNET_OPTION);
 	REGISTER_CURL_CONSTANT(CURLE_UNSUPPORTED_PROTOCOL);
 	REGISTER_CURL_CONSTANT(CURLE_URL_MALFORMAT);
-	REGISTER_CURL_CONSTANT(CURLE_URL_MALFORMAT_USER);
 	REGISTER_CURL_CONSTANT(CURLE_WRITE_ERROR);
 
 	/* cURL info constants */
@@ -735,7 +707,7 @@ PHP_MINIT_FUNCTION(curl)
 	REGISTER_CURL_CONSTANT(CURL_IPRESOLVE_WHATEVER);
 
 	/* Available since 7.11.0 */
-	REGISTER_CURL_CONSTANT(CURLE_FTP_SSL_FAILED);
+	REGISTER_CURL_CONSTANT(CURLE_USE_SSL_FAILED);
 	REGISTER_CURL_CONSTANT(CURLFTPSSL_ALL);
 	REGISTER_CURL_CONSTANT(CURLFTPSSL_CONTROL);
 	REGISTER_CURL_CONSTANT(CURLFTPSSL_NONE);
@@ -791,13 +763,12 @@ PHP_MINIT_FUNCTION(curl)
 	REGISTER_CURL_CONSTANT(CURLOPT_MAX_RECV_SPEED_LARGE);
 	REGISTER_CURL_CONSTANT(CURLOPT_MAX_SEND_SPEED_LARGE);
 
-#if LIBCURL_VERSION_NUM >= 0x071000 /* Available since 7.16.0 */
+	/* Available since 7.16.0 */
 	REGISTER_CURL_CONSTANT(CURLE_SSL_CACERT_BADFILE);
 	REGISTER_CURL_CONSTANT(CURLOPT_SSL_SESSIONID_CACHE);
 	REGISTER_CURL_CONSTANT(CURLMOPT_PIPELINING);
-#endif
 
-#if LIBCURL_VERSION_NUM >= 0x071001 /* Available since 7.16.1 */
+	/* Available since 7.16.1 */
 	REGISTER_CURL_CONSTANT(CURLE_SSH);
 	REGISTER_CURL_CONSTANT(CURLOPT_FTP_SSL_CCC);
 	REGISTER_CURL_CONSTANT(CURLOPT_SSH_AUTH_TYPES);
@@ -806,26 +777,22 @@ PHP_MINIT_FUNCTION(curl)
 	REGISTER_CURL_CONSTANT(CURLFTPSSL_CCC_ACTIVE);
 	REGISTER_CURL_CONSTANT(CURLFTPSSL_CCC_NONE);
 	REGISTER_CURL_CONSTANT(CURLFTPSSL_CCC_PASSIVE);
-#endif
 
-#if LIBCURL_VERSION_NUM >= 0x071002 /* Available since 7.16.2 */
+	/* Available since 7.16.2 */
 	REGISTER_CURL_CONSTANT(CURLOPT_CONNECTTIMEOUT_MS);
 	REGISTER_CURL_CONSTANT(CURLOPT_HTTP_CONTENT_DECODING);
 	REGISTER_CURL_CONSTANT(CURLOPT_HTTP_TRANSFER_DECODING);
 	REGISTER_CURL_CONSTANT(CURLOPT_TIMEOUT_MS);
-#endif
 
-#if LIBCURL_VERSION_NUM >= 0x071003 /* Available since 7.16.3 */
+	/* Available since 7.16.3 */
 	REGISTER_CURL_CONSTANT(CURLMOPT_MAXCONNECTS);
-#endif
 
-#if LIBCURL_VERSION_NUM >= 0x071004 /* Available since 7.16.4 */
+	/* Available since 7.16.4 */
 	REGISTER_CURL_CONSTANT(CURLOPT_KRBLEVEL);
 	REGISTER_CURL_CONSTANT(CURLOPT_NEW_DIRECTORY_PERMS);
 	REGISTER_CURL_CONSTANT(CURLOPT_NEW_FILE_PERMS);
-#endif
 
-#if LIBCURL_VERSION_NUM >= 0x071100 /* Available since 7.17.0 */
+	/* Available since 7.17.0 */
 	REGISTER_CURL_CONSTANT(CURLOPT_APPEND);
 	REGISTER_CURL_CONSTANT(CURLOPT_DIRLISTONLY);
 	REGISTER_CURL_CONSTANT(CURLOPT_USE_SSL);
@@ -834,11 +801,18 @@ PHP_MINIT_FUNCTION(curl)
 	REGISTER_CURL_CONSTANT(CURLUSESSL_CONTROL);
 	REGISTER_CURL_CONSTANT(CURLUSESSL_NONE);
 	REGISTER_CURL_CONSTANT(CURLUSESSL_TRY);
-#endif
 
-#if LIBCURL_VERSION_NUM >= 0x071101 /* Available since 7.17.1 */
+	REGISTER_CURL_CONSTANT(CURLE_REMOTE_ACCESS_DENIED);
+	REGISTER_CURL_CONSTANT(CURLE_FTP_COULDNT_SET_TYPE);
+	REGISTER_CURL_CONSTANT(CURLE_UPLOAD_FAILED);
+	REGISTER_CURL_CONSTANT(CURLE_QUOTE_ERROR);
+	REGISTER_CURL_CONSTANT(CURLE_INTERFACE_FAILED);
+	REGISTER_CURL_CONSTANT(CURLE_RANGE_ERROR);
+	REGISTER_CURL_CONSTANT(CURLE_NOT_BUILT_IN);
+
+	/* Available since 7.17.1 */
 	REGISTER_CURL_CONSTANT(CURLOPT_SSH_HOST_PUBLIC_KEY_MD5);
-#endif
+	REGISTER_CURL_CONSTANT(CURLE_PEER_FAILED_VERIFICATION);
 
 #if LIBCURL_VERSION_NUM >= 0x071200 /* Available since 7.18.0 */
 	REGISTER_CURL_CONSTANT(CURLOPT_PROXY_TRANSFER_MODE);
@@ -1716,12 +1690,10 @@ PHP_FUNCTION(curl_version)
 	if (d->age >= 2) {
 		CAAS("libidn", d->libidn);
 	}
-#if LIBCURL_VERSION_NUM >= 0x071001 /* Available since 7.16.1 */
 	if (d->age >= 3) {
 		CAAL("iconv_ver_num", d->iconv_ver_num);
 		CAAS("libssh_version", d->libssh_version);
 	}
-#endif
 #if LIBCURL_VERSION_NUM >= 0x073900 /* Available since 7.57.0 */
 	if (d->age >= 4) {
 		CAAL("brotli_ver_num", d->brotli_ver_num);
@@ -2079,32 +2051,18 @@ static int _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue) /* {{{
 		case CURLOPT_CONNECT_ONLY:
 		case CURLOPT_LOCALPORT:
 		case CURLOPT_LOCALPORTRANGE:
-#if LIBCURL_VERSION_NUM >= 0x071000 /* Available since 7.16.0 */
 		case CURLOPT_SSL_SESSIONID_CACHE:
-#endif
-#if LIBCURL_VERSION_NUM >= 0x071001 /* Available since 7.16.1 */
 		case CURLOPT_FTP_SSL_CCC:
 		case CURLOPT_SSH_AUTH_TYPES:
-#endif
-#if LIBCURL_VERSION_NUM >= 0x071002 /* Available since 7.16.2 */
 		case CURLOPT_CONNECTTIMEOUT_MS:
 		case CURLOPT_HTTP_CONTENT_DECODING:
 		case CURLOPT_HTTP_TRANSFER_DECODING:
 		case CURLOPT_TIMEOUT_MS:
-#endif
-#if LIBCURL_VERSION_NUM >= 0x071004 /* Available since 7.16.4 */
 		case CURLOPT_NEW_DIRECTORY_PERMS:
 		case CURLOPT_NEW_FILE_PERMS:
-#endif
-#if LIBCURL_VERSION_NUM >= 0x071100 /* Available since 7.17.0 */
 		case CURLOPT_USE_SSL:
 		case CURLOPT_APPEND:
 		case CURLOPT_DIRLISTONLY:
-#else
-		case CURLOPT_FTP_SSL:
-		case CURLOPT_FTPAPPEND:
-		case CURLOPT_FTPLISTONLY:
-#endif
 #if LIBCURL_VERSION_NUM >= 0x071200 /* Available since 7.18.0 */
 		case CURLOPT_PROXY_TRANSFER_MODE:
 #endif
@@ -2245,9 +2203,7 @@ static int _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue) /* {{{
 		case CURLOPT_USERPWD:
 		case CURLOPT_COOKIELIST:
 		case CURLOPT_FTP_ALTERNATIVE_TO_USER:
-#if LIBCURL_VERSION_NUM >= 0x071101 /* Available since 7.17.1 */
 		case CURLOPT_SSH_HOST_PUBLIC_KEY_MD5:
-#endif
 #if LIBCURL_VERSION_NUM >= 0x071301 /* Available since 7.19.1 */
 		case CURLOPT_PASSWORD:
 		case CURLOPT_PROXYPASSWORD:
@@ -2343,11 +2299,7 @@ static int _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue) /* {{{
 #if LIBCURL_VERSION_NUM >= 0x072800 /* Available since 7.40.0 */
 		case CURLOPT_UNIX_SOCKET_PATH:
 #endif
-#if LIBCURL_VERSION_NUM >= 0x071004 /* Available since 7.16.4 */
 		case CURLOPT_KRBLEVEL:
-#else
-		case CURLOPT_KRB4LEVEL:
-#endif
 		{
 			if (Z_ISNULL_P(zvalue)) {
 				error = curl_easy_setopt(ch->cp, option, NULL);
@@ -2751,25 +2703,12 @@ static int _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue) /* {{{
 				error = curl_easy_setopt(ch->cp, CURLOPT_HTTPPOST, first);
 #endif
 			} else {
-#if LIBCURL_VERSION_NUM >= 0x071101
 				zend_string *tmp_str;
 				zend_string *str = zval_get_tmp_string(zvalue, &tmp_str);
 				/* with curl 7.17.0 and later, we can use COPYPOSTFIELDS, but we have to provide size before */
 				error = curl_easy_setopt(ch->cp, CURLOPT_POSTFIELDSIZE, ZSTR_LEN(str));
 				error = curl_easy_setopt(ch->cp, CURLOPT_COPYPOSTFIELDS, ZSTR_VAL(str));
 				zend_tmp_string_release(tmp_str);
-#else
-				char *post = NULL;
-				zend_string *tmp_str;
-				zend_string *str = zval_get_tmp_string(zvalue, &tmp_str);
-
-				post = estrndup(ZSTR_VAL(str), ZSTR_LEN(str));
-				zend_llist_add_element(&ch->to_free->str, &post);
-
-				curl_easy_setopt(ch->cp, CURLOPT_POSTFIELDS, post);
-				error = curl_easy_setopt(ch->cp, CURLOPT_POSTFIELDSIZE, ZSTR_LEN(str));
-				zend_tmp_string_release(tmp_str);
-#endif
 			}
 			break;
 
@@ -2837,10 +2776,8 @@ static int _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue) /* {{{
 		case CURLOPT_RANDOM_FILE:
 		case CURLOPT_SSLCERT:
 		case CURLOPT_NETRC_FILE:
-#if LIBCURL_VERSION_NUM >= 0x071001 /* Available since 7.16.1 */
 		case CURLOPT_SSH_PRIVATE_KEYFILE:
 		case CURLOPT_SSH_PUBLIC_KEYFILE:
-#endif
 #if LIBCURL_VERSION_NUM >= 0x071300 /* Available since 7.19.0 */
 		case CURLOPT_CRLFILE:
 		case CURLOPT_ISSUERCERT:

ext/curl/multi.c

@@ -552,12 +552,8 @@ static int _php_curl_multi_setopt(php_curlm *mh, zend_long option, zval *zvalue,
 	CURLMcode error = CURLM_OK;
 
 	switch (option) {
-#if LIBCURL_VERSION_NUM >= 0x071000 /* 7.16.0 */
 		case CURLMOPT_PIPELINING:
-#endif
-#if LIBCURL_VERSION_NUM >= 0x071003 /* 7.16.3 */
 		case CURLMOPT_MAXCONNECTS:
-#endif
 #if LIBCURL_VERSION_NUM >= 0x071e00 /* 7.30.0 */
 		case CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE:
 		case CURLMOPT_CONTENT_LENGTH_PENALTY_SIZE: