Skip to content

Commit 7e7fcc3

Browse files
committed
Reimplement FastCGI interface
Due to licensing restrictions that actually don't allow anybody to use the libfcgi code without prior approval from Open Market, which is impossible to obtain - we decided to reimplement this interface from scratch. The result is actually slightly faster, and more importantly, clear of any copyright issues.
1 parent 9774b6d commit 7e7fcc3

File tree

6 files changed

+1096
-10
lines changed

6 files changed

+1096
-10
lines changed

NEWS

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
PHP NEWS
22
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
33
?? ??? 2006, PHP 5.1.3
4+
- Reimplemented FastCGI interface
45
- Moved extensions to PECL:
56
. ext/msession (Derick)
67
- Improved cURL extension: (Ilia)

sapi/cgi/cgi_main.c

+1-3
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,7 @@
7979
#include "php_getopt.h"
8080

8181
#if PHP_FASTCGI
82-
#include "fcgi_config.h"
83-
#include "fcgiapp.h"
84-
/* don't want to include fcgios.h, causes conflicts */
82+
#include "fastcgi.h"
8583
#ifdef PHP_WIN32
8684
extern int OS_SetImpersonate(void);
8785
#else

sapi/cgi/config.w32

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ AC_DEFINE("ENABLE_PATHINFO_CHECK", PHP_PATH_INFO_CHECK == "yes" ? 1 : 0, "Pathin
1616
if (PHP_CGI == "yes") {
1717
AC_DEFINE('PHP_FASTCGI', PHP_FASTCGI == "yes" ? 1 : 0);
1818
if (PHP_FASTCGI == "yes") {
19-
SAPI('cgi', 'cgi_main.c getopt.c', 'php-cgi.exe', '/I sapi/cgi/libfcgi/include /D FCGI_STATIC');
20-
ADD_SOURCES('sapi/cgi/libfcgi', 'fcgi_stdio.c fcgiapp.c os_win32.c', 'cgi');
19+
SAPI('cgi', 'cgi_main.c getopt.c fastcgi.c', 'php-cgi.exe', '/I sapi/cgi/libfcgi/include /D FCGI_STATIC');
2120
ADD_FLAG('LIBS_CGI', 'ws2_32.lib kernel32.lib advapi32.lib');
2221
} else {
2322
SAPI('cgi', 'cgi_main.c getopt.c', 'php-cgi.exe');

sapi/cgi/config9.m4

+2-5
Original file line numberDiff line numberDiff line change
@@ -133,23 +133,20 @@ if test "$PHP_SAPI" = "default"; then
133133
exit 1
134134
fi
135135
if test "$PHP_ENABLE_FASTCGI" = "yes"; then
136-
PHP_ADD_BUILD_DIR($abs_builddir/sapi/cgi/libfcgi)
137136
PHP_FASTCGI=1
138-
PHP_FCGI_FILES="libfcgi/fcgi_stdio.c libfcgi/fcgiapp.c libfcgi/os_unix.c"
139-
PHP_FCGI_INCLUDE="-I$PHP_LIBFCGI_DIR/include"
137+
PHP_FCGI_FILES="fastcgi.c"
140138
PHP_FCGI_STATIC=1
141139
else
142140
PHP_FASTCGI=0
143141
PHP_FCGI_FILES=""
144-
PHP_FCGI_INCLUDE=""
145142
PHP_FCGI_STATIC=0
146143
fi
147144
AC_DEFINE_UNQUOTED(PHP_FASTCGI, $PHP_FASTCGI, [ ])
148145
AC_DEFINE_UNQUOTED(PHP_FCGI_STATIC, $PHP_FCGI_STATIC, [ ])
149146
AC_MSG_RESULT($PHP_ENABLE_FASTCGI)
150147

151148
INSTALL_IT="@echo \"Installing PHP CGI into: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)\$(EXEEXT)"
152-
PHP_SELECT_SAPI(cgi, program, $PHP_FCGI_FILES cgi_main.c getopt.c, $PHP_FCGI_INCLUDE, '$(SAPI_CGI_PATH)')
149+
PHP_SELECT_SAPI(cgi, program, $PHP_FCGI_FILES cgi_main.c getopt.c, , '$(SAPI_CGI_PATH)')
153150

154151
case $host_alias in
155152
*aix*)

0 commit comments

Comments
 (0)