clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.1' into PHP-8.2

Browse Source 
* PHP-8.1:
  ext/curl/interface: fix zend_result return value
  Zend/zend_ini: fix zend_result return values
This commit is contained in:
George Peter Banyard 2023-02-21 13:53:48 +00:00
commit f6ec807871
No known key found for this signature in database
GPG Key ID: 3306078E3194AEBD
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Zend/zend_ini.c
View File

@ -63,7 +63,7 @@ static zend_result zend_restore_ini_entry_cb(zend_ini_entry *ini_entry, int stag
}
if (stage == ZEND_INI_STAGE_RUNTIME && result == FAILURE) {
/* runtime failure is OK */
return 1;
return FAILURE;
}
if (ini_entry->value != ini_entry->orig_value) {
zend_string_release(ini_entry->value);
@ -74,7 +74,7 @@ static zend_result zend_restore_ini_entry_cb(zend_ini_entry *ini_entry, int stag
ini_entry->orig_value = NULL;
ini_entry->orig_modifiable = 0;
}
return 0;
return SUCCESS;
}
/* }}} */

2
ext/curl/interface.c
View File

@ -1378,7 +1378,7 @@ static inline zend_result build_mime_structure_from_hash(php_curl *ch, zval *zpo
postval = Z_STR_P(prop);
if (php_check_open_basedir(ZSTR_VAL(postval))) {
return 1;
return FAILURE;
}
prop = zend_read_property(curl_CURLFile_class, Z_OBJ_P(current), "mime", sizeof("mime")-1, 0, &rv);