Skip to content

Commit 39ff28b

Browse files
ericnorrisericnorris
committed
refactor: rename to curl_share_init_persistent 
1 parent 73a6ba0 commit 39ff28b

12 files changed

+47
-47
lines changed

‎Zend/Optimizer/zend_func_infos.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ static const func_info_t func_infos[] = {
4646
F1("curl_multi_strerror", MAY_BE_STRING|MAY_BE_NULL),
4747
F1("curl_share_init", MAY_BE_OBJECT),
4848
F1("curl_share_strerror", MAY_BE_STRING|MAY_BE_NULL),
49+
F1("curl_share_init_persistent", MAY_BE_OBJECT),
4950
F1("curl_strerror", MAY_BE_STRING|MAY_BE_NULL),
50-
F1("curl_persistent_share_init", MAY_BE_OBJECT),
5151
F1("curl_version", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_LONG|MAY_BE_ARRAY_OF_STRING|MAY_BE_ARRAY_OF_ARRAY|MAY_BE_FALSE),
5252
F1("date", MAY_BE_STRING),
5353
F1("gmdate", MAY_BE_STRING),

‎ext/curl/curl.stub.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3672,7 +3672,7 @@ final class CurlShareHandle
36723672
* @strict-properties
36733673
* @not-serializable
36743674
*/
3675-
final class CurlPersistentShareHandle
3675+
final class CurlSharePersistentHandle
36763676
{
36773677
public readonly array $options;
36783678
}
@@ -3760,10 +3760,10 @@ function curl_share_setopt(CurlShareHandle $share_handle, int $option, mixed $va
37603760
function curl_share_strerror(int $error_code): ?string {}
37613761

37623762
/** @refcount 1 */
3763-
function curl_strerror(int $error_code): ?string {}
3763+
function curl_share_init_persistent(array $share_options): CurlSharePersistentHandle {}
37643764

37653765
/** @refcount 1 */
3766-
function curl_persistent_share_init(array $share_options): CurlPersistentShareHandle {}
3766+
function curl_strerror(int $error_code): ?string {}
37673767

37683768
/**
37693769
* @return array<string, int|string|array>|false

‎ext/curl/curl_arginfo.h‎

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ext/curl/curl_private.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,8 @@ static inline php_curlsh *curl_share_from_obj(zend_object *obj) {
164164

165165
void curl_multi_register_handlers(void);
166166
void curl_share_register_handlers(void);
167+
void curl_share_persistent_register_handlers(void);
167168
void curl_share_free_persistent_curlsh(zval *data);
168-
void curl_persistent_share_register_handlers(void);
169169
void curlfile_register_class(void);
170170
zend_result curl_cast_object(zend_object *obj, zval *result, int type);
171171

‎ext/curl/interface.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ PHP_GSHUTDOWN_FUNCTION(curl)
244244

245245
zend_class_entry *curl_ce;
246246
zend_class_entry *curl_share_ce;
247-
zend_class_entry *curl_persistent_share_ce;
247+
zend_class_entry *curl_share_persistent_ce;
248248
static zend_object_handlers curl_object_handlers;
249249

250250
static zend_object *curl_create_object(zend_class_entry *class_type);
@@ -429,8 +429,8 @@ PHP_MINIT_FUNCTION(curl)
429429
curl_share_ce = register_class_CurlShareHandle();
430430
curl_share_register_handlers();
431431

432-
curl_persistent_share_ce = register_class_CurlPersistentShareHandle();
433-
curl_persistent_share_register_handlers();
432+
curl_share_persistent_ce = register_class_CurlSharePersistentHandle();
433+
curl_share_persistent_register_handlers();
434434

435435
curlfile_register_class();
436436

@@ -2302,7 +2302,7 @@ static zend_result _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue
23022302
break;
23032303
}
23042304

2305-
if (Z_OBJCE_P(zvalue) != curl_share_ce && Z_OBJCE_P(zvalue) != curl_persistent_share_ce) {
2305+
if (Z_OBJCE_P(zvalue) != curl_share_ce && Z_OBJCE_P(zvalue) != curl_share_persistent_ce) {
23062306
break;
23072307
}
23082308

‎ext/curl/php_curl.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ extern zend_module_entry curl_module_entry;
3737

3838
PHP_CURL_API extern zend_class_entry *curl_ce;
3939
PHP_CURL_API extern zend_class_entry *curl_share_ce;
40-
PHP_CURL_API extern zend_class_entry *curl_persistent_share_ce;
40+
PHP_CURL_API extern zend_class_entry *curl_share_persistent_ce;
4141
PHP_CURL_API extern zend_class_entry *curl_multi_ce;
4242
PHP_CURL_API extern zend_class_entry *curl_CURLFile_class;
4343
PHP_CURL_API extern zend_class_entry *curl_CURLStringFile_class;

‎ext/curl/share.c‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ PHP_FUNCTION(curl_share_strerror)
141141
*
142142
* Throws an exception if the share options are invalid.
143143
*/
144-
PHP_FUNCTION(curl_persistent_share_init)
144+
PHP_FUNCTION(curl_share_init_persistent)
145145
{
146146
zval *share_opts = NULL, *entry = NULL;
147147
zend_ulong persistent_id = 0;
@@ -154,7 +154,7 @@ PHP_FUNCTION(curl_persistent_share_init)
154154
Z_PARAM_ARRAY_EX(share_opts, 0, 1)
155155
ZEND_PARSE_PARAMETERS_END();
156156

157-
object_init_ex(return_value, curl_persistent_share_ce);
157+
object_init_ex(return_value, curl_share_persistent_ce);
158158
sh = Z_CURL_SHARE_P(return_value);
159159

160160
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(share_opts), entry) {
@@ -177,7 +177,7 @@ PHP_FUNCTION(curl_persistent_share_init)
177177
} ZEND_HASH_FOREACH_END();
178178

179179
zend_array_sort(Z_ARRVAL_P(share_opts), php_array_data_compare_unstable_i, 1);
180-
zend_update_property(curl_persistent_share_ce, Z_OBJ_P(return_value), "options", sizeof("options") - 1, share_opts);
180+
zend_update_property(curl_share_persistent_ce, Z_OBJ_P(return_value), "options", sizeof("options") - 1, share_opts);
181181

182182
if (persistent_id) {
183183
zval *persisted = zend_hash_index_find(&CURL_G(persistent_curlsh), persistent_id);
@@ -280,22 +280,22 @@ void curl_share_register_handlers(void) {
280280
curl_share_handlers.compare = zend_objects_not_comparable;
281281
}
282282

283-
/* CurlPersistentShareHandle class */
283+
/* CurlSharePersistentHandle class */
284284

285-
static zend_function *curl_persistent_share_get_constructor(zend_object *object) {
286-
zend_throw_error(NULL, "Cannot directly construct CurlPersistentShareHandle, use curl_persistent_share_init() instead");
285+
static zend_object_handlers curl_share_persistent_handlers;
286+
287+
static zend_function *curl_share_persistent_get_constructor(zend_object *object) {
288+
zend_throw_error(NULL, "Cannot directly construct CurlSharePersistentHandle, use curl_share_init_persistent() instead");
287289
return NULL;
288290
}
289291

290-
static zend_object_handlers curl_persistent_share_handlers;
291-
292-
void curl_persistent_share_register_handlers(void) {
293-
curl_persistent_share_ce->create_object = curl_share_create_object;
294-
curl_persistent_share_ce->default_object_handlers = &curl_persistent_share_handlers;
292+
void curl_share_persistent_register_handlers(void) {
293+
curl_share_persistent_ce->create_object = curl_share_create_object;
294+
curl_share_persistent_ce->default_object_handlers = &curl_share_persistent_handlers;
295295

296-
memcpy(&curl_persistent_share_handlers, &std_object_handlers, sizeof(zend_object_handlers));
297-
curl_persistent_share_handlers.offset = XtOffsetOf(php_curlsh, std);
298-
curl_persistent_share_handlers.get_constructor = curl_persistent_share_get_constructor;
299-
curl_persistent_share_handlers.clone_obj = NULL;
300-
curl_persistent_share_handlers.compare = zend_objects_not_comparable;
296+
memcpy(&curl_share_persistent_handlers, &std_object_handlers, sizeof(zend_object_handlers));
297+
curl_share_persistent_handlers.offset = XtOffsetOf(php_curlsh, std);
298+
curl_share_persistent_handlers.get_constructor = curl_share_persistent_get_constructor;
299+
curl_share_persistent_handlers.clone_obj = NULL;
300+
curl_share_persistent_handlers.compare = zend_objects_not_comparable;
301301
}

‎ext/curl/tests/curl_persistent_share_001.phpt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ include 'skipif-nocaddy.inc';
99
--FILE--
1010
<?php
1111

12-
function get_localhost_curl_handle(CurlPersistentShareHandle $sh): CurlHandle {
12+
function get_localhost_curl_handle(CurlSharePersistentHandle $sh): CurlHandle {
1313
$ch = curl_init("https://localhost");
1414

1515
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
@@ -19,13 +19,13 @@ function get_localhost_curl_handle(CurlPersistentShareHandle $sh): CurlHandle {
1919
return $ch;
2020
}
2121

22-
$sh1 = curl_persistent_share_init([CURL_LOCK_DATA_CONNECT, CURL_LOCK_DATA_DNS]);
22+
$sh1 = curl_share_init_persistent([CURL_LOCK_DATA_CONNECT, CURL_LOCK_DATA_DNS]);
2323
$ch1 = get_localhost_curl_handle($sh1);
2424

2525
// Expect the two options we set above, but sorted.
2626
var_dump($sh1->options);
2727

28-
$sh2 = curl_persistent_share_init([CURL_LOCK_DATA_DNS, CURL_LOCK_DATA_CONNECT]);
28+
$sh2 = curl_share_init_persistent([CURL_LOCK_DATA_DNS, CURL_LOCK_DATA_CONNECT]);
2929
$ch2 = get_localhost_curl_handle($sh2);
3030

3131
// Expect the connect time on the subsequent request to be zero, since it's reusing the connection.

‎ext/curl/tests/curl_persistent_share_002.phpt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ include 'skipif-nocaddy.inc';
99
--FILE--
1010
<?php
1111

12-
function get_localhost_curl_handle(CurlPersistentShareHandle $sh): CurlHandle {
12+
function get_localhost_curl_handle(CurlSharePersistentHandle $sh): CurlHandle {
1313
$ch = curl_init("https://localhost");
1414

1515
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
@@ -19,12 +19,12 @@ function get_localhost_curl_handle(CurlPersistentShareHandle $sh): CurlHandle {
1919
return $ch;
2020
}
2121

22-
$sh1 = curl_persistent_share_init([CURL_LOCK_DATA_DNS, CURL_LOCK_DATA_CONNECT]);
22+
$sh1 = curl_share_init_persistent([CURL_LOCK_DATA_DNS, CURL_LOCK_DATA_CONNECT]);
2323
$ch1 = get_localhost_curl_handle($sh1);
2424

2525
// Note that we're using different share options and thus should get a different persistent share
2626
// handle.
27-
$sh2 = curl_persistent_share_init([CURL_LOCK_DATA_CONNECT]);
27+
$sh2 = curl_share_init_persistent([CURL_LOCK_DATA_CONNECT]);
2828
$ch2 = get_localhost_curl_handle($sh2);
2929

3030
var_dump($sh1->options != $sh2->options);

‎ext/curl/tests/curl_persistent_share_003.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ curl
55
--FILE--
66
<?php
77

8-
$sh = curl_persistent_share_init([CURL_LOCK_DATA_DNS, CURL_LOCK_DATA_CONNECT, 30]);
8+
$sh = curl_share_init_persistent([CURL_LOCK_DATA_DNS, CURL_LOCK_DATA_CONNECT, 30]);
99

1010
?>
1111
--EXPECTF--
1212
Fatal error: Uncaught Exception: Could not construct persistent cURL share handle: Unknown share option in %scurl_persistent_share_003.php:3
1313
Stack trace:
14-
#0 %scurl_persistent_share_003.php(3): curl_persistent_share_init(Array)
14+
#0 %scurl_persistent_share_003.php(3): curl_share_init_persistent(Array)
1515
#1 {main}
1616
thrown in %scurl_persistent_share_003.php on line 3

0 commit comments

Comments
 (0)