switch to php_stream_wrapper_log_error from php_error_docref (should be documented...

diff --git a/ext/phar/phar.c b/ext/phar/phar.c
index 196b44ee1135d4641ec2a54c8d6aa7467effbc2c..211bdd2021acb09b29a0bd3d77791fb53a6374c3 100644 (file)
--- a/ext/phar/phar.c
+++ b/ext/phar/phar.c
@@ -537,7 +537,7 @@ PHP_PHAR_API php_stream * php_stream_phar_url_wrapper(php_stream_wrapper *wrappe
                if (resource) {
                        php_url_free(resource);
                }
-               php_error_docref(NULL TSRMLS_CC, E_ERROR, "phar error: invalid url \"%s\"", path);
+               php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "phar error: invalid url \"%s\"", path);
                return NULL;
        }
 
@@ -545,7 +545,7 @@ PHP_PHAR_API php_stream * php_stream_phar_url_wrapper(php_stream_wrapper *wrappe
                if (resource) {
                        php_url_free(resource);
                }
-               php_error_docref(NULL TSRMLS_CC, E_ERROR, "phar error: not a phar stream url \"%s\"", path);
+               php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "phar error: not a phar stream url \"%s\"", path);
                return NULL;
        }
 
@@ -574,7 +574,7 @@ PHP_PHAR_API php_stream * php_stream_phar_url_wrapper(php_stream_wrapper *wrappe
                buffer = idata->data->file;
                efree(idata);
                efree(internal_file);
-               php_error_docref(NULL TSRMLS_CC, E_ERROR, "phar error: cannot open phar \"%s\"", buffer);
+               php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "phar error: cannot open phar \"%s\"", buffer);
                return NULL;
        }
 
@@ -584,9 +584,10 @@ PHP_PHAR_API php_stream * php_stream_phar_url_wrapper(php_stream_wrapper *wrappe
                buffer = idata->data->file;
                offset = idata->data->internal_file_start + idata->internal_file->offset_within_phar;
                efree(idata);
-               php_error_docref(NULL TSRMLS_CC, E_ERROR, "phar error: internal corruption of phar \"%s\" (cannot seek to start of file \"%s\" at offset \"%d\")",
+               php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "phar error: internal corruption of phar \"%s\" (cannot seek to start of file \"%s\" at offset \"%d\")",
                        buffer, internal_file,
                        offset);
+               efree(internal_file);
                return NULL;
        }
        if (idata->data->is_compressed) {
@@ -597,7 +598,8 @@ PHP_PHAR_API php_stream * php_stream_phar_url_wrapper(php_stream_wrapper *wrappe
                        php_stream_close(fp);
                        buffer = idata->data->file;
                        efree(idata);
-                       php_error_docref(NULL TSRMLS_CC, E_ERROR, "phar error: internal corruption of phar \"%s\" (filesize mismatch on file \"%s\")", buffer, internal_file);
+                       php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "phar error: internal corruption of phar \"%s\" (filesize mismatch on file \"%s\")", buffer, internal_file);
+                       efree(internal_file);
                        return NULL;
                }
                php_stream_close(fp);
@@ -626,7 +628,8 @@ PHP_PHAR_API php_stream * php_stream_phar_url_wrapper(php_stream_wrapper *wrappe
                                buffer = idata->data->file;
                                efree(idata->file);
                                efree(idata);
-                               php_error_docref(NULL TSRMLS_CC, E_ERROR, "phar error: internal corruption of phar \"%s\" (corrupted zlib compression of file \"%s\")", buffer, internal_file);
+                               php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "phar error: internal corruption of phar \"%s\" (corrupted zlib compression of file \"%s\")", buffer, internal_file);
+                               efree(internal_file);
                                return NULL;
                        }
 
@@ -658,7 +661,7 @@ PHP_PHAR_API php_stream * php_stream_phar_url_wrapper(php_stream_wrapper *wrappe
                        efree(idata->file);
                        efree(idata);
                        efree(internal_file);
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "phar error: %s", zError(status));
+                       php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "phar error: %s", zError(status));
                        return NULL;
                }
 #define PHAR_ZLIB_ERROR efree(savebuf);\
@@ -671,25 +674,30 @@ PHP_PHAR_API php_stream * php_stream_phar_url_wrapper(php_stream_wrapper *wrappe
                /* check length */
                if (actual_length != idata->internal_file->uncompressed_filesize) {
                        PHAR_ZLIB_ERROR
-                       php_error_docref(NULL TSRMLS_CC, E_ERROR, "phar error: internal corruption of phar \"%s\" (filesize mismatch on file \"%s\")", buffer, internal_file);
+                       php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "phar error: internal corruption of phar \"%s\" (filesize mismatch on file \"%s\")", buffer, internal_file);
+                       efree(internal_file);
+                       return NULL;
                }
                /* check crc32/filesize */
                if (!idata->internal_file->crc_checked) {
                        status = phar_postprocess_file(idata->file, idata->internal_file->uncompressed_filesize, crc32, 0);
                        if (-1 == status) {
                                PHAR_ZLIB_ERROR
-                                               php_error_docref(NULL TSRMLS_CC, E_ERROR, "phar error: internal corruption of phar \"%s\" (crc32 mismatch on file \"%s\")", buffer, internal_file);
+                               php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "phar error: internal corruption of phar \"%s\" (crc32 mismatch on file \"%s\")", buffer, internal_file);
+                               efree(internal_file);
                                return NULL;
                        }
                        if (-2 == status) {
                                PHAR_ZLIB_ERROR
-                                               php_error_docref(NULL TSRMLS_CC, E_ERROR, "phar error: internal corruption of phar \"%s\" (filesize mismatch on file \"%s\")", buffer, internal_file);
+                               php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "phar error: internal corruption of phar \"%s\" (filesize mismatch on file \"%s\")", buffer, internal_file);
+                               efree(internal_file);
                                return NULL;
                        }
                        idata->internal_file->crc_checked = 1;
                }
 #else
-               php_error_docref(NULL TSRMLS_CC, E_ERROR, "zlib extension must be enabled for compressed .phar files");
+               php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "zlib extension must be enabled for compressed .phar files");
+               efree(internal_file);
                return NULL;
 #endif
        } else {
@@ -700,7 +708,8 @@ PHP_PHAR_API php_stream * php_stream_phar_url_wrapper(php_stream_wrapper *wrappe
                        efree(idata->file);
                        buffer = idata->data->file;
                        efree(idata);
-                       php_error_docref(NULL TSRMLS_CC, E_ERROR, "phar error: internal corruption of phar \"%s\" (filesize mismatch on file \"%s\")", buffer, internal_file);
+                       php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "phar error: internal corruption of phar \"%s\" (filesize mismatch on file \"%s\")", buffer, internal_file);
+                       efree(internal_file);
                        return NULL;
                }
                php_stream_close(fp);
@@ -711,14 +720,16 @@ PHP_PHAR_API php_stream * php_stream_phar_url_wrapper(php_stream_wrapper *wrappe
                                efree(idata->file);
                                buffer = idata->data->file;
                                efree(idata);
-                               php_error_docref(NULL TSRMLS_CC, E_ERROR, "phar error: internal corruption of phar \"%s\" (crc32 mismatch on file \"%s\")", buffer, internal_file);
+                               php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "phar error: internal corruption of phar \"%s\" (crc32 mismatch on file \"%s\")", buffer, internal_file);
+                               efree(internal_file);
                                return NULL;
                        }
                        if (-2 == status) {
                                efree(idata->file);
                                buffer = idata->data->file;
                                efree(idata);
-                               php_error_docref(NULL TSRMLS_CC, E_ERROR, "phar error: internal corruption of phar \"%s\" (filesize mismatch on file \"%s\")", buffer, internal_file);
+                               php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "phar error: internal corruption of phar \"%s\" (filesize mismatch on file \"%s\")", buffer, internal_file);
+                               efree(internal_file);
                                return NULL;
                        }
                        idata->internal_file->crc_checked = 1;
@@ -904,14 +915,14 @@ PHP_PHAR_API int phar_stream_stat(php_stream_wrapper *wrapper, char *url, int fl
        /* we must have at the very least phar://alias.phar/internalfile.php */
        if (!resource || !resource->scheme || !resource->host || !resource->path) {
                php_url_free(resource);
-               php_error_docref(NULL TSRMLS_CC, E_ERROR, "phar error: invalid url \"%s\"", url);
+               php_stream_wrapper_log_error(wrapper, flags TSRMLS_CC, "phar error: invalid url \"%s\"", url);
                php_url_free(resource);
                return -1;
        }
 
        if (strcasecmp("phar", resource->scheme)) {
                php_url_free(resource);
-               php_error_docref(NULL TSRMLS_CC, E_ERROR, "phar error: not a phar url \"%s\"", url);
+               php_stream_wrapper_log_error(wrapper, flags TSRMLS_CC, "phar error: not a phar url \"%s\"", url);
                return -1;
        }
 
@@ -1025,13 +1036,13 @@ PHP_PHAR_API php_stream *phar_opendir(php_stream_wrapper *wrapper, char *filenam
        /* we must have at the very least phar://alias.phar/internalfile.php */
        if (!resource || !resource->scheme || !resource->host || !resource->path) {
                php_url_free(resource);
-               php_error_docref(NULL TSRMLS_CC, E_ERROR, "phar error: invalid url \"%s\"", filename);
+               php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "phar error: invalid url \"%s\"", filename);
                return NULL;
        }
 
        if (strcasecmp("phar", resource->scheme)) {
                php_url_free(resource);
-               php_error_docref(NULL TSRMLS_CC, E_ERROR, "phar error: not a phar url \"%s\"", filename);
+               php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "phar error: not a phar url \"%s\"", filename);
                return NULL;
        }
 

diff --git a/ext/phar/tests/013.phpt b/ext/phar/tests/013.phpt
index 94d109912ee416d21f311ae02178fad67915ac2e..9c97cd08a4690c36282157e05e22c174eb49b24b 100644 (file)
--- a/ext/phar/tests/013.phpt
+++ b/ext/phar/tests/013.phpt
@@ -17,4 +17,4 @@ include dirname(__FILE__) . '/008_phar.php';
 echo file_get_contents('phar://hio/a');
 ?>
 --EXPECTF--
-Fatal error: file_get_contents(): phar error: internal corruption of phar "%s" (filesize mismatch on file "a") in %s on line 12
\ No newline at end of file
+Warning: file_get_contents(phar://hio/a): failed to open stream: phar error: internal corruption of phar "%s" (filesize mismatch on file "a") in %s on line 12
\ No newline at end of file

diff --git a/ext/phar/tests/014.phpt b/ext/phar/tests/014.phpt
index a59507705c85e884ab373fa5d84fd6ca0e40816e..0959a66df74d40b62f5231d44351f4de365e0347 100644 (file)
--- a/ext/phar/tests/014.phpt
+++ b/ext/phar/tests/014.phpt
@@ -17,4 +17,4 @@ include dirname(__FILE__) . '/008_phar.php';
 echo file_get_contents('phar://hio/a');
 ?>
 --EXPECTF--
-Fatal error: file_get_contents(): phar error: internal corruption of phar "%s" (crc32 mismatch on file "a") in %s on line 12
\ No newline at end of file
+Warning: file_get_contents(phar://hio/a): failed to open stream: phar error: internal corruption of phar "%s" (crc32 mismatch on file "a") in %s on line 12
\ No newline at end of file

diff --git a/ext/phar/tests/016.phpt b/ext/phar/tests/016.phpt
new file mode 100644 (file)
index 0000000..0cbe5a3
--- /dev/null
+++ b/ext/phar/tests/016.phpt
@@ -0,0 +1,21 @@
+--TEST--
+PHP_Archive::mapPhar valid file (gzipped)
+--SKIPIF--
+<?php if (!extension_loaded("phar")) print "skip";
+if (!PHP_Archive::canCompress()) print "skip"; ?>
+--FILE--
+<?php
+function cleanup() { unlink(dirname(__FILE__) . '/008_phar.php'); }
+register_shutdown_function('cleanup');
+$file = "<?php
+PHP_Archive::mapPhar(5, 'hio', true);
+__HALT_COMPILER(); ?>";
+// file length is too short
+$manifest = pack('V', 1) . 'a' . pack('VVVV', 1, time(), 0, 9);
+$file .= pack('VV', strlen($manifest) + 4, 1) . $manifest . pack('VV', crc32('a'), 1) . chr(75) . chr(4) . chr(0); // 'a' gzdeflated
+file_put_contents(dirname(__FILE__) . '/008_phar.php', $file);
+include dirname(__FILE__) . '/008_phar.php';
+echo file_get_contents('phar://hio/a');
+?>
+--EXPECTF--
+Warning: file_get_contents(phar://hio/a): failed to open stream: phar error: data error in %s on line %d
\ No newline at end of file