Move fastcgi.c to main

diff --git a/configure.in b/configure.in
index ffc714ff5ff7a7e02d5f19567b44b76feac8c6d5..fc196a979a3f9e25e0932beefc0623039d9a3879 100644 (file)
--- a/configure.in
+++ b/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 \

diff --git a/sapi/cgi/fastcgi.c b/main/fastcgi.c
similarity index 99%
rename from sapi/cgi/fastcgi.c
rename to main/fastcgi.c
index 7d6fd649ea18f04ba39b221f50db0ba4f94d23ce..da66a7ed666ff06e17c9208544166791752a48ff 100644 (file)
--- a/sapi/cgi/fastcgi.c
+++ b/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) { \

diff --git a/sapi/cgi/fastcgi.h b/main/fastcgi.h
similarity index 100%
rename from sapi/cgi/fastcgi.h
rename to main/fastcgi.h

diff --git a/sapi/cgi/config.w32 b/sapi/cgi/config.w32
index daf4f05687a4bcaef56f56de915a06dd19c86de8..94a027f4ee7dd778d6812f78c62f430576394958 100644 (file)
--- a/sapi/cgi/config.w32
+++ b/sapi/cgi/config.w32
@@ -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');
 }

diff --git a/sapi/cgi/config9.m4 b/sapi/cgi/config9.m4
index a005f8e0ad1203528848872327f412fc09557503..d2200e0c55768741cd10b37bf1580a1533eb3cc0 100644 (file)
--- a/sapi/cgi/config9.m4
+++ b/sapi/cgi/config9.m4
@@ -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*)

diff --git a/win32/build/config.w32 b/win32/build/config.w32
index 3c2ff7a0a9bfcf99d6e918b5e5b07bfd52b8270c..ca4acbdd9c6b1ccc22391337870c521dded19fab 100644 (file)
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -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");