mirror of
https://github.com/php/php-src.git
synced 2025-01-26 13:44:22 +08:00
E_ERROR > E_RECOVERABLE_ERROR
This commit is contained in:
parent
91f9af4360
commit
89635eb158
@ -227,7 +227,7 @@ static size_t php_dba_make_key(zval **key, char **key_str, char **key_free TSRML
|
|||||||
size_t len;
|
size_t len;
|
||||||
|
|
||||||
if (zend_hash_num_elements(Z_ARRVAL_PP(key)) != 2) {
|
if (zend_hash_num_elements(Z_ARRVAL_PP(key)) != 2) {
|
||||||
php_error_docref(NULL TSRMLS_CC, E_ERROR, "Key does not have exactly two elements: (key, name)");
|
php_error_docref(NULL TSRMLS_CC, E_RECOVERABLE_ERROR, "Key does not have exactly two elements: (key, name)");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
zend_hash_internal_pointer_reset_ex(Z_ARRVAL_PP(key), &pos);
|
zend_hash_internal_pointer_reset_ex(Z_ARRVAL_PP(key), &pos);
|
||||||
|
@ -538,7 +538,7 @@ static int inifile_delete_replace_append(inifile *dba, const key_type *key, cons
|
|||||||
php_stream_seek(fp_tmp, 0, SEEK_SET);
|
php_stream_seek(fp_tmp, 0, SEEK_SET);
|
||||||
php_stream_seek(dba->fp, 0, SEEK_END);
|
php_stream_seek(dba->fp, 0, SEEK_END);
|
||||||
if (!php_stream_copy_to_stream(fp_tmp, dba->fp, PHP_STREAM_COPY_ALL)) {
|
if (!php_stream_copy_to_stream(fp_tmp, dba->fp, PHP_STREAM_COPY_ALL)) {
|
||||||
php_error_docref(NULL TSRMLS_CC, E_ERROR, "Could not copy from temporary stream - ini file truncated");
|
php_error_docref(NULL TSRMLS_CC, E_RECOVERABLE_ERROR, "Could not copy from temporary stream - ini file truncated");
|
||||||
ret = FAILURE;
|
ret = FAILURE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user