Merge branch 'PHP-5.6'

* PHP-5.6:
  initialize lineno before calling compile file file in phar
  News entry for new curl constants
This commit is contained in:
Anatol Belski 2014-10-20 15:55:05 +02:00
commit 7a1a0f39d0

View File

@ -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;