summaryrefslogtreecommitdiff
path: root/Zend/zend_language_scanner.l
diff options
context:
space:
mode:
authorFelipe Pena <felipe@php.net>2010-06-30 02:30:14 +0000
committerFelipe Pena <felipe@php.net>2010-06-30 02:30:14 +0000
commitf2419953d98df1bc5537a057825eabd1d07535ac (patch)
tree701efc76ebfdd0454c6f4b00d0fca7db80bd360f /Zend/zend_language_scanner.l
parent930090b46b5173a7a0ea829459a102e76b22cd9d (diff)
downloadphp-git-f2419953d98df1bc5537a057825eabd1d07535ac.tar.gz
- MF5.3: Reverted fix for bug #48930 (due binary compatibility breakage)
# To commit a new common fix
Diffstat (limited to 'Zend/zend_language_scanner.l')
-rw-r--r--Zend/zend_language_scanner.l3
1 files changed, 1 insertions, 2 deletions
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
index eadc34d6ee..6622cb3db6 100644
--- a/Zend/zend_language_scanner.l
+++ b/Zend/zend_language_scanner.l
@@ -299,7 +299,6 @@ ZEND_API int open_file_for_scanning(zend_file_handle *file_handle TSRMLS_DC)
CG(start_lineno) = 0;
} else {
CG(zend_lineno) = 1;
- CG(shebang_len) = 0;
}
CG(increment_lineno) = 0;
@@ -449,7 +448,7 @@ ZEND_API int zend_prepare_string_for_scanning(zval *str, char *filename TSRMLS_D
ZEND_API size_t zend_get_scanned_file_offset(TSRMLS_D)
{
- size_t offset = (SCNG(yy_cursor) - SCNG(yy_start)) + CG(shebang_len);
+ size_t offset = SCNG(yy_cursor) - SCNG(yy_start);
#ifdef ZEND_MULTIBYTE
if (SCNG(input_filter)) {
size_t original_offset = offset, length = 0; do {