Skip to content

Commit 7eadb1e

Browse files
committed
Undo constant removal
Let's wait for PR php#5072, and act accordingly then.
1 parent 2b3dace commit 7eadb1e

File tree

1 file changed

+25
-10
lines changed

1 file changed

+25
-10
lines changed

ext/curl/interface.c

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -540,41 +540,64 @@ PHP_MINIT_FUNCTION(curl)
540540

541541
/* */
542542
REGISTER_CURL_CONSTANT(CURLE_ABORTED_BY_CALLBACK);
543+
REGISTER_CURL_CONSTANT(CURLE_BAD_CALLING_ORDER);
543544
REGISTER_CURL_CONSTANT(CURLE_BAD_CONTENT_ENCODING);
544545
REGISTER_CURL_CONSTANT(CURLE_BAD_DOWNLOAD_RESUME);
545546
REGISTER_CURL_CONSTANT(CURLE_BAD_FUNCTION_ARGUMENT);
547+
REGISTER_CURL_CONSTANT(CURLE_BAD_PASSWORD_ENTERED);
546548
REGISTER_CURL_CONSTANT(CURLE_COULDNT_CONNECT);
547549
REGISTER_CURL_CONSTANT(CURLE_COULDNT_RESOLVE_HOST);
548550
REGISTER_CURL_CONSTANT(CURLE_COULDNT_RESOLVE_PROXY);
549551
REGISTER_CURL_CONSTANT(CURLE_FAILED_INIT);
550552
REGISTER_CURL_CONSTANT(CURLE_FILE_COULDNT_READ_FILE);
553+
REGISTER_CURL_CONSTANT(CURLE_FTP_ACCESS_DENIED);
554+
REGISTER_CURL_CONSTANT(CURLE_FTP_BAD_DOWNLOAD_RESUME);
551555
REGISTER_CURL_CONSTANT(CURLE_FTP_CANT_GET_HOST);
556+
REGISTER_CURL_CONSTANT(CURLE_FTP_CANT_RECONNECT);
557+
REGISTER_CURL_CONSTANT(CURLE_FTP_COULDNT_GET_SIZE);
552558
REGISTER_CURL_CONSTANT(CURLE_FTP_COULDNT_RETR_FILE);
559+
REGISTER_CURL_CONSTANT(CURLE_FTP_COULDNT_SET_ASCII);
560+
REGISTER_CURL_CONSTANT(CURLE_FTP_COULDNT_SET_BINARY);
561+
REGISTER_CURL_CONSTANT(CURLE_FTP_COULDNT_STOR_FILE);
553562
REGISTER_CURL_CONSTANT(CURLE_FTP_COULDNT_USE_REST);
563+
REGISTER_CURL_CONSTANT(CURLE_FTP_PARTIAL_FILE);
554564
REGISTER_CURL_CONSTANT(CURLE_FTP_PORT_FAILED);
565+
REGISTER_CURL_CONSTANT(CURLE_FTP_QUOTE_ERROR);
566+
REGISTER_CURL_CONSTANT(CURLE_FTP_USER_PASSWORD_INCORRECT);
555567
REGISTER_CURL_CONSTANT(CURLE_FTP_WEIRD_227_FORMAT);
556568
REGISTER_CURL_CONSTANT(CURLE_FTP_WEIRD_PASS_REPLY);
557569
REGISTER_CURL_CONSTANT(CURLE_FTP_WEIRD_PASV_REPLY);
558570
REGISTER_CURL_CONSTANT(CURLE_FTP_WEIRD_SERVER_REPLY);
571+
REGISTER_CURL_CONSTANT(CURLE_FTP_WEIRD_USER_REPLY);
572+
REGISTER_CURL_CONSTANT(CURLE_FTP_WRITE_ERROR);
559573
REGISTER_CURL_CONSTANT(CURLE_FUNCTION_NOT_FOUND);
560574
REGISTER_CURL_CONSTANT(CURLE_GOT_NOTHING);
575+
REGISTER_CURL_CONSTANT(CURLE_HTTP_NOT_FOUND);
576+
REGISTER_CURL_CONSTANT(CURLE_HTTP_PORT_FAILED);
561577
REGISTER_CURL_CONSTANT(CURLE_HTTP_POST_ERROR);
578+
REGISTER_CURL_CONSTANT(CURLE_HTTP_RANGE_ERROR);
562579
REGISTER_CURL_CONSTANT(CURLE_HTTP_RETURNED_ERROR);
563580
REGISTER_CURL_CONSTANT(CURLE_LDAP_CANNOT_BIND);
564581
REGISTER_CURL_CONSTANT(CURLE_LDAP_SEARCH_FAILED);
582+
REGISTER_CURL_CONSTANT(CURLE_LIBRARY_NOT_FOUND);
583+
REGISTER_CURL_CONSTANT(CURLE_MALFORMAT_USER);
584+
REGISTER_CURL_CONSTANT(CURLE_OBSOLETE);
565585
REGISTER_CURL_CONSTANT(CURLE_OK);
566586
REGISTER_CURL_CONSTANT(CURLE_OPERATION_TIMEDOUT);
587+
REGISTER_CURL_CONSTANT(CURLE_OPERATION_TIMEOUTED);
567588
REGISTER_CURL_CONSTANT(CURLE_OUT_OF_MEMORY);
568589
REGISTER_CURL_CONSTANT(CURLE_PARTIAL_FILE);
569590
REGISTER_CURL_CONSTANT(CURLE_READ_ERROR);
570591
REGISTER_CURL_CONSTANT(CURLE_RECV_ERROR);
571592
REGISTER_CURL_CONSTANT(CURLE_SEND_ERROR);
593+
REGISTER_CURL_CONSTANT(CURLE_SHARE_IN_USE);
572594
REGISTER_CURL_CONSTANT(CURLE_SSL_CACERT);
573595
REGISTER_CURL_CONSTANT(CURLE_SSL_CERTPROBLEM);
574596
REGISTER_CURL_CONSTANT(CURLE_SSL_CIPHER);
575597
REGISTER_CURL_CONSTANT(CURLE_SSL_CONNECT_ERROR);
576598
REGISTER_CURL_CONSTANT(CURLE_SSL_ENGINE_NOTFOUND);
577599
REGISTER_CURL_CONSTANT(CURLE_SSL_ENGINE_SETFAILED);
600+
REGISTER_CURL_CONSTANT(CURLE_SSL_PEER_CERTIFICATE);
578601
#if LIBCURL_VERSION_NUM >= 0x072700 /* Available since 7.39.0 */
579602
REGISTER_CURL_CONSTANT(CURLE_SSL_PINNEDPUBKEYNOTMATCH);
580603
#endif
@@ -583,6 +606,7 @@ PHP_MINIT_FUNCTION(curl)
583606
REGISTER_CURL_CONSTANT(CURLE_UNKNOWN_TELNET_OPTION);
584607
REGISTER_CURL_CONSTANT(CURLE_UNSUPPORTED_PROTOCOL);
585608
REGISTER_CURL_CONSTANT(CURLE_URL_MALFORMAT);
609+
REGISTER_CURL_CONSTANT(CURLE_URL_MALFORMAT_USER);
586610
REGISTER_CURL_CONSTANT(CURLE_WRITE_ERROR);
587611

588612
/* cURL info constants */
@@ -707,7 +731,7 @@ PHP_MINIT_FUNCTION(curl)
707731
REGISTER_CURL_CONSTANT(CURL_IPRESOLVE_WHATEVER);
708732

709733
/* Available since 7.11.0 */
710-
REGISTER_CURL_CONSTANT(CURLE_USE_SSL_FAILED);
734+
REGISTER_CURL_CONSTANT(CURLE_FTP_SSL_FAILED);
711735
REGISTER_CURL_CONSTANT(CURLFTPSSL_ALL);
712736
REGISTER_CURL_CONSTANT(CURLFTPSSL_CONTROL);
713737
REGISTER_CURL_CONSTANT(CURLFTPSSL_NONE);
@@ -802,17 +826,8 @@ PHP_MINIT_FUNCTION(curl)
802826
REGISTER_CURL_CONSTANT(CURLUSESSL_NONE);
803827
REGISTER_CURL_CONSTANT(CURLUSESSL_TRY);
804828

805-
REGISTER_CURL_CONSTANT(CURLE_REMOTE_ACCESS_DENIED);
806-
REGISTER_CURL_CONSTANT(CURLE_FTP_COULDNT_SET_TYPE);
807-
REGISTER_CURL_CONSTANT(CURLE_UPLOAD_FAILED);
808-
REGISTER_CURL_CONSTANT(CURLE_QUOTE_ERROR);
809-
REGISTER_CURL_CONSTANT(CURLE_INTERFACE_FAILED);
810-
REGISTER_CURL_CONSTANT(CURLE_RANGE_ERROR);
811-
REGISTER_CURL_CONSTANT(CURLE_NOT_BUILT_IN);
812-
813829
/* Available since 7.17.1 */
814830
REGISTER_CURL_CONSTANT(CURLOPT_SSH_HOST_PUBLIC_KEY_MD5);
815-
REGISTER_CURL_CONSTANT(CURLE_PEER_FAILED_VERIFICATION);
816831

817832
#if LIBCURL_VERSION_NUM >= 0x071200 /* Available since 7.18.0 */
818833
REGISTER_CURL_CONSTANT(CURLOPT_PROXY_TRANSFER_MODE);

0 commit comments

Comments
 (0)