Skip to content

Commit aa0e8bf

Browse files
committed
Use ZVAL_NULL() directly for Z_CLIENT_USE_PROXY_P()
This is just a `?int` property, no need to do anything fancy.
1 parent 8fdd434 commit aa0e8bf

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

ext/soap/php_http.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@ int make_http_soap_request(zval *this_ptr,
509509
ZVAL_NULL(Z_CLIENT_HTTPSOCKET_P(this_ptr));
510510
php_stream_close(stream);
511511
convert_to_null(Z_CLIENT_HTTPURL_P(this_ptr));
512-
convert_to_null(Z_CLIENT_USE_PROXY_P(this_ptr));
512+
ZVAL_NULL(Z_CLIENT_USE_PROXY_P(this_ptr));
513513
stream = NULL;
514514
use_proxy = 0;
515515
}
@@ -520,7 +520,7 @@ int make_http_soap_request(zval *this_ptr,
520520
ZVAL_NULL(Z_CLIENT_HTTPSOCKET_P(this_ptr));
521521
php_stream_close(stream);
522522
convert_to_null(Z_CLIENT_HTTPURL_P(this_ptr));
523-
convert_to_null(Z_CLIENT_USE_PROXY_P(this_ptr));
523+
ZVAL_NULL(Z_CLIENT_USE_PROXY_P(this_ptr));
524524
stream = NULL;
525525
use_proxy = 0;
526526
}
@@ -687,7 +687,7 @@ int make_http_soap_request(zval *this_ptr,
687687
ZVAL_NULL(Z_CLIENT_HTTPSOCKET_P(this_ptr));
688688
php_stream_close(stream);
689689
convert_to_null(Z_CLIENT_HTTPURL_P(this_ptr));
690-
convert_to_null(Z_CLIENT_USE_PROXY_P(this_ptr));
690+
ZVAL_NULL(Z_CLIENT_USE_PROXY_P(this_ptr));
691691
smart_str_free(&soap_headers_z);
692692
smart_str_free(&soap_headers);
693693
efree(http_msg);
@@ -905,7 +905,7 @@ int make_http_soap_request(zval *this_ptr,
905905
ZVAL_NULL(Z_CLIENT_HTTPSOCKET_P(this_ptr));
906906
php_stream_close(stream);
907907
convert_to_null(Z_CLIENT_HTTPURL_P(this_ptr));
908-
convert_to_null(Z_CLIENT_USE_PROXY_P(this_ptr));
908+
ZVAL_NULL(Z_CLIENT_USE_PROXY_P(this_ptr));
909909
add_soap_fault(this_ptr, "HTTP", "Failed Sending HTTP SOAP request", NULL, NULL, SOAP_GLOBAL(lang_en));
910910
smart_str_free(&soap_headers_z);
911911
efree(http_msg);
@@ -929,7 +929,7 @@ int make_http_soap_request(zval *this_ptr,
929929
}
930930
ZVAL_NULL(Z_CLIENT_HTTPSOCKET_P(this_ptr));
931931
php_stream_close(stream);
932-
convert_to_null(Z_CLIENT_USE_PROXY_P(this_ptr));
932+
ZVAL_NULL(Z_CLIENT_USE_PROXY_P(this_ptr));
933933
add_soap_fault(this_ptr, "HTTP", "Error Fetching http headers", NULL, NULL, SOAP_GLOBAL(lang_en));
934934
smart_str_free(&soap_headers_z);
935935
efree(http_msg);
@@ -985,7 +985,7 @@ int make_http_soap_request(zval *this_ptr,
985985
if (http_headers) {
986986
zend_string_release_ex(http_headers, 0);
987987
}
988-
convert_to_null(Z_CLIENT_USE_PROXY_P(this_ptr));
988+
ZVAL_NULL(Z_CLIENT_USE_PROXY_P(this_ptr));
989989
if (http_msg) {
990990
efree(http_msg);
991991
}
@@ -1118,7 +1118,7 @@ int make_http_soap_request(zval *this_ptr,
11181118
ZVAL_NULL(Z_CLIENT_HTTPSOCKET_P(this_ptr));
11191119
php_stream_close(stream);
11201120
zend_string_release_ex(http_headers, 0);
1121-
convert_to_null(Z_CLIENT_USE_PROXY_P(this_ptr));
1121+
ZVAL_NULL(Z_CLIENT_USE_PROXY_P(this_ptr));
11221122
add_soap_fault(this_ptr, "HTTP", "Error Fetching http body, No Content-Length, connection closed or chunked data", NULL, NULL, SOAP_GLOBAL(lang_en));
11231123
if (http_msg) {
11241124
efree(http_msg);
@@ -1134,7 +1134,7 @@ int make_http_soap_request(zval *this_ptr,
11341134
if (http_close) {
11351135
ZVAL_NULL(Z_CLIENT_HTTPSOCKET_P(this_ptr));
11361136
php_stream_close(stream);
1137-
convert_to_null(Z_CLIENT_USE_PROXY_P(this_ptr));
1137+
ZVAL_NULL(Z_CLIENT_USE_PROXY_P(this_ptr));
11381138
stream = NULL;
11391139
}
11401140

0 commit comments

Comments
 (0)