From 80dfa0ba37de8f8d61bc344eec09005e6588b78f Mon Sep 17 00:00:00 2001 From: Ilia Alshanetsky Date: Thu, 29 Apr 2004 16:25:54 +0000 Subject: [PATCH] MFH: Fixed bug #28196 (missing error constants in cURL extension). --- NEWS | 1 + ext/curl/curl.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/NEWS b/NEWS index 9cc73c9f07..6b63056f86 100644 --- a/NEWS +++ b/NEWS @@ -5,6 +5,7 @@ PHP 4 NEWS then 1 character long. (Ilia) - Fixed handling of return values from storred procedures in mssql_execute() with multiple result sets returned. (Frank) +- Fixed bug #28196 (missing error constants in cURL extension). (Ilia) - Fixed bug #28187 (parse_url() not handling embedded IPv6 in URLs). (Sara) - Fixed bug #28147 (Crash with drawing anti-aliased lines). (Derick) - Fixed bug #28112 (sqlite_query() crashing apache on malformed query). (Ilia, diff --git a/ext/curl/curl.c b/ext/curl/curl.c index 49af8d44ce..47d9beda97 100644 --- a/ext/curl/curl.c +++ b/ext/curl/curl.c @@ -284,6 +284,35 @@ PHP_MINIT_FUNCTION(curl) REGISTER_CURL_CONSTANT(CURLE_TELNET_OPTION_SYNTAX); REGISTER_CURL_CONSTANT(CURLE_OBSOLETE); REGISTER_CURL_CONSTANT(CURLE_SSL_PEER_CERTIFICATE); + REGISTER_CURL_CONSTANT(CURLE_GOT_NOTHING); + REGISTER_CURL_CONSTANT(CURLE_SSL_ENGINE_NOTFOUND); + REGISTER_CURL_CONSTANT(CURLE_SSL_ENGINE_SETFAILED); + REGISTER_CURL_CONSTANT(CURLE_SEND_ERROR); + REGISTER_CURL_CONSTANT(CURLE_RECV_ERROR); +#ifdef CURLE_SHARE_IN_USE + REGISTER_CURL_CONSTANT(CURLE_SHARE_IN_USE); +#endif +#ifdef CURLE_SSL_CERTPROBLEM + REGISTER_CURL_CONSTANT(CURLE_SSL_CERTPROBLEM); +#endif +#ifdef CURLE_SSL_CIPHER + REGISTER_CURL_CONSTANT(CURLE_SSL_CIPHER); +#endif +#ifdef CURLE_SSL_CACERT + REGISTER_CURL_CONSTANT(CURLE_SSL_CACERT); +#endif +#ifdef CURLE_BAD_CONTENT_ENCODING + REGISTER_CURL_CONSTANT(CURLE_BAD_CONTENT_ENCODING); +#endif +#ifdef CURLE_LDAP_INVALID_URL + REGISTER_CURL_CONSTANT(CURLE_LDAP_INVALID_URL); +#endif +#ifdef CURLE_FILESIZE_EXCEEDED + REGISTER_CURL_CONSTANT(CURLE_FILESIZE_EXCEEDED); +#endif +#ifdef CURLE_FTP_SSL_FAILED + REGISTER_CURL_CONSTANT(CURLE_FTP_SSL_FAILED); +#endif REGISTER_CURL_CONSTANT(CURL_NETRC_OPTIONAL); REGISTER_CURL_CONSTANT(CURL_NETRC_IGNORED); -- 2.40.0