@@ -728,8 +728,8 @@ static int curl_prereqfunction(void *clientp, char *conn_primary_ip, char *conn_
728728 // gets called. Return CURL_PREREQFUNC_OK immediately in this case to avoid
729729 // zend_call_known_fcc() with an uninitialized FCC.
730730 if (!ZEND_FCC_INITIALIZED (ch -> handlers .prereq )) {
731- return rval ;
732- }
731+ return rval ;
732+ }
733733
734734#if PHP_CURL_DEBUG
735735 fprintf (stderr , "curl_prereqfunction() called\n" );
@@ -924,42 +924,42 @@ static int curl_debug(CURL *handle, curl_infotype type, char *data, size_t size,
924924{
925925 php_curl * ch = (php_curl * )clientp ;
926926
927- #if PHP_CURL_DEBUG
928- fprintf (stderr , "curl_debug() called\n" );
929- fprintf (stderr , "type = %d, data = %s\n" , type , data );
930- #endif
927+ #if PHP_CURL_DEBUG
928+ fprintf (stderr , "curl_debug() called\n" );
929+ fprintf (stderr , "type = %d, data = %s\n" , type , data );
930+ #endif
931931
932932 // Implicitly store the headers for compatibility with CURLINFO_HEADER_OUT
933933 // used as a Curl option. Previously, setting CURLINFO_HEADER_OUT set curl_debug
934934 // as the CURLOPT_DEBUGFUNCTION and stored the debug data when type is set to
935935 // CURLINFO_HEADER_OUT. For backward compatibility, we now store the headers
936936 // but also call the user-callback function if available.
937- if (type == CURLINFO_HEADER_OUT ) {
938- if (ch -> header .str ) {
939- zend_string_release_ex (ch -> header .str , 0 );
940- }
941- ch -> header .str = zend_string_init (data , size , 0 );
942- }
937+ if (type == CURLINFO_HEADER_OUT ) {
938+ if (ch -> header .str ) {
939+ zend_string_release_ex (ch -> header .str , 0 );
940+ }
941+ ch -> header .str = zend_string_init (data , size , 0 );
942+ }
943943
944- if (!ZEND_FCC_INITIALIZED (ch -> handlers .debug )) {
945- return 0 ;
946- }
944+ if (!ZEND_FCC_INITIALIZED (ch -> handlers .debug )) {
945+ return 0 ;
946+ }
947947
948- zval args [3 ];
948+ zval args [3 ];
949949
950- GC_ADDREF (& ch -> std );
951- ZVAL_OBJ (& args [0 ], & ch -> std );
952- ZVAL_LONG (& args [1 ], type );
953- ZVAL_STRINGL (& args [2 ], data , size );
950+ GC_ADDREF (& ch -> std );
951+ ZVAL_OBJ (& args [0 ], & ch -> std );
952+ ZVAL_LONG (& args [1 ], type );
953+ ZVAL_STRINGL (& args [2 ], data , size );
954954
955- ch -> in_callback = true;
956- zend_call_known_fcc (& ch -> handlers .debug , NULL , /* param_count */ 3 , args , /* named_params */ NULL );
957- ch -> in_callback = false;
955+ ch -> in_callback = true;
956+ zend_call_known_fcc (& ch -> handlers .debug , NULL , /* param_count */ 3 , args , /* named_params */ NULL );
957+ ch -> in_callback = false;
958958
959- zval_ptr_dtor (& args [0 ]);
960- zval_ptr_dtor (& args [2 ]);
959+ zval_ptr_dtor (& args [0 ]);
960+ zval_ptr_dtor (& args [2 ]);
961961
962- return 0 ;
962+ return 0 ;
963963}
964964/* }}} */
965965
@@ -2282,9 +2282,9 @@ static zend_result _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue
22822282
22832283 case CURLINFO_HEADER_OUT :
22842284 if (ZEND_FCC_INITIALIZED (ch -> handlers .debug )) {
2285- zend_value_error ("CURLINFO_HEADER_OUT option must not be set when the CURLOPT_DEBUGFUNCTION option is set" );
2286- return FAILURE ;
2287- }
2285+ zend_value_error ("CURLINFO_HEADER_OUT option must not be set when the CURLOPT_DEBUGFUNCTION option is set" );
2286+ return FAILURE ;
2287+ }
22882288
22892289 if (zend_is_true (zvalue )) {
22902290 curl_easy_setopt (ch -> cp , CURLOPT_DEBUGFUNCTION , curl_debug );
0 commit comments