summaryrefslogtreecommitdiff
path: root/sapi
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2002-11-05 22:04:12 +0000
committerIlia Alshanetsky <iliaa@php.net>2002-11-05 22:04:12 +0000
commit64f77577f054dc83a19e42f55724f41ed45986db (patch)
tree0f10f134dd79b18a968c6ffe457a493f70524bef /sapi
parent78bf1d9a565352631a6fed97761ec6962cf4ea82 (diff)
downloadphp-git-64f77577f054dc83a19e42f55724f41ed45986db.tar.gz
Fixed bug #20035. ZE now allows us to pass the current line position by
setting zend_lineno to (current_line * -1).
Diffstat (limited to 'sapi')
-rw-r--r--sapi/cgi/cgi_main.c2
-rw-r--r--sapi/cli/php_cli.c2
-rw-r--r--sapi/fastcgi/fastcgi.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 6dd85e20fb..2d707d7e43 100644
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -1119,7 +1119,7 @@ consult the installation file that came with this distribution, or visit \n\
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);
}
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index 28a06a1733..c986ee3dc7 100644
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -652,7 +652,7 @@ int main(int argc, char *argv[])
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);
}
diff --git a/sapi/fastcgi/fastcgi.c b/sapi/fastcgi/fastcgi.c
index 23fd8c0aec..f9430943e1 100644
--- a/sapi/fastcgi/fastcgi.c
+++ b/sapi/fastcgi/fastcgi.c
@@ -237,7 +237,7 @@ static void fastcgi_module_main(TSRMLS_D)
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);
}