@@ -271,7 +271,7 @@ PHP_MINFO_FUNCTION(curl)
271271
272272 d = curl_version_info (CURLVERSION_NOW );
273273 php_info_print_table_start ();
274- php_info_print_table_row (2 , "cURL support" , "enabled" );
274+ php_info_print_table_row (2 , "cURL support" , "enabled" );
275275 php_info_print_table_row (2 , "cURL version" , d -> version );
276276 snprintf (str , sizeof (str ), "%d" , d -> age );
277277 php_info_print_table_row (2 , "Age" , str );
@@ -301,7 +301,7 @@ PHP_MINFO_FUNCTION(curl)
301301 {"AsynchDNS" , CURL_VERSION_ASYNCHDNS },
302302 {"CharConv" , CURL_VERSION_CONV },
303303 {"Debug" , CURL_VERSION_DEBUG },
304- {"MemoryDebug" , CURL_VERSION_CURLDEBUG },
304+ {"MemoryDebug" , CURL_VERSION_CURLDEBUG },
305305 {"GSS-Negotiate" , CURL_VERSION_GSSNEGOTIATE },
306306 {"IDN" , CURL_VERSION_IDN },
307307 {"IPv6" , CURL_VERSION_IPV6 },
@@ -338,9 +338,9 @@ PHP_MINFO_FUNCTION(curl)
338338 #if LIBCURL_VERSION_NUM >= 0x074c00 /* Available since 7.76.0 */
339339 {"GSASL" , CURL_VERSION_GSASL },
340340 #endif
341- #if LIBCURL_VERSION_NUM >= 0x075600 /* Available since 7.86.0 */
342- {"ThreadSafe" , CURL_VERSION_THREADSAFE },
343- #endif
341+ #if LIBCURL_VERSION_NUM >= 0x075600 /* Available since 7.86.0 */
342+ {"ThreadSafe" , CURL_VERSION_THREADSAFE },
343+ #endif
344344 {NULL , 0 }
345345 };
346346
@@ -788,8 +788,8 @@ static int curl_prereqfunction(void *clientp, char *conn_primary_ip, char *conn_
788788 // gets called. Return CURL_PREREQFUNC_OK immediately in this case to avoid
789789 // zend_call_known_fcc() with an uninitialized FCC.
790790 if (!ZEND_FCC_INITIALIZED (ch -> handlers .prereq )) {
791- return rval ;
792- }
791+ return rval ;
792+ }
793793
794794#if PHP_CURL_DEBUG
795795 fprintf (stderr , "curl_prereqfunction() called\n" );
@@ -983,42 +983,42 @@ static int curl_debug(CURL *handle, curl_infotype type, char *data, size_t size,
983983{
984984 php_curl * ch = (php_curl * )clientp ;
985985
986- #if PHP_CURL_DEBUG
987- fprintf (stderr , "curl_debug() called\n" );
988- fprintf (stderr , "type = %d, data = %s\n" , type , data );
989- #endif
986+ #if PHP_CURL_DEBUG
987+ fprintf (stderr , "curl_debug() called\n" );
988+ fprintf (stderr , "type = %d, data = %s\n" , type , data );
989+ #endif
990990
991991 // Implicitly store the headers for compatibility with CURLINFO_HEADER_OUT
992992 // used as a Curl option. Previously, setting CURLINFO_HEADER_OUT set curl_debug
993993 // as the CURLOPT_DEBUGFUNCTION and stored the debug data when type is set to
994994 // CURLINFO_HEADER_OUT. For backward compatibility, we now store the headers
995995 // but also call the user-callback function if available.
996- if (type == CURLINFO_HEADER_OUT ) {
997- if (ch -> header .str ) {
998- zend_string_release_ex (ch -> header .str , 0 );
999- }
1000- ch -> header .str = zend_string_init (data , size , 0 );
1001- }
996+ if (type == CURLINFO_HEADER_OUT ) {
997+ if (ch -> header .str ) {
998+ zend_string_release_ex (ch -> header .str , 0 );
999+ }
1000+ ch -> header .str = zend_string_init (data , size , 0 );
1001+ }
10021002
1003- if (!ZEND_FCC_INITIALIZED (ch -> handlers .debug )) {
1004- return 0 ;
1005- }
1003+ if (!ZEND_FCC_INITIALIZED (ch -> handlers .debug )) {
1004+ return 0 ;
1005+ }
10061006
1007- zval args [3 ];
1007+ zval args [3 ];
10081008
1009- GC_ADDREF (& ch -> std );
1010- ZVAL_OBJ (& args [0 ], & ch -> std );
1011- ZVAL_LONG (& args [1 ], type );
1012- ZVAL_STRINGL (& args [2 ], data , size );
1009+ GC_ADDREF (& ch -> std );
1010+ ZVAL_OBJ (& args [0 ], & ch -> std );
1011+ ZVAL_LONG (& args [1 ], type );
1012+ ZVAL_STRINGL (& args [2 ], data , size );
10131013
1014- ch -> in_callback = true;
1015- zend_call_known_fcc (& ch -> handlers .debug , NULL , /* param_count */ 3 , args , /* named_params */ NULL );
1016- ch -> in_callback = false;
1014+ ch -> in_callback = true;
1015+ zend_call_known_fcc (& ch -> handlers .debug , NULL , /* param_count */ 3 , args , /* named_params */ NULL );
1016+ ch -> in_callback = false;
10171017
1018- zval_ptr_dtor (& args [0 ]);
1019- zval_ptr_dtor (& args [2 ]);
1018+ zval_ptr_dtor (& args [0 ]);
1019+ zval_ptr_dtor (& args [2 ]);
10201020
1021- return 0 ;
1021+ return 0 ;
10221022}
10231023/* }}} */
10241024
@@ -1074,7 +1074,7 @@ PHP_FUNCTION(curl_version)
10741074 zval feature_list ;
10751075 array_init (& feature_list );
10761076 if (d -> age >= CURLVERSION_ELEVENTH && d -> feature_names ) {
1077- {
1077+ {
10781078 char * * p = (char * * ) d -> feature_names ;
10791079 while (* p != NULL ) {
10801080 add_next_index_string (& feature_list , * p );
@@ -1095,7 +1095,7 @@ PHP_FUNCTION(curl_version)
10951095 {"AsynchDNS" , CURL_VERSION_ASYNCHDNS },
10961096 {"CharConv" , CURL_VERSION_CONV },
10971097 {"Debug" , CURL_VERSION_DEBUG },
1098- {"MemoryDebug" , CURL_VERSION_CURLDEBUG },
1098+ {"MemoryDebug" , CURL_VERSION_CURLDEBUG },
10991099 {"GSS-Negotiate" , CURL_VERSION_GSSNEGOTIATE },
11001100 {"IDN" , CURL_VERSION_IDN },
11011101 {"IPv6" , CURL_VERSION_IPV6 },
@@ -1132,9 +1132,9 @@ PHP_FUNCTION(curl_version)
11321132 #if LIBCURL_VERSION_NUM >= 0x074c00 /* Available since 7.76.0 */
11331133 {"GSASL" , CURL_VERSION_GSASL },
11341134 #endif
1135- #if LIBCURL_VERSION_NUM >= 0x075600 /* Available since 7.86.0 */
1136- {"ThreadSafe" , CURL_VERSION_THREADSAFE },
1137- #endif
1135+ #if LIBCURL_VERSION_NUM >= 0x075600 /* Available since 7.86.0 */
1136+ {"ThreadSafe" , CURL_VERSION_THREADSAFE },
1137+ #endif
11381138 };
11391139
11401140 for (i = 0 ; i < sizeof (feats ) / sizeof (feats [0 ]); i ++ ) {
@@ -1184,16 +1184,16 @@ PHP_FUNCTION(curl_version)
11841184 }
11851185 if (d -> age >= CURLVERSION_FOURTH && d -> iconv_ver_num ) {
11861186 CAAL ("version_iconv" , d -> iconv_ver_num );
1187- }
1188- if (d -> age >= CURLVERSION_FOURTH && d -> libssh_version ) {
1187+ }
1188+ if (d -> age >= CURLVERSION_FOURTH && d -> libssh_version ) {
11891189 add_assoc_string (& feature_version , "libssh" , d -> libssh_version );
11901190 }
11911191 if (d -> age >= CURLVERSION_FIFTH && d -> brotli_version ) {
11921192 add_assoc_string (& feature_version , "brotli" , d -> brotli_version );
11931193 }
11941194 if (d -> age >= CURLVERSION_SIXTH && d -> nghttp2_version ) {
11951195 add_assoc_string (& feature_version , "nghttp2" , d -> nghttp2_version );
1196- }
1196+ }
11971197 if (d -> age >= CURLVERSION_SIXTH && d -> quic_version ) {
11981198 add_assoc_string (& feature_version , "quic" , d -> quic_version );
11991199 }
@@ -2370,9 +2370,9 @@ static zend_result _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue
23702370
23712371 case CURLINFO_HEADER_OUT :
23722372 if (ZEND_FCC_INITIALIZED (ch -> handlers .debug )) {
2373- zend_value_error ("CURLINFO_HEADER_OUT option must not be set when the CURLOPT_DEBUGFUNCTION option is set" );
2374- return FAILURE ;
2375- }
2373+ zend_value_error ("CURLINFO_HEADER_OUT option must not be set when the CURLOPT_DEBUGFUNCTION option is set" );
2374+ return FAILURE ;
2375+ }
23762376
23772377 if (zend_is_true (zvalue )) {
23782378 curl_easy_setopt (ch -> cp , CURLOPT_DEBUGFUNCTION , curl_debug );
0 commit comments