Move fastcgi.c to main

Author: laruence

configure.in

@@ -1464,7 +1464,7 @@ PHP_ADD_SOURCES(main, main.c snprintf.c spprintf.c php_sprintf.c \
        php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \
        strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c \
        network.c php_open_temporary_file.c \
-       output.c getopt.c, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
+       output.c getopt.c fastcgi.c, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
 
 PHP_ADD_SOURCES(main/streams, streams.c cast.c memory.c filter.c \
        plain_wrapper.c userspace.c transports.c xp_socket.c mmap.c \

sapi/cgi/fastcgi.c renamed to main/fastcgi.c

@@ -36,15 +36,15 @@
 
 #include <windows.h>
 
-	typedef unsigned int in_addr_t;
+typedef unsigned int in_addr_t;
 
-	struct sockaddr_un {
-		short   sun_family;
-		char    sun_path[MAXPATHLEN];
-	};
+struct sockaddr_un {
+	short   sun_family;
+	char    sun_path[MAXPATHLEN];
+};
 
-	static HANDLE fcgi_accept_mutex = INVALID_HANDLE_VALUE;
-	static int is_impersonate = 0;
+static HANDLE fcgi_accept_mutex = INVALID_HANDLE_VALUE;
+static int is_impersonate = 0;
 
 #define FCGI_LOCK(fd) \
 	if (fcgi_accept_mutex != INVALID_HANDLE_VALUE) { \

sapi/cgi/fastcgi.h renamed to main/fastcgi.h

@@ -5,6 +5,6 @@ ARG_ENABLE('cgi', 'Build CGI version of PHP', 'yes');
 
 if (PHP_CGI == "yes") {
 	ADD_FLAG("LDFLAGS_CGI", "/stack:67108864");
-	SAPI('cgi', 'cgi_main.c fastcgi.c', 'php-cgi.exe', '/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1');
+	SAPI('cgi', 'cgi_main.c', 'php-cgi.exe', '/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1');
 	ADD_FLAG('LIBS_CGI', 'ws2_32.lib kernel32.lib advapi32.lib');
 }

sapi/cgi/config.w32

@@ -50,7 +50,7 @@ if test "$PHP_CGI" != "no"; then
     esac
 
     dnl Select SAPI
-    PHP_SELECT_SAPI(cgi, program, cgi_main.c fastcgi.c, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1, '$(SAPI_CGI_PATH)')
+    PHP_SELECT_SAPI(cgi, program, cgi_main.c, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1, '$(SAPI_CGI_PATH)')
 
     case $host_alias in
       *aix*)

sapi/cgi/config9.m4

@@ -149,7 +149,7 @@ ADD_FLAG("CFLAGS_BD_ZEND", "/D ZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
 ADD_SOURCES("main", "main.c snprintf.c spprintf.c getopt.c fopen_wrappers.c \
 	php_scandir.c php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \
 	strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c network.c \
-	php_open_temporary_file.c output.c internal_functions.c php_sprintf.c");
+	php_open_temporary_file.c output.c internal_functions.c php_sprintf.c fastcgi.c");
 ADD_FLAG("CFLAGS_BD_MAIN", "/D ZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
 ADD_SOURCES("win32", "inet.c fnmatch.c sockets.c");