diff options
| author | Anatol Belski <ab@php.net> | 2014-10-20 15:54:33 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-10-20 15:54:33 +0200 |
| commit | e0b247bc87f0532979e7193b263eb454ce739a28 (patch) | |
| tree | 4076612011e7607a99542bce05ee7a1091e19740 /ext/phar | |
| parent | 3af83e196c4b8f3d2c476b08472433f2b38b585d (diff) | |
| parent | 37d5a2b18febc07088b15f06c6e5cc73eca782a0 (diff) | |
| download | php-git-e0b247bc87f0532979e7193b263eb454ce739a28.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
initialize lineno before calling compile file file in phar
News entry for new curl constants
Diffstat (limited to 'ext/phar')
| -rw-r--r-- | ext/phar/phar.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/phar/phar.c b/ext/phar/phar.c index 5bfb278881..ac6bd272c4 100644 --- a/ext/phar/phar.c +++ b/ext/phar/phar.c @@ -3356,6 +3356,7 @@ static zend_op_array *phar_compile_file(zend_file_handle *file_handle, int type zend_try { failed = 0; + CG(zend_lineno) = 0; res = phar_orig_compile_file(file_handle, type TSRMLS_CC); } zend_catch { failed = 1; |