php
diff --git a/‎ext/curl/interface.c
Lines changed: 0 additions & 12 deletions b/‎ext/curl/interface.c
Lines changed: 0 additions & 12 deletions
diff --git a/‎ext/curl/multi.c
Lines changed: 0 additions & 2 deletions b/‎ext/curl/multi.c
Lines changed: 0 additions & 2 deletions
@@ -1518,7 +1518,6 @@ static bool php_curl_set_callable_handler(zend_fcall_info_cache *const handler_f
 {
 	if (ZEND_FCC_INITIALIZED(*handler_fcc)) {
 		zend_fcc_dtor(handler_fcc);
-		handler_fcc->function_handler = NULL;
 	}
 
 	char *error = NULL;
@@ -2699,15 +2698,12 @@ static void curl_free_obj(zend_object *object)
 	smart_str_free(&ch->handlers.write->buf);
 	if (ZEND_FCC_INITIALIZED(ch->handlers.write->fcc)) {
 		zend_fcc_dtor(&ch->handlers.write->fcc);
-		ch->handlers.write->fcc = empty_fcall_info_cache;
 	}
 	if (ZEND_FCC_INITIALIZED(ch->handlers.write_header->fcc)) {
 		zend_fcc_dtor(&ch->handlers.write_header->fcc);
-		ch->handlers.write_header->fcc = empty_fcall_info_cache;
 	}
 	if (ZEND_FCC_INITIALIZED(ch->handlers.read->fcc)) {
 		zend_fcc_dtor(&ch->handlers.read->fcc);
-		ch->handlers.read->fcc = empty_fcall_info_cache;
 	}
 	zval_ptr_dtor(&ch->handlers.std_err);
 	if (ch->header.str) {
@@ -2724,20 +2720,16 @@ static void curl_free_obj(zend_object *object)
 
 	if (ZEND_FCC_INITIALIZED(ch->handlers.progress)) {
 		zend_fcc_dtor(&ch->handlers.progress);
-		ch->handlers.progress = empty_fcall_info_cache;
 	}
 	if (ZEND_FCC_INITIALIZED(ch->handlers.xferinfo)) {
 		zend_fcc_dtor(&ch->handlers.xferinfo);
-		ch->handlers.xferinfo = empty_fcall_info_cache;
 	}
 	if (ZEND_FCC_INITIALIZED(ch->handlers.fnmatch)) {
 		zend_fcc_dtor(&ch->handlers.fnmatch);
-		ch->handlers.fnmatch = empty_fcall_info_cache;
 	}
 #if LIBCURL_VERSION_NUM >= 0x075400 /* Available since 7.84.0 */
 	if (ZEND_FCC_INITIALIZED(ch->handlers.sshhostkey)) {
 		zend_fcc_dtor(&ch->handlers.sshhostkey);
-		ch->handlers.sshhostkey = empty_fcall_info_cache;
 	}
 #endif
 
@@ -2804,23 +2796,19 @@ static void _php_curl_reset_handlers(php_curl *ch)
 
 	if (ZEND_FCC_INITIALIZED(ch->handlers.progress)) {
 		zend_fcc_dtor(&ch->handlers.progress);
-		ch->handlers.progress = empty_fcall_info_cache;
 	}
 
 	if (ZEND_FCC_INITIALIZED(ch->handlers.xferinfo)) {
 		zend_fcc_dtor(&ch->handlers.xferinfo);
-		ch->handlers.xferinfo = empty_fcall_info_cache;
 	}
 
 	if (ZEND_FCC_INITIALIZED(ch->handlers.fnmatch)) {
 		zend_fcc_dtor(&ch->handlers.fnmatch);
-		ch->handlers.fnmatch = empty_fcall_info_cache;
 	}
 
 #if LIBCURL_VERSION_NUM >= 0x075400 /* Available since 7.84.0 */
 	if (ZEND_FCC_INITIALIZED(ch->handlers.sshhostkey)) {
 		zend_fcc_dtor(&ch->handlers.sshhostkey);
-		ch->handlers.sshhostkey = empty_fcall_info_cache;
 	}
 #endif
 }
 
@@ -446,7 +446,6 @@ static bool _php_curl_multi_setopt(php_curlm *mh, zend_long option, zval *zvalue
 			/* See php_curl_set_callable_handler */
 			if (ZEND_FCC_INITIALIZED(mh->handlers.server_push)) {
 				zend_fcc_dtor(&mh->handlers.server_push);
-				mh->handlers.server_push = empty_fcall_info_cache;
 			}
 
 			char *error_str = NULL;
@@ -544,7 +543,6 @@ static void curl_multi_free_obj(zend_object *object)
 
 	if (ZEND_FCC_INITIALIZED(mh->handlers.server_push)) {
 		zend_fcc_dtor(&mh->handlers.server_push);
-		mh->handlers.server_push = empty_fcall_info_cache;
 	}
 
 	zend_object_std_dtor(&mh->std);
Original file line number	Diff line number	Diff line change
`@@ -1518,7 +1518,6 @@ static bool php_curl_set_callable_handler(zend_fcall_info_cache *const handler_f`
`1518`	`1518`	`{`
`1519`	`1519`	`if (ZEND_FCC_INITIALIZED(*handler_fcc)) {`
`1520`	`1520`	`zend_fcc_dtor(handler_fcc);`
`1521`		`- handler_fcc->function_handler = NULL;`
`1522`	`1521`	`}`
`1523`	`1522`
`1524`	`1523`	`char *error = NULL;`
`@@ -2699,15 +2698,12 @@ static void curl_free_obj(zend_object *object)`
`2699`	`2698`	`smart_str_free(&ch->handlers.write->buf);`
`2700`	`2699`	`if (ZEND_FCC_INITIALIZED(ch->handlers.write->fcc)) {`
`2701`	`2700`	`zend_fcc_dtor(&ch->handlers.write->fcc);`
`2702`		`- ch->handlers.write->fcc = empty_fcall_info_cache;`
`2703`	`2701`	`}`
`2704`	`2702`	`if (ZEND_FCC_INITIALIZED(ch->handlers.write_header->fcc)) {`
`2705`	`2703`	`zend_fcc_dtor(&ch->handlers.write_header->fcc);`
`2706`		`- ch->handlers.write_header->fcc = empty_fcall_info_cache;`
`2707`	`2704`	`}`
`2708`	`2705`	`if (ZEND_FCC_INITIALIZED(ch->handlers.read->fcc)) {`
`2709`	`2706`	`zend_fcc_dtor(&ch->handlers.read->fcc);`
`2710`		`- ch->handlers.read->fcc = empty_fcall_info_cache;`
`2711`	`2707`	`}`
`2712`	`2708`	`zval_ptr_dtor(&ch->handlers.std_err);`
`2713`	`2709`	`if (ch->header.str) {`
`@@ -2724,20 +2720,16 @@ static void curl_free_obj(zend_object *object)`
`2724`	`2720`
`2725`	`2721`	`if (ZEND_FCC_INITIALIZED(ch->handlers.progress)) {`
`2726`	`2722`	`zend_fcc_dtor(&ch->handlers.progress);`
`2727`		`- ch->handlers.progress = empty_fcall_info_cache;`
`2728`	`2723`	`}`
`2729`	`2724`	`if (ZEND_FCC_INITIALIZED(ch->handlers.xferinfo)) {`
`2730`	`2725`	`zend_fcc_dtor(&ch->handlers.xferinfo);`
`2731`		`- ch->handlers.xferinfo = empty_fcall_info_cache;`
`2732`	`2726`	`}`
`2733`	`2727`	`if (ZEND_FCC_INITIALIZED(ch->handlers.fnmatch)) {`
`2734`	`2728`	`zend_fcc_dtor(&ch->handlers.fnmatch);`
`2735`		`- ch->handlers.fnmatch = empty_fcall_info_cache;`
`2736`	`2729`	`}`
`2737`	`2730`	`#if LIBCURL_VERSION_NUM >= 0x075400 /* Available since 7.84.0 */`
`2738`	`2731`	`if (ZEND_FCC_INITIALIZED(ch->handlers.sshhostkey)) {`
`2739`	`2732`	`zend_fcc_dtor(&ch->handlers.sshhostkey);`
`2740`		`- ch->handlers.sshhostkey = empty_fcall_info_cache;`
`2741`	`2733`	`}`
`2742`	`2734`	`#endif`
`2743`	`2735`
`@@ -2804,23 +2796,19 @@ static void _php_curl_reset_handlers(php_curl *ch)`
`2804`	`2796`
`2805`	`2797`	`if (ZEND_FCC_INITIALIZED(ch->handlers.progress)) {`
`2806`	`2798`	`zend_fcc_dtor(&ch->handlers.progress);`
`2807`		`- ch->handlers.progress = empty_fcall_info_cache;`
`2808`	`2799`	`}`
`2809`	`2800`
`2810`	`2801`	`if (ZEND_FCC_INITIALIZED(ch->handlers.xferinfo)) {`
`2811`	`2802`	`zend_fcc_dtor(&ch->handlers.xferinfo);`
`2812`		`- ch->handlers.xferinfo = empty_fcall_info_cache;`
`2813`	`2803`	`}`
`2814`	`2804`
`2815`	`2805`	`if (ZEND_FCC_INITIALIZED(ch->handlers.fnmatch)) {`
`2816`	`2806`	`zend_fcc_dtor(&ch->handlers.fnmatch);`
`2817`		`- ch->handlers.fnmatch = empty_fcall_info_cache;`
`2818`	`2807`	`}`
`2819`	`2808`
`2820`	`2809`	`#if LIBCURL_VERSION_NUM >= 0x075400 /* Available since 7.84.0 */`
`2821`	`2810`	`if (ZEND_FCC_INITIALIZED(ch->handlers.sshhostkey)) {`
`2822`	`2811`	`zend_fcc_dtor(&ch->handlers.sshhostkey);`
`2823`		`- ch->handlers.sshhostkey = empty_fcall_info_cache;`
`2824`	`2812`	`}`
`2825`	`2813`	`#endif`
`2826`	`2814`	`}`
Original file line number	Diff line number	Diff line change
`@@ -446,7 +446,6 @@ static bool _php_curl_multi_setopt(php_curlm mh, zend_long option, zval zvalue`
`446`	`446`	`/* See php_curl_set_callable_handler */`
`447`	`447`	`if (ZEND_FCC_INITIALIZED(mh->handlers.server_push)) {`
`448`	`448`	`zend_fcc_dtor(&mh->handlers.server_push);`
`449`		`- mh->handlers.server_push = empty_fcall_info_cache;`
`450`	`449`	`}`
`451`	`450`
`452`	`451`	`char *error_str = NULL;`
`@@ -544,7 +543,6 @@ static void curl_multi_free_obj(zend_object *object)`
`544`	`543`
`545`	`544`	`if (ZEND_FCC_INITIALIZED(mh->handlers.server_push)) {`
`546`	`545`	`zend_fcc_dtor(&mh->handlers.server_push);`
`547`		`- mh->handlers.server_push = empty_fcall_info_cache;`
`548`	`546`	`}`
`549`	`547`
`550`	`548`	`zend_object_std_dtor(&mh->std);`