packages (PHP_5_2): php/php-fpm.patch - updated from http://php-fpm.org/dow...
glen
glen at pld-linux.org
Mon Feb 27 13:45:04 CET 2012
Author: glen Date: Mon Feb 27 12:45:04 2012 GMT
Module: packages Tag: PHP_5_2
---- Log message:
- updated from http://php-fpm.org/downloads/php-5.2.17-fpm-0.5.14.diff.gz using filter from r1.10 commit message
---- Files affected:
packages/php:
php-fpm.patch (1.14.2.1 -> 1.14.2.2)
---- Diffs:
================================================================
Index: packages/php/php-fpm.patch
diff -u packages/php/php-fpm.patch:1.14.2.1 packages/php/php-fpm.patch:1.14.2.2
--- packages/php/php-fpm.patch:1.14.2.1 Fri Feb 26 09:54:09 2010
+++ packages/php/php-fpm.patch Mon Feb 27 13:44:59 2012
@@ -1,8 +1,10 @@
-diff -Nru php-5.2.8.vanilla/configure php-5.2.8.fpm/configure
-diff -Nru php-5.2.8.vanilla/configure.in php-5.2.8.fpm/configure.in
---- php-5.2.8.vanilla/configure.in 2008-12-07 22:23:25.000000000 +0300
-+++ php-5.2.8.fpm/configure.in 2008-12-09 04:00:14.000000000 +0300
-@@ -297,6 +297,12 @@
+diff --git a/configure b/configure
+index 2d88ed7..c490abf 100755
+diff --git a/configure.in b/configure.in
+index e181ac9..4424930 100644
+--- a/configure.in
++++ b/configure.in
+@@ -295,6 +295,12 @@ if test "$enable_maintainer_zts" = "yes"; then
PTHREADS_FLAGS
fi
@@ -15,7 +17,7 @@
divert(3)
dnl ## In diversion 3 we check for compile-time options to the PHP
-@@ -514,6 +520,7 @@
+@@ -511,6 +517,7 @@ AC_CHECK_FUNCS(
alphasort \
asctime_r \
chroot \
@@ -23,7 +25,7 @@
ctime_r \
cuserid \
crypt \
-@@ -1239,6 +1246,8 @@
+@@ -1253,6 +1260,8 @@ PHP_SUBST_OLD(EXTENSION_DIR)
PHP_SUBST_OLD(EXTRA_LDFLAGS)
PHP_SUBST_OLD(EXTRA_LDFLAGS_PROGRAM)
PHP_SUBST_OLD(EXTRA_LIBS)
@@ -32,7 +34,7 @@
PHP_SUBST_OLD(ZEND_EXTRA_LIBS)
PHP_SUBST_OLD(INCLUDES)
PHP_SUBST_OLD(EXTRA_INCLUDES)
-@@ -1351,7 +1360,7 @@
+@@ -1364,7 +1373,7 @@ case $PHP_SAPI in
install_targets="$PHP_INSTALL_CLI_TARGET $install_targets"
;;
*)
@@ -41,49 +43,133 @@
;;
esac
-diff -Nru php-5.2.8.vanilla/libevent/aclocal.m4 php-5.2.8.fpm/libevent/aclocal.m4
-diff -Nru php-5.2.8.vanilla/libevent/autogen.sh php-5.2.8.fpm/libevent/autogen.sh
-diff -Nru php-5.2.8.vanilla/libevent/buffer.c php-5.2.8.fpm/libevent/buffer.c
-diff -Nru php-5.2.8.vanilla/libevent/ChangeLog php-5.2.8.fpm/libevent/ChangeLog
-diff -Nru php-5.2.8.vanilla/libevent/compat/sys/queue.h php-5.2.8.fpm/libevent/compat/sys/queue.h
-diff -Nru php-5.2.8.vanilla/libevent/compat/sys/_time.h php-5.2.8.fpm/libevent/compat/sys/_time.h
-diff -Nru php-5.2.8.vanilla/libevent/config.h.in php-5.2.8.fpm/libevent/config.h.in
-diff -Nru php-5.2.8.vanilla/libevent/configure php-5.2.8.fpm/libevent/configure
-diff -Nru php-5.2.8.vanilla/libevent/configure.in php-5.2.8.fpm/libevent/configure.in
-diff -Nru php-5.2.8.vanilla/libevent/depcomp php-5.2.8.fpm/libevent/depcomp
-diff -Nru php-5.2.8.vanilla/libevent/devpoll.c php-5.2.8.fpm/libevent/devpoll.c
-diff -Nru php-5.2.8.vanilla/libevent/epoll.c php-5.2.8.fpm/libevent/epoll.c
-diff -Nru php-5.2.8.vanilla/libevent/epoll_sub.c php-5.2.8.fpm/libevent/epoll_sub.c
-diff -Nru php-5.2.8.vanilla/libevent/evbuffer.c php-5.2.8.fpm/libevent/evbuffer.c
-diff -Nru php-5.2.8.vanilla/libevent/event.3 php-5.2.8.fpm/libevent/event.3
-diff -Nru php-5.2.8.vanilla/libevent/event.c php-5.2.8.fpm/libevent/event.c
-diff -Nru php-5.2.8.vanilla/libevent/event-config.h php-5.2.8.fpm/libevent/event-config.h
-diff -Nru php-5.2.8.vanilla/libevent/event-fpm.h php-5.2.8.fpm/libevent/event-fpm.h
-diff -Nru php-5.2.8.vanilla/libevent/event.h php-5.2.8.fpm/libevent/event.h
-diff -Nru php-5.2.8.vanilla/libevent/event-internal.h php-5.2.8.fpm/libevent/event-internal.h
-diff -Nru php-5.2.8.vanilla/libevent/evhttp.h php-5.2.8.fpm/libevent/evhttp.h
-diff -Nru php-5.2.8.vanilla/libevent/evport.c php-5.2.8.fpm/libevent/evport.c
-diff -Nru php-5.2.8.vanilla/libevent/evsignal.h php-5.2.8.fpm/libevent/evsignal.h
-diff -Nru php-5.2.8.vanilla/libevent/evutil.c php-5.2.8.fpm/libevent/evutil.c
-diff -Nru php-5.2.8.vanilla/libevent/evutil.h php-5.2.8.fpm/libevent/evutil.h
-diff -Nru php-5.2.8.vanilla/libevent/http.c php-5.2.8.fpm/libevent/http.c
-diff -Nru php-5.2.8.vanilla/libevent/http-internal.h php-5.2.8.fpm/libevent/http-internal.h
-diff -Nru php-5.2.8.vanilla/libevent/install-sh php-5.2.8.fpm/libevent/install-sh
-diff -Nru php-5.2.8.vanilla/libevent/kqueue.c php-5.2.8.fpm/libevent/kqueue.c
-diff -Nru php-5.2.8.vanilla/libevent/log.c php-5.2.8.fpm/libevent/log.c
-diff -Nru php-5.2.8.vanilla/libevent/log.h php-5.2.8.fpm/libevent/log.h
-diff -Nru php-5.2.8.vanilla/libevent/Makefile.am php-5.2.8.fpm/libevent/Makefile.am
-diff -Nru php-5.2.8.vanilla/libevent/Makefile.in php-5.2.8.fpm/libevent/Makefile.in
-diff -Nru php-5.2.8.vanilla/libevent/min_heap.h php-5.2.8.fpm/libevent/min_heap.h
-diff -Nru php-5.2.8.vanilla/libevent/missing php-5.2.8.fpm/libevent/missing
-diff -Nru php-5.2.8.vanilla/libevent/poll.c php-5.2.8.fpm/libevent/poll.c
-diff -Nru php-5.2.8.vanilla/libevent/README php-5.2.8.fpm/libevent/README
-diff -Nru php-5.2.8.vanilla/libevent/select.c php-5.2.8.fpm/libevent/select.c
-diff -Nru php-5.2.8.vanilla/libevent/signal.c php-5.2.8.fpm/libevent/signal.c
-diff -Nru php-5.2.8.vanilla/libevent/strlcpy.c php-5.2.8.fpm/libevent/strlcpy.c
-diff -Nru php-5.2.8.vanilla/libevent/strlcpy-internal.h php-5.2.8.fpm/libevent/strlcpy-internal.h
---- php-5.2.8.vanilla/main/php_config.h.in 2008-12-07 22:31:16.000000000 +0300
-+++ php-5.2.8.fpm/main/php_config.h.in 2008-12-13 07:23:02.000000000 +0300
+diff --git a/libevent/ChangeLog b/libevent/ChangeLog
+new file mode 100644
+index 0000000..c592139
+diff --git a/libevent/Makefile.am b/libevent/Makefile.am
+new file mode 100644
+index 0000000..5ccfd2c
+diff --git a/libevent/Makefile.in b/libevent/Makefile.in
+new file mode 100644
+index 0000000..0600dcc
+diff --git a/libevent/README b/libevent/README
+new file mode 100644
+index 0000000..b065039
+diff --git a/libevent/aclocal.m4 b/libevent/aclocal.m4
+new file mode 100644
+index 0000000..74de4a1
+diff --git a/libevent/autogen.sh b/libevent/autogen.sh
+new file mode 100644
+index 0000000..218dbf4
+diff --git a/libevent/buffer.c b/libevent/buffer.c
+new file mode 100644
+index 0000000..e66080f
+diff --git a/libevent/compat/sys/_time.h b/libevent/compat/sys/_time.h
+new file mode 100644
+index 0000000..8cabb0d
+diff --git a/libevent/compat/sys/queue.h b/libevent/compat/sys/queue.h
+new file mode 100644
+index 0000000..c0956dd
+diff --git a/libevent/config.h.in b/libevent/config.h.in
+new file mode 100644
+index 0000000..d151f87
+diff --git a/libevent/configure b/libevent/configure
+new file mode 100644
+index 0000000..0a74aec
+diff --git a/libevent/configure.in b/libevent/configure.in
+new file mode 100644
+index 0000000..852d3c5
+diff --git a/libevent/depcomp b/libevent/depcomp
+new file mode 100644
+index 0000000..ffcd540
+diff --git a/libevent/devpoll.c b/libevent/devpoll.c
+new file mode 100644
+index 0000000..cbd2730
+diff --git a/libevent/epoll.c b/libevent/epoll.c
+new file mode 100644
+index 0000000..cf3c859
+diff --git a/libevent/epoll_sub.c b/libevent/epoll_sub.c
+new file mode 100644
+index 0000000..431970c
+diff --git a/libevent/evbuffer.c b/libevent/evbuffer.c
+new file mode 100644
+index 0000000..f2179a5
+diff --git a/libevent/event-config.h b/libevent/event-config.h
+new file mode 100644
+index 0000000..0a278b3
+diff --git a/libevent/event-fpm.h b/libevent/event-fpm.h
+new file mode 100644
+index 0000000..8625ca5
+diff --git a/libevent/event-internal.h b/libevent/event-internal.h
+new file mode 100644
+index 0000000..7485f21
+diff --git a/libevent/event.3 b/libevent/event.3
+new file mode 100644
+index 0000000..5b33ec6
+diff --git a/libevent/event.c b/libevent/event.c
+new file mode 100644
+index 0000000..826b7db
+diff --git a/libevent/event.h b/libevent/event.h
+new file mode 100644
+index 0000000..d67ecb5
+diff --git a/libevent/evhttp.h b/libevent/evhttp.h
+new file mode 100644
+index 0000000..0d35f9e
+diff --git a/libevent/evport.c b/libevent/evport.c
+new file mode 100644
+index 0000000..31523b4
+diff --git a/libevent/evsignal.h b/libevent/evsignal.h
+new file mode 100644
+index 0000000..8be9cbd
+diff --git a/libevent/evutil.c b/libevent/evutil.c
+new file mode 100644
+index 0000000..86205b2
+diff --git a/libevent/evutil.h b/libevent/evutil.h
+new file mode 100644
+index 0000000..0a018b8
+diff --git a/libevent/http-internal.h b/libevent/http-internal.h
+new file mode 100644
+index 0000000..bc9a1ed
+diff --git a/libevent/http.c b/libevent/http.c
+new file mode 100644
+index 0000000..1d60fc5
+diff --git a/libevent/install-sh b/libevent/install-sh
+new file mode 100644
+index 0000000..1a83534
+diff --git a/libevent/kqueue.c b/libevent/kqueue.c
+new file mode 100644
+index 0000000..38a1819
+diff --git a/libevent/log.c b/libevent/log.c
+new file mode 100644
+index 0000000..b62a619
+diff --git a/libevent/log.h b/libevent/log.h
+new file mode 100644
+index 0000000..7bc6632
+diff --git a/libevent/min_heap.h b/libevent/min_heap.h
+new file mode 100644
+index 0000000..d47e563
+diff --git a/libevent/missing b/libevent/missing
+new file mode 100644
+index 0000000..09edd88
+diff --git a/libevent/poll.c b/libevent/poll.c
+new file mode 100644
+index 0000000..b67c6ff
+diff --git a/libevent/select.c b/libevent/select.c
+new file mode 100644
+index 0000000..7faafe4
+diff --git a/libevent/signal.c b/libevent/signal.c
+new file mode 100644
+index 0000000..bcaa3f9
+diff --git a/libevent/strlcpy-internal.h b/libevent/strlcpy-internal.h
+new file mode 100644
+index 0000000..22b5f61
+diff --git a/libevent/strlcpy.c b/libevent/strlcpy.c
+new file mode 100644
+index 0000000..a1a413d
+diff --git a/main/php_config.h.in b/main/php_config.h.in
+index 6df7d68..f155934 100644
+--- a/main/php_config.h.in
++++ b/main/php_config.h.in
@@ -170,6 +170,9 @@
/* Define if you have the chroot function. */
#undef HAVE_CHROOT
@@ -94,7 +180,7 @@
/* Define if you have the crypt function. */
#undef HAVE_CRYPT
-@@ -932,6 +935,9 @@
+@@ -935,6 +938,9 @@
/* */
#undef PHP_FASTCGI
@@ -104,7 +190,7 @@
/* */
#undef FORCE_CGI_REDIRECT
-@@ -941,6 +947,27 @@
+@@ -944,6 +950,27 @@
/* */
#undef ENABLE_PATHINFO_CHECK
@@ -132,8 +218,18 @@
/* Define if system uses EBCDIC */
#undef CHARSET_EBCDIC
---- php-5.2.8.vanilla/sapi/cgi/cgi_main.c 2008-11-28 14:56:50.000000000 +0300
-+++ php-5.2.8.fpm/sapi/cgi/cgi_main.c 2008-12-09 07:17:03.000000000 +0300
+diff --git a/sapi/cgi/Makefile.frag b/sapi/cgi/Makefile.frag
+index 57a3b29..6fa6c9f 100644
+--- a/sapi/cgi/Makefile.frag
++++ b/sapi/cgi/Makefile.frag
+@@ -1,2 +1,2 @@
+-$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
++$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(SAPI_EXTRA_DEPS)
+ $(BUILD_CGI)
+diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
+index a4a19c2..2c19083 100644
+--- a/sapi/cgi/cgi_main.c
++++ b/sapi/cgi/cgi_main.c
@@ -55,6 +55,9 @@
#if HAVE_SYS_WAIT_H
#include <sys/wait.h>
@@ -144,7 +240,7 @@
#include "zend.h"
#include "zend_extensions.h"
#include "php_ini.h"
-@@ -83,6 +86,11 @@
+@@ -83,6 +86,11 @@ int __riscosify_control = __RISCOSIFY_STRICT_UNIX_SPECS;
#if PHP_FASTCGI
#include "fastcgi.h"
@@ -156,7 +252,7 @@
#ifndef PHP_WIN32
/* XXX this will need to change later when threaded fastcgi is
implemented. shane */
-@@ -115,8 +123,12 @@
+@@ -115,8 +123,12 @@ static int parent_waiting = 0;
static pid_t pgroup;
#endif
@@ -169,7 +265,7 @@
#define PHP_MODE_STANDARD 1
#define PHP_MODE_HIGHLIGHT 2
#define PHP_MODE_INDENT 3
-@@ -146,6 +158,10 @@
+@@ -146,6 +158,10 @@ static const opt_struct OPTIONS[] = {
{'w', 0, "strip"},
{'?', 0, "usage"},/* help alias (both '?' and 'usage') */
{'v', 0, "version"},
@@ -180,7 +276,7 @@
{'z', 1, "zend-extension"},
#if PHP_FASTCGI
{'T', 1, "timing"},
-@@ -170,6 +186,7 @@
+@@ -170,6 +186,7 @@ typedef struct _php_cgi_globals_struct {
zend_bool impersonate;
# endif
#endif
@@ -188,7 +284,7 @@
} php_cgi_globals_struct;
#ifdef ZTS
-@@ -471,7 +488,28 @@
+@@ -474,7 +491,28 @@ static int sapi_cgi_read_post(char *buffer, uint count_bytes TSRMLS_DC)
#if PHP_FASTCGI
if (fcgi_is_fastcgi()) {
fcgi_request *request = (fcgi_request*) SG(server_context);
@@ -216,9 +312,9 @@
+ tmp_read_bytes = read(request_body_fd, buffer + read_bytes, count_bytes - read_bytes);
+ }
} else {
- tmp_read_bytes = read(0, buffer + read_bytes, count_bytes - read_bytes);
+ tmp_read_bytes = read(STDIN_FILENO, buffer + read_bytes, count_bytes - read_bytes);
}
-@@ -783,7 +821,12 @@
+@@ -786,7 +824,12 @@ static void php_cgi_usage(char *argv0)
" -s Display colour syntax highlighted source.\n"
" -v Version number\n"
" -w Display source with stripped comments and whitespace.\n"
@@ -232,7 +328,7 @@
#if PHP_FASTCGI
" -T <count> Measure execution time of script repeated <count> times.\n"
#endif
-@@ -1231,6 +1274,7 @@
+@@ -1236,6 +1279,7 @@ PHP_INI_BEGIN()
# ifdef PHP_WIN32
STD_PHP_INI_ENTRY("fastcgi.impersonate", "0", PHP_INI_SYSTEM, OnUpdateBool, impersonate, php_cgi_globals_struct, php_cgi_globals)
# endif
@@ -240,7 +336,7 @@
#endif
PHP_INI_END()
-@@ -1253,6 +1297,7 @@
+@@ -1258,6 +1302,7 @@ static void php_cgi_globals_ctor(php_cgi_globals_struct *php_cgi_globals TSRMLS_
# ifdef PHP_WIN32
php_cgi_globals->impersonate = 0;
# endif
@@ -248,7 +344,7 @@
#endif
}
/* }}} */
-@@ -1285,9 +1330,47 @@
+@@ -1290,9 +1335,47 @@ static PHP_MSHUTDOWN_FUNCTION(cgi)
static PHP_MINFO_FUNCTION(cgi)
{
DISPLAY_INI_ENTRIES();
@@ -296,7 +392,7 @@
static zend_module_entry cgi_module_entry = {
STANDARD_MODULE_HEADER,
#if PHP_FASTCGI
-@@ -1295,7 +1378,7 @@
+@@ -1300,7 +1383,7 @@ static zend_module_entry cgi_module_entry = {
#else
"cgi",
#endif
@@ -305,7 +401,7 @@
PHP_MINIT(cgi),
PHP_MSHUTDOWN(cgi),
NULL,
-@@ -1335,6 +1418,7 @@
+@@ -1340,6 +1423,7 @@ int main(int argc, char *argv[])
char *bindpath = NULL;
int fcgi_fd = 0;
fcgi_request request;
@@ -313,7 +409,7 @@
int repeats = 1;
int benchmark = 0;
#if HAVE_GETTIMEOFDAY
-@@ -1455,6 +1539,14 @@
+@@ -1460,6 +1544,14 @@ int main(int argc, char *argv[])
case 's': /* generate highlighted HTML from source */
behavior = PHP_MODE_HIGHLIGHT;
break;
@@ -328,7 +424,7 @@
}
-@@ -1517,6 +1609,19 @@
+@@ -1524,6 +1616,19 @@ consult the installation file that came with this distribution, or visit \n\
#endif /* FORCE_CGI_REDIRECT */
#if PHP_FASTCGI
@@ -348,7 +444,7 @@
if (bindpath) {
fcgi_fd = fcgi_listen(bindpath, 128);
if (fcgi_fd < 0) {
-@@ -1531,6 +1636,9 @@
+@@ -1538,6 +1643,9 @@ consult the installation file that came with this distribution, or visit \n\
if (fastcgi) {
/* How many times to run PHP scripts before dying */
@@ -358,7 +454,7 @@
if (getenv("PHP_FCGI_MAX_REQUESTS")) {
max_requests = atoi(getenv("PHP_FCGI_MAX_REQUESTS"));
if (max_requests < 0) {
-@@ -1548,6 +1656,9 @@
+@@ -1555,6 +1663,9 @@ consult the installation file that came with this distribution, or visit \n\
#ifndef PHP_WIN32
/* Pre-fork, if required */
@@ -368,7 +464,7 @@
if (getenv("PHP_FCGI_CHILDREN")) {
char * children_str = getenv("PHP_FCGI_CHILDREN");
children = atoi(children_str);
-@@ -1697,6 +1808,8 @@
+@@ -1704,6 +1815,8 @@ consult the installation file that came with this distribution, or visit \n\
#endif
#if PHP_FASTCGI
@@ -377,7 +473,7 @@
SG(server_context) = (void *) &request;
#else
SG(server_context) = (void *) 1; /* avoid server_context==NULL checks */
-@@ -1704,6 +1817,10 @@
+@@ -1711,6 +1824,10 @@ consult the installation file that came with this distribution, or visit \n\
init_request_info(TSRMLS_C);
CG(interactive) = 0;
@@ -388,7 +484,7 @@
if (!cgi
#if PHP_FASTCGI
&& !fastcgi
-@@ -1984,6 +2101,10 @@
+@@ -1994,6 +2111,10 @@ consult the installation file that came with this distribution, or visit \n\
}
}
@@ -399,7 +495,7 @@
switch (behavior) {
case PHP_MODE_STANDARD:
php_execute_script(&file_handle TSRMLS_CC);
-@@ -2036,6 +2157,10 @@
+@@ -2046,6 +2167,10 @@ consult the installation file that came with this distribution, or visit \n\
#if PHP_FASTCGI
fastcgi_request_done:
@@ -410,7 +506,7 @@
#endif
{
char *path_translated;
-@@ -2049,6 +2174,16 @@
+@@ -2059,6 +2184,16 @@ fastcgi_request_done:
SG(request_info).path_translated = path_translated;
}
@@ -427,7 +523,7 @@
php_request_shutdown((void *) 0);
if (exit_status == 0) {
exit_status = EG(exit_status);
-@@ -2086,15 +2221,20 @@
+@@ -2096,15 +2231,20 @@ fastcgi_request_done:
if (bindpath) {
free(bindpath);
}
@@ -452,9 +548,11 @@
#endif
if (cgi_sapi_module.php_ini_path_override) {
---- php-5.2.8.vanilla/sapi/cgi/config9.m4 2007-07-12 03:20:36.000000000 +0400
-+++ php-5.2.8.fpm/sapi/cgi/config9.m4 2008-07-20 20:46:41.000000000 +0400
-@@ -22,6 +22,10 @@
+diff --git a/sapi/cgi/config9.m4 b/sapi/cgi/config9.m4
+index 4ff90fd..fdf409b 100644
+--- a/sapi/cgi/config9.m4
++++ b/sapi/cgi/config9.m4
+@@ -22,6 +22,10 @@ PHP_ARG_ENABLE(path-info-check,,
[ --disable-path-info-check CGI: If this is disabled, paths such as
/info.php/test?a=b will fail to work], yes, no)
@@ -465,7 +563,7 @@
dnl
dnl CGI setup
dnl
-@@ -54,6 +58,20 @@
+@@ -54,6 +58,20 @@ if test "$PHP_SAPI" = "default"; then
AC_DEFINE_UNQUOTED(PHP_FASTCGI, $PHP_ENABLE_FASTCGI, [ ])
AC_MSG_RESULT($PHP_FASTCGI)
@@ -486,21 +584,23 @@
dnl --enable-force-cgi-redirect
AC_MSG_CHECKING(whether to force Apache CGI redirect)
if test "$PHP_FORCE_CGI_REDIRECT" = "yes"; then
-@@ -111,10 +111,10 @@
+@@ -93,10 +111,10 @@ if test "$PHP_SAPI" = "default"; then
BUILD_CGI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
;;
*darwin*)
- BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
-+ BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(SAPI_EXTRA_LIBS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
++ BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
;;
*)
-- BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
-+ BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
+- BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
++ BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
;;
esac
---- php-5.2.8.vanilla/sapi/cgi/fastcgi.c 2008-10-21 20:43:59.000000000 +0400
-+++ php-5.2.8.fpm/sapi/cgi/fastcgi.c 2008-12-09 04:02:34.000000000 +0300
+diff --git a/sapi/cgi/fastcgi.c b/sapi/cgi/fastcgi.c
+index 68b7e21..bcc0e7e 100644
+--- a/sapi/cgi/fastcgi.c
++++ b/sapi/cgi/fastcgi.c
@@ -27,6 +27,11 @@
#include <stdarg.h>
#include <errno.h>
@@ -513,7 +613,7 @@
#ifdef _WIN32
#include <windows.h>
-@@ -234,6 +239,8 @@
+@@ -234,6 +239,8 @@ int fcgi_init(void)
} else {
return is_fastcgi = 0;
}
@@ -522,7 +622,7 @@
#endif
}
return is_fastcgi;
-@@ -249,6 +256,16 @@
+@@ -249,14 +256,26 @@ int fcgi_is_fastcgi(void)
}
}
@@ -539,7 +639,17 @@
void fcgi_shutdown(void)
{
if (is_initialized) {
-@@ -327,6 +349,41 @@
+ zend_hash_destroy(&fcgi_mgmt_vars);
+ }
+ is_fastcgi = 0;
++
+ if (allowed_clients) {
+ free(allowed_clients);
++ allowed_clients = 0;
+ }
+ }
+
+@@ -330,6 +349,41 @@ out_fail:
}
#endif
@@ -581,7 +691,7 @@
static int is_port_number(const char *bindpath)
{
while (*bindpath) {
-@@ -512,38 +512,6 @@
+@@ -458,38 +512,6 @@ int fcgi_listen(const char *path, int backlog)
if (!tcp) {
chmod(path, 0777);
@@ -620,7 +730,7 @@
}
if (!is_initialized) {
-@@ -863,7 +888,7 @@
+@@ -866,7 +888,7 @@ int fcgi_read(fcgi_request *req, char *str, int len)
return n;
}
@@ -629,7 +739,7 @@
{
if (destroy) {
zend_hash_destroy(&req->env);
-@@ -903,6 +928,10 @@
+@@ -906,6 +928,10 @@ static inline void fcgi_close(fcgi_request *req, int force, int destroy)
close(req->fd);
#endif
req->fd = -1;
@@ -640,7 +750,7 @@
}
}
-@@ -950,6 +979,10 @@
+@@ -953,6 +979,10 @@ int fcgi_accept_request(fcgi_request *req)
sa_t sa;
socklen_t len = sizeof(sa);
@@ -651,7 +761,7 @@
FCGI_LOCK(req->listen_socket);
req->fd = accept(listen_socket, (struct sockaddr *)&sa, &len);
FCGI_UNLOCK(req->listen_socket);
-@@ -985,6 +1018,11 @@
+@@ -988,6 +1018,11 @@ int fcgi_accept_request(fcgi_request *req)
break;
#else
if (req->fd >= 0) {
@@ -663,9 +773,11 @@
#if defined(HAVE_SYS_POLL_H) && defined(HAVE_POLL)
struct pollfd fds;
int ret;
---- php-5.2.8.vanilla/sapi/cgi/fastcgi.h 2008-10-21 20:43:59.000000000 +0400
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php-fpm.patch?r1=1.14.2.1&r2=1.14.2.2&f=u
More information about the pld-cvs-commit
mailing list