sniper Sun Apr 15 23:02:05 2007 UTC
Modified files:
/php-src/sapi/cgi cgi_main.c
Log:
MFB: Allow using syntax highlighting in fastcgi mode
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.317&r2=1.318&diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.317 php-src/sapi/cgi/cgi_main.c:1.318
--- php-src/sapi/cgi/cgi_main.c:1.317 Wed Mar 28 15:39:35 2007
+++ php-src/sapi/cgi/cgi_main.c Sun Apr 15 23:02:05 2007
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: cgi_main.c,v 1.317 2007/03/28 15:39:35 dmitry Exp $ */
+/* $Id: cgi_main.c,v 1.318 2007/04/15 23:02:05 sniper Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -1172,8 +1172,10 @@
bindpath = strdup(php_optarg);
}
break;
+ case 's': /* generate highlighted HTML from source */
+ behavior = PHP_MODE_HIGHLIGHT;
+ break;
}
-
}
php_optind = orig_optind;
php_optarg = orig_optarg;
@@ -1456,10 +1458,6 @@
no_headers = 1;
break;
- case 's': /* generate highlighted HTML
from source */
- behavior =
PHP_MODE_HIGHLIGHT;
- break;
-
case 'v': /* show php version &
quit */
no_headers = 1;
if
(php_request_startup(TSRMLS_C) == FAILURE) {
@@ -1660,6 +1658,9 @@
if
(open_file_for_scanning(&file_handle TSRMLS_CC) == SUCCESS) {
php_get_highlight_struct(&syntax_highlighter_ini);
zend_highlight(&syntax_highlighter_ini TSRMLS_CC);
+ if (fastcgi) {
+ goto
fastcgi_request_done;
+ }
fclose(file_handle.handle.fp);
php_output_teardown();
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
