diff options
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | main/fastcgi.c (renamed from sapi/cgi/fastcgi.c) | 14 | ||||
| -rw-r--r-- | main/fastcgi.h (renamed from sapi/cgi/fastcgi.h) | 0 | ||||
| -rw-r--r-- | sapi/cgi/config.w32 | 2 | ||||
| -rw-r--r-- | sapi/cgi/config9.m4 | 2 | ||||
| -rw-r--r-- | win32/build/config.w32 | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/configure.in b/configure.in index ffc714ff5f..fc196a979a 100644 --- 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 index 7d6fd649ea..da66a7ed66 100644 --- 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 index fa98730220..fa98730220 100644 --- a/sapi/cgi/fastcgi.h +++ b/main/fastcgi.h diff --git a/sapi/cgi/config.w32 b/sapi/cgi/config.w32 index daf4f05687..94a027f4ee 100644 --- 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 a005f8e0ad..d2200e0c55 100644 --- 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 3c2ff7a0a9..ca4acbdd9c 100644 --- 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"); |