zeev Sun Dec 25 12:45:01 2005 EDT Modified files: /php-src/sapi/cgi cgi_main.c config.w32 config9.m4 Log: 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. Implementation by Dmitry http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.272&r2=1.273&diff_format=u Index: php-src/sapi/cgi/cgi_main.c diff -u php-src/sapi/cgi/cgi_main.c:1.272 php-src/sapi/cgi/cgi_main.c:1.273 --- php-src/sapi/cgi/cgi_main.c:1.272 Fri Dec 9 16:58:02 2005 +++ php-src/sapi/cgi/cgi_main.c Sun Dec 25 12:45:01 2005 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: cgi_main.c,v 1.272 2005/12/09 16:58:02 dmitry Exp $ */ +/* $Id: cgi_main.c,v 1.273 2005/12/25 12:45:01 zeev Exp $ */ #include "php.h" #include "php_globals.h" @@ -78,9 +78,8 @@ #include "php_getopt.h" -#include "fcgi_config.h" -#include "fcgiapp.h" -/* don't want to include fcgios.h, causes conflicts */ +#include "fastcgi.h" + #ifdef PHP_WIN32 extern int OS_SetImpersonate(void); #else http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/config.w32?r1=1.3&r2=1.4&diff_format=u Index: php-src/sapi/cgi/config.w32 diff -u php-src/sapi/cgi/config.w32:1.3 php-src/sapi/cgi/config.w32:1.4 --- php-src/sapi/cgi/config.w32:1.3 Wed Nov 23 18:08:51 2005 +++ php-src/sapi/cgi/config.w32 Sun Dec 25 12:45:01 2005 @@ -1,10 +1,9 @@ // vim:ft=javascript -// $Id: config.w32,v 1.3 2005/11/23 18:08:51 dmitry Exp $ +// $Id: config.w32,v 1.4 2005/12/25 12:45:01 zeev Exp $ ARG_ENABLE('cgi', 'Build CGI version of PHP', 'yes'); if (PHP_CGI == "yes") { - SAPI('cgi', 'cgi_main.c getopt.c', 'php-cgi.exe', '/I sapi/cgi/libfcgi/include /D FCGI_STATIC'); - ADD_SOURCES('sapi/cgi/libfcgi', 'fcgi_stdio.c fcgiapp.c os_win32.c', 'cgi'); + SAPI('cgi', 'cgi_main.c getopt.c fastcgi.c', 'php-cgi.exe'); ADD_FLAG('LIBS_CGI', 'ws2_32.lib kernel32.lib advapi32.lib'); } http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/config9.m4?r1=1.18&r2=1.19&diff_format=u Index: php-src/sapi/cgi/config9.m4 diff -u php-src/sapi/cgi/config9.m4:1.18 php-src/sapi/cgi/config9.m4:1.19 --- php-src/sapi/cgi/config9.m4:1.18 Wed Nov 23 18:08:51 2005 +++ php-src/sapi/cgi/config9.m4 Sun Dec 25 12:45:01 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config9.m4,v 1.18 2005/11/23 18:08:51 dmitry Exp $ +dnl $Id: config9.m4,v 1.19 2005/12/25 12:45:01 zeev Exp $ dnl AC_ARG_ENABLE(cgi, @@ -45,6 +45,32 @@ if test "$PHP_SAPI_CGI" != "no"; then AC_MSG_RESULT(yes) + AC_MSG_CHECKING([for socklen_t in sys/socket.h]) + AC_EGREP_HEADER([socklen_t], [sys/socket.h], + [AC_MSG_RESULT([yes]) + AC_DEFINE([HAVE_SOCKLEN_T], [1], + [Define if the socklen_t typedef is in sys/socket.h])], + AC_MSG_RESULT([no])) + + AC_MSG_CHECKING([for sun_len in sys/un.h]) + AC_EGREP_HEADER([sun_len], [sys/un.h], + [AC_MSG_RESULT([yes]) + AC_DEFINE([HAVE_SOCKADDR_UN_SUN_LEN], [1], + [Define if sockaddr_un in sys/un.h contains a sun_len component])], + AC_MSG_RESULT([no])) + + AC_MSG_CHECKING([whether cross-process locking is required by accept()]) + case "`uname -sr`" in + IRIX\ 5.* | SunOS\ 5.* | UNIX_System_V\ 4.0) + AC_MSG_RESULT([yes]) + AC_DEFINE([USE_LOCKING], [1], + [Define if cross-process locking is required by accept()]) + ;; + *) + AC_MSG_RESULT([no]) + ;; + esac + PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/cgi/Makefile.frag) case $host_alias in *cygwin* ) @@ -58,11 +84,8 @@ PHP_TEST_WRITE_STDOUT - PHP_ADD_BUILD_DIR($abs_builddir/sapi/cgi/libfcgi) - PHP_FCGI_INCLUDE="-I$abs_srcdir/sapi/cgi/libfcgi/include" - 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)" - PHP_SELECT_SAPI(cgi, program, libfcgi/fcgi_stdio.c libfcgi/fcgiapp.c libfcgi/os_unix.c cgi_main.c getopt.c, $PHP_FCGI_INCLUDE, '$(SAPI_CGI_PATH)') + PHP_SELECT_SAPI(cgi, program, fastcgi.c cgi_main.c getopt.c, '', '$(SAPI_CGI_PATH)') case $host_alias in *aix*)
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php