iliaa Tue Nov 5 17:04:14 2002 EDT
Modified files:
/php4/sapi/cgi cgi_main.c
/php4/sapi/cli php_cli.c
/php4/sapi/fastcgi fastcgi.c
Log:
Fixed bug #20035. ZE now allows us to pass the current line position by
setting zend_lineno to (current_line * -1).
Index: php4/sapi/cgi/cgi_main.c
diff -u php4/sapi/cgi/cgi_main.c:1.186 php4/sapi/cgi/cgi_main.c:1.187
--- php4/sapi/cgi/cgi_main.c:1.186 Fri Oct 25 10:33:46 2002
+++ php4/sapi/cgi/cgi_main.c Tue Nov 5 17:04:10 2002
@@ -1119,7 +1119,7 @@
while (c != 10 && c != 13) {
c = fgetc(file_handle.handle.fp); /*
skip to end of line */
}
- CG(zend_lineno)++;
+ CG(zend_lineno) = -2;
} else {
rewind(file_handle.handle.fp);
}
Index: php4/sapi/cli/php_cli.c
diff -u php4/sapi/cli/php_cli.c:1.48 php4/sapi/cli/php_cli.c:1.49
--- php4/sapi/cli/php_cli.c:1.48 Tue Nov 5 10:15:51 2002
+++ php4/sapi/cli/php_cli.c Tue Nov 5 17:04:12 2002
@@ -652,7 +652,7 @@
while (c != 10 && c != 13) {
c = fgetc(file_handle.handle.fp); /*
skip to end of line */
}
- CG(zend_lineno)++;
+ CG(zend_lineno) = -2;
} else {
rewind(file_handle.handle.fp);
}
Index: php4/sapi/fastcgi/fastcgi.c
diff -u php4/sapi/fastcgi/fastcgi.c:1.26 php4/sapi/fastcgi/fastcgi.c:1.27
--- php4/sapi/fastcgi/fastcgi.c:1.26 Wed Sep 18 17:57:33 2002
+++ php4/sapi/fastcgi/fastcgi.c Tue Nov 5 17:04:12 2002
@@ -237,7 +237,7 @@
while (c != 10 && c != 13) {
c = fgetc(file_handle.handle.fp); /* skip to end
of line */
}
- CG(zend_lineno)++;
+ CG(zend_lineno) = -2;
} else {
rewind(file_handle.handle.fp);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
