mirror of
https://github.com/php/php-src.git
synced 2024-12-01 05:43:38 +08:00
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3: PHAR should modify entry timestamp when it's modified
This commit is contained in:
commit
b5d267aa95
@ -458,8 +458,11 @@ static int phar_stream_flush(php_stream *stream TSRMLS_DC) /* {{{ */
|
||||
{
|
||||
char *error;
|
||||
int ret;
|
||||
if (stream->mode[0] == 'w' || (stream->mode[0] == 'r' && stream->mode[1] == '+')) {
|
||||
ret = phar_flush(((phar_entry_data *)stream->abstract)->phar, 0, 0, 0, &error TSRMLS_CC);
|
||||
phar_entry_data *data = (phar_entry_data *) stream->abstract;
|
||||
|
||||
if (data->internal_file->is_modified) {
|
||||
data->internal_file->timestamp = time(0);
|
||||
ret = phar_flush(data->phar, 0, 0, 0, &error TSRMLS_CC);
|
||||
if (error) {
|
||||
php_stream_wrapper_log_error(stream->wrapper, REPORT_ERRORS TSRMLS_CC, "%s", error);
|
||||
efree(error);
|
||||
|
Loading…
Reference in New Issue
Block a user