archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Move fastcgi.c to main

Browse source
This commit is contained in:
Xinchen Hui 2015-05-19 16:04:35 +08:00
parent 16265a59ac
commit e383cb4493
6 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
configure.in
View file

@ -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 \ 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 \ strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c \
network.c php_open_temporary_file.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 \ 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 \ plain_wrapper.c userspace.c transports.c xp_socket.c mmap.c \

14
sapi/cgi/fastcgi.c → main/fastcgi.c
View file

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

0
sapi/cgi/fastcgi.h → main/fastcgi.h
View file

2
sapi/cgi/config.w32
View file

@ -5,6 +5,6 @@ ARG_ENABLE('cgi', 'Build CGI version of PHP', 'yes');
if (PHP_CGI == "yes") { if (PHP_CGI == "yes") {
ADD_FLAG("LDFLAGS_CGI", "/stack:67108864"); 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'); ADD_FLAG('LIBS_CGI', 'ws2_32.lib kernel32.lib advapi32.lib');
} }

2
sapi/cgi/config9.m4
View file

@ -50,7 +50,7 @@ if test "$PHP_CGI" != "no"; then
esac esac
dnl Select SAPI 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 case $host_alias in
*aix*) *aix*)

2
win32/build/config.w32
View file

@ -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 \ 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 \ 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 \ 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_FLAG("CFLAGS_BD_MAIN", "/D ZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
ADD_SOURCES("win32", "inet.c fnmatch.c sockets.c"); ADD_SOURCES("win32", "inet.c fnmatch.c sockets.c");