MFH: Fixed bug #28196 (missing error constants in cURL extension).

diff --git a/NEWS b/NEWS
index 9cc73c9f0739869a83a078cef80f0fd6515a42dd..6b63056f86765c9ea2f58a633faa5df4ea8977ba 100644 (file)
--- 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 49af8d44ce036a0ddf0a573c3e9af075a8ba448a..47d9beda9780363b3a18af7ebcebcdd2c9302b8a 100644 (file)
--- 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);