Skip to content

Commit 431d24a

Browse files
committed
Remove unnecessary set to NULL/empty FCC
1 parent 4b7230b commit 431d24a

File tree

2 files changed

+0
-14
lines changed

2 files changed

+0
-14
lines changed

ext/curl/interface.c

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1518,7 +1518,6 @@ static bool php_curl_set_callable_handler(zend_fcall_info_cache *const handler_f
15181518
{
15191519
if (ZEND_FCC_INITIALIZED(*handler_fcc)) {
15201520
zend_fcc_dtor(handler_fcc);
1521-
handler_fcc->function_handler = NULL;
15221521
}
15231522

15241523
char *error = NULL;
@@ -2699,15 +2698,12 @@ static void curl_free_obj(zend_object *object)
26992698
smart_str_free(&ch->handlers.write->buf);
27002699
if (ZEND_FCC_INITIALIZED(ch->handlers.write->fcc)) {
27012700
zend_fcc_dtor(&ch->handlers.write->fcc);
2702-
ch->handlers.write->fcc = empty_fcall_info_cache;
27032701
}
27042702
if (ZEND_FCC_INITIALIZED(ch->handlers.write_header->fcc)) {
27052703
zend_fcc_dtor(&ch->handlers.write_header->fcc);
2706-
ch->handlers.write_header->fcc = empty_fcall_info_cache;
27072704
}
27082705
if (ZEND_FCC_INITIALIZED(ch->handlers.read->fcc)) {
27092706
zend_fcc_dtor(&ch->handlers.read->fcc);
2710-
ch->handlers.read->fcc = empty_fcall_info_cache;
27112707
}
27122708
zval_ptr_dtor(&ch->handlers.std_err);
27132709
if (ch->header.str) {
@@ -2724,20 +2720,16 @@ static void curl_free_obj(zend_object *object)
27242720

27252721
if (ZEND_FCC_INITIALIZED(ch->handlers.progress)) {
27262722
zend_fcc_dtor(&ch->handlers.progress);
2727-
ch->handlers.progress = empty_fcall_info_cache;
27282723
}
27292724
if (ZEND_FCC_INITIALIZED(ch->handlers.xferinfo)) {
27302725
zend_fcc_dtor(&ch->handlers.xferinfo);
2731-
ch->handlers.xferinfo = empty_fcall_info_cache;
27322726
}
27332727
if (ZEND_FCC_INITIALIZED(ch->handlers.fnmatch)) {
27342728
zend_fcc_dtor(&ch->handlers.fnmatch);
2735-
ch->handlers.fnmatch = empty_fcall_info_cache;
27362729
}
27372730
#if LIBCURL_VERSION_NUM >= 0x075400 /* Available since 7.84.0 */
27382731
if (ZEND_FCC_INITIALIZED(ch->handlers.sshhostkey)) {
27392732
zend_fcc_dtor(&ch->handlers.sshhostkey);
2740-
ch->handlers.sshhostkey = empty_fcall_info_cache;
27412733
}
27422734
#endif
27432735

@@ -2804,23 +2796,19 @@ static void _php_curl_reset_handlers(php_curl *ch)
28042796

28052797
if (ZEND_FCC_INITIALIZED(ch->handlers.progress)) {
28062798
zend_fcc_dtor(&ch->handlers.progress);
2807-
ch->handlers.progress = empty_fcall_info_cache;
28082799
}
28092800

28102801
if (ZEND_FCC_INITIALIZED(ch->handlers.xferinfo)) {
28112802
zend_fcc_dtor(&ch->handlers.xferinfo);
2812-
ch->handlers.xferinfo = empty_fcall_info_cache;
28132803
}
28142804

28152805
if (ZEND_FCC_INITIALIZED(ch->handlers.fnmatch)) {
28162806
zend_fcc_dtor(&ch->handlers.fnmatch);
2817-
ch->handlers.fnmatch = empty_fcall_info_cache;
28182807
}
28192808

28202809
#if LIBCURL_VERSION_NUM >= 0x075400 /* Available since 7.84.0 */
28212810
if (ZEND_FCC_INITIALIZED(ch->handlers.sshhostkey)) {
28222811
zend_fcc_dtor(&ch->handlers.sshhostkey);
2823-
ch->handlers.sshhostkey = empty_fcall_info_cache;
28242812
}
28252813
#endif
28262814
}

ext/curl/multi.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,6 @@ static bool _php_curl_multi_setopt(php_curlm *mh, zend_long option, zval *zvalue
446446
/* See php_curl_set_callable_handler */
447447
if (ZEND_FCC_INITIALIZED(mh->handlers.server_push)) {
448448
zend_fcc_dtor(&mh->handlers.server_push);
449-
mh->handlers.server_push = empty_fcall_info_cache;
450449
}
451450

452451
char *error_str = NULL;
@@ -544,7 +543,6 @@ static void curl_multi_free_obj(zend_object *object)
544543

545544
if (ZEND_FCC_INITIALIZED(mh->handlers.server_push)) {
546545
zend_fcc_dtor(&mh->handlers.server_push);
547-
mh->handlers.server_push = empty_fcall_info_cache;
548546
}
549547

550548
zend_object_std_dtor(&mh->std);

0 commit comments

Comments
 (0)