From: Dmitry Stogov <dmitry@php.net>
Date: Wed, 13 Aug 2008 06:17:15 +0000 (+0000)
Subject: Fixed bug #45779 (regression with shebang lines processing)
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~743
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bb15ca0a5651b6892e63a56446acb5d3f3de704b;p=php

Fixed bug #45779 (regression with shebang lines processing)
---

diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
index fa3e8a7f4c..5bec659837 100644
--- a/Zend/zend_language_scanner.l
+++ b/Zend/zend_language_scanner.l
@@ -1340,6 +1340,7 @@ yymore_restart:
 		while (++YYCURSOR < YYLIMIT) {
 			if (*YYCURSOR == '\n') {
 				++YYCURSOR;
+				CG(zend_lineno)++;
 				goto restart;
 			}
 
@@ -1347,6 +1348,7 @@ yymore_restart:
 				if (++YYCURSOR < YYLIMIT && *YYCURSOR == '\n') { /* match \r\n as single newline */
 					++YYCURSOR;
 				}
+				CG(zend_lineno)++;
 				goto restart;
 			}
 		}
diff --git a/Zend/zend_language_scanner_defs.h b/Zend/zend_language_scanner_defs.h
index f085edb101..25d8b21d56 100644
--- a/Zend/zend_language_scanner_defs.h
+++ b/Zend/zend_language_scanner_defs.h
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Mon Jul 28 15:05:16 2008 */
+/* Generated by re2c 0.13.5 on Tue Aug 12 20:42:02 2008 */
 #line 3 "Zend/zend_language_scanner_defs.h"
 
 enum YYCONDTYPE {
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index 9108b965e6..44427bae1f 100644
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -590,23 +590,6 @@ static int cli_seek_file_begin(zend_file_handle *file_handle, char *script_file,
 		return FAILURE;
 	}
 	file_handle->filename = script_file;
-	/* #!php support */
-	c = fgetc(file_handle->handle.fp);
-	if (c == '#') {
-		while (c != '\n' && c != '\r') {
-			c = fgetc(file_handle->handle.fp);	/* skip to end of line */
-		}
-		/* handle situations where line is terminated by \r\n */
-		if (c == '\r') {
-			if (fgetc(file_handle->handle.fp) != '\n') {
-				long pos = ftell(file_handle->handle.fp);
-				fseek(file_handle->handle.fp, pos - 1, SEEK_SET);
-			}
-		}
-		*lineno = 2;
-	} else {
-		rewind(file_handle->handle.fp);
-	}
 	return SUCCESS;
 }
 /* }}} */