diff options
| author | Anatol Belski <ab@php.net> | 2014-10-20 15:55:05 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-10-20 15:55:05 +0200 |
| commit | 7a1a0f39d011f4504de0d6458f2b64a5ca1be850 (patch) | |
| tree | 2f65fc29e418489fc62d2ba901481d447ae8ca78 /ext/phar | |
| parent | 0e270661a44ad2ff833b9ca33663a841e79886b6 (diff) | |
| parent | e0b247bc87f0532979e7193b263eb454ce739a28 (diff) | |
| download | php-git-7a1a0f39d011f4504de0d6458f2b64a5ca1be850.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
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 cdc61fee88..0903f6c952 100644 --- a/ext/phar/phar.c +++ b/ext/phar/phar.c @@ -3307,6 +3307,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; |