Merge branch 'PHP-8.3'

nielsdos · nielsdos · commit b7bf5e5706e1 · 2023-10-25T17:56:53.000+02:00
* PHP-8.3:
  Fix incorrect dtor for persistent sdl-&gt;encoders
diff --git a/ext/soap/php_sdl.c b/ext/soap/php_sdl.c
@@ -164,7 +164,7 @@ encodePtr get_encoder(sdlPtr sdl, const char *ns, const char *type)
 			}
 			if (sdl->encoders == NULL) {
 				sdl->encoders = pemalloc(sizeof(HashTable), sdl->is_persistent);
-				zend_hash_init(sdl->encoders, 0, NULL, delete_encoder, sdl->is_persistent);
+				zend_hash_init(sdl->encoders, 0, NULL, sdl->is_persistent ? delete_encoder_persistent : delete_encoder, sdl->is_persistent);
 			}
 			zend_hash_str_update_ptr(sdl->encoders, nscat, len, new_enc);
 			enc = new_enc;

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ encodePtr get_encoder(sdlPtr sdl, const char ns, const char type)`
`164`	`164`	`}`
`165`	`165`	`if (sdl->encoders == NULL) {`
`166`	`166`	`sdl->encoders = pemalloc(sizeof(HashTable), sdl->is_persistent);`
`167`		`- zend_hash_init(sdl->encoders, 0, NULL, delete_encoder, sdl->is_persistent);`
	`167`	`+ zend_hash_init(sdl->encoders, 0, NULL, sdl->is_persistent ? delete_encoder_persistent : delete_encoder, sdl->is_persistent);`
`168`	`168`	`}`
`169`	`169`	`zend_hash_str_update_ptr(sdl->encoders, nscat, len, new_enc);`
`170`	`170`	`enc = new_enc;`