Changes for php 5.3

quoing · Oct 18, 2009 · 730f428 · 730f428
1 parent 5797b0c
commit 730f428
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 169 deletions.
diff --git a/ac/fpm_build.m4 b/ac/fpm_build.m4
@@ -8,7 +8,7 @@ AC_DEFUN([AC_FPM_BUILD_SAPI],
 	
 	mkdir -p sapi/fpm/cgi
 	PHP_FPM_SAPI_FILES=`cd $abs_srcdir/sapi/fpm && find cgi/ \( -name *.c \) -exec printf "{} " \;`
-	# PHP_FPM_SAPI_FILES="cgi/cgi_main.c cgi/fastcgi.c cgi/getopt.c"
+	# PHP_FPM_SAPI_FILES="cgi/cgi_main.c cgi/fastcgi.c"
 
 	mkdir -p sapi/fpm/fpm
 	PHP_FPM_CORE_FILES=`cd $abs_srcdir/sapi/fpm && find fpm/ \( -name *.c -not -name fpm_trace*.c \) -exec printf "{} " \;`

diff --git a/cgi/Makefile.am b/cgi/Makefile.am
@@ -15,6 +15,5 @@ libsapi_la_CFLAGS = -DFPM_AUTOCONFIG_H
 
 libsapi_la_SOURCES = \
 	cgi_main.c \
-	fastcgi.c \
-    getopt.c
+	fastcgi.c
 
diff --git a/cgi/cgi_main.c b/cgi/cgi_main.c
@@ -1357,8 +1357,8 @@ int main(int argc, char *argv[])
 				break;
 
 			case 'e': /* enable extended info output */
-				CG(extended_info) = 1; /* 5_2 */
-				/* CG(compiler_options) |= ZEND_COMPILE_EXTENDED_INFO; */ /* 5_3 */
+				/* CG(extended_info) = 1; */ /* 5_2 */
+				CG(compiler_options) |= ZEND_COMPILE_EXTENDED_INFO; /* 5_3 */
 				break;
 
 			case 'm': /* list compiled in modules */

diff --git a/cgi/getopt.c b/cgi/getopt.c