Author: glen Date: Mon Dec 15 22:55:29 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- update to 0.5.10:
wget http://php-fpm.anight.org/downloads/head/php-5.2.8-fpm-0.5.10.diff.gz
zcat php-5.2.8-fpm-0.5.10.diff.gz | filterdiff -x '*/configure' -x
'*/libevent/*' > php-fpm.patch
---- Files affected:
SOURCES:
php-fpm.patch (1.9 -> 1.10)
---- Diffs:
================================================================
Index: SOURCES/php-fpm.patch
diff -u SOURCES/php-fpm.patch:1.9 SOURCES/php-fpm.patch:1.10
--- SOURCES/php-fpm.patch:1.9 Sat Dec 6 00:09:22 2008
+++ SOURCES/php-fpm.patch Mon Dec 15 23:55:23 2008
@@ -1,8 +1,8 @@
-diff -Nru php-5.2.6.vanilla/configure php-5.2.6.fpm/configure
-diff -Nru php-5.2.6.vanilla/configure.in php-5.2.6.fpm/configure.in
---- php-5.2.6.vanilla/configure.in 2008-04-30 22:27:55.000000000 +0400
-+++ php-5.2.6.fpm/configure.in 2008-05-01 20:42:05.000000000 +0400
-@@ -267,6 +267,12 @@
+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 @@
PTHREADS_FLAGS
fi
@@ -15,7 +15,7 @@
divert(3)
dnl ## In diversion 3 we check for compile-time options to the PHP
-@@ -476,6 +482,7 @@
+@@ -514,6 +520,7 @@
alphasort \
asctime_r \
chroot \
@@ -23,7 +23,7 @@
ctime_r \
cuserid \
crypt \
-@@ -1197,6 +1204,8 @@
+@@ -1239,6 +1246,8 @@
PHP_SUBST_OLD(EXTRA_LDFLAGS)
PHP_SUBST_OLD(EXTRA_LDFLAGS_PROGRAM)
PHP_SUBST_OLD(EXTRA_LIBS)
@@ -32,7 +32,7 @@
PHP_SUBST_OLD(ZEND_EXTRA_LIBS)
PHP_SUBST_OLD(INCLUDES)
PHP_SUBST_OLD(EXTRA_INCLUDES)
-@@ -1285,7 +1294,7 @@
+@@ -1351,7 +1360,7 @@
install_targets="$PHP_INSTALL_CLI_TARGET $install_targets"
;;
*)
@@ -41,46 +41,50 @@
;;
esac
-diff -Nru php-5.2.6.vanilla/libevent/aclocal.m4
php-5.2.6.fpm/libevent/aclocal.m4
-diff -Nru php-5.2.6.vanilla/libevent/autogen.sh
php-5.2.6.fpm/libevent/autogen.sh
-diff -Nru php-5.2.6.vanilla/libevent/ChangeLog php-5.2.6.fpm/libevent/ChangeLog
-diff -Nru php-5.2.6.vanilla/libevent/compat/sys/queue.h
php-5.2.6.fpm/libevent/compat/sys/queue.h
-diff -Nru php-5.2.6.vanilla/libevent/compat/sys/_time.h
php-5.2.6.fpm/libevent/compat/sys/_time.h
-diff -Nru php-5.2.6.vanilla/libevent/config.guess
php-5.2.6.fpm/libevent/config.guess
-diff -Nru php-5.2.6.vanilla/libevent/config.h.in
php-5.2.6.fpm/libevent/config.h.in
-diff -Nru php-5.2.6.vanilla/libevent/config.sub
php-5.2.6.fpm/libevent/config.sub
-diff -Nru php-5.2.6.vanilla/libevent/configure php-5.2.6.fpm/libevent/configure
-diff -Nru php-5.2.6.vanilla/libevent/configure.in
php-5.2.6.fpm/libevent/configure.in
-diff -Nru php-5.2.6.vanilla/libevent/depcomp php-5.2.6.fpm/libevent/depcomp
-diff -Nru php-5.2.6.vanilla/libevent/devpoll.c php-5.2.6.fpm/libevent/devpoll.c
-diff -Nru php-5.2.6.vanilla/libevent/epoll.c php-5.2.6.fpm/libevent/epoll.c
-diff -Nru php-5.2.6.vanilla/libevent/epoll_sub.c
php-5.2.6.fpm/libevent/epoll_sub.c
-diff -Nru php-5.2.6.vanilla/libevent/event.3 php-5.2.6.fpm/libevent/event.3
-diff -Nru php-5.2.6.vanilla/libevent/event.c php-5.2.6.fpm/libevent/event.c
-diff -Nru php-5.2.6.vanilla/libevent/event-config.h
php-5.2.6.fpm/libevent/event-config.h
-diff -Nru php-5.2.6.vanilla/libevent/event-fpm.h
php-5.2.6.fpm/libevent/event-fpm.h
-diff -Nru php-5.2.6.vanilla/libevent/event.h php-5.2.6.fpm/libevent/event.h
-diff -Nru php-5.2.6.vanilla/libevent/event-internal.h
php-5.2.6.fpm/libevent/event-internal.h
-diff -Nru php-5.2.6.vanilla/libevent/evport.c php-5.2.6.fpm/libevent/evport.c
-diff -Nru php-5.2.6.vanilla/libevent/evsignal.h
php-5.2.6.fpm/libevent/evsignal.h
-diff -Nru php-5.2.6.vanilla/libevent/evutil.c php-5.2.6.fpm/libevent/evutil.c
-diff -Nru php-5.2.6.vanilla/libevent/evutil.h php-5.2.6.fpm/libevent/evutil.h
-diff -Nru php-5.2.6.vanilla/libevent/install-sh
php-5.2.6.fpm/libevent/install-sh
-diff -Nru php-5.2.6.vanilla/libevent/kqueue.c php-5.2.6.fpm/libevent/kqueue.c
-diff -Nru php-5.2.6.vanilla/libevent/log.c php-5.2.6.fpm/libevent/log.c
-diff -Nru php-5.2.6.vanilla/libevent/log.h php-5.2.6.fpm/libevent/log.h
-diff -Nru php-5.2.6.vanilla/libevent/Makefile.am
php-5.2.6.fpm/libevent/Makefile.am
-diff -Nru php-5.2.6.vanilla/libevent/Makefile.in
php-5.2.6.fpm/libevent/Makefile.in
-diff -Nru php-5.2.6.vanilla/libevent/min_heap.h
php-5.2.6.fpm/libevent/min_heap.h
-diff -Nru php-5.2.6.vanilla/libevent/missing php-5.2.6.fpm/libevent/missing
-diff -Nru php-5.2.6.vanilla/libevent/mkinstalldirs
php-5.2.6.fpm/libevent/mkinstalldirs
-diff -Nru php-5.2.6.vanilla/libevent/poll.c php-5.2.6.fpm/libevent/poll.c
-diff -Nru php-5.2.6.vanilla/libevent/README php-5.2.6.fpm/libevent/README
-diff -Nru php-5.2.6.vanilla/libevent/select.c php-5.2.6.fpm/libevent/select.c
-diff -Nru php-5.2.6.vanilla/libevent/signal.c php-5.2.6.fpm/libevent/signal.c
-diff -Nru php-5.2.6.vanilla/main/php_config.h.in
php-5.2.6.fpm/main/php_config.h.in
---- php-5.2.6.vanilla/main/php_config.h.in 2008-04-30 22:37:39.000000000
+0400
-+++ php-5.2.6.fpm/main/php_config.h.in 2008-09-21 17:37:45.000000000 +0400
+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
+diff -Nru php-5.2.8.vanilla/main/php_config.h.in
php-5.2.8.fpm/main/php_config.h.in
+--- 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
@@ -170,6 +170,9 @@
/* Define if you have the chroot function. */
#undef HAVE_CHROOT
@@ -91,7 +95,7 @@
/* Define if you have the crypt function. */
#undef HAVE_CRYPT
-@@ -929,6 +932,9 @@
+@@ -932,6 +935,9 @@
/* */
#undef PHP_FASTCGI
@@ -101,7 +105,7 @@
/* */
#undef FORCE_CGI_REDIRECT
-@@ -938,6 +944,27 @@
+@@ -941,6 +947,27 @@
/* */
#undef ENABLE_PATHINFO_CHECK
@@ -129,8 +133,9 @@
/* Define if system uses EBCDIC */
#undef CHARSET_EBCDIC
---- php-5.2.6.fpm/sapi/cgi/cgi_main.c 2008-07-22 01:50:58.000000000 +0400
-+++ php-5.2.6/sapi/cgi/cgi_main.c 2008-11-03 20:21:40.431760373 +0200
+diff -Nru php-5.2.8.vanilla/sapi/cgi/cgi_main.c
php-5.2.8.fpm/sapi/cgi/cgi_main.c
+--- 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
@@ -55,6 +55,9 @@
#if HAVE_SYS_WAIT_H
#include <sys/wait.h>
@@ -153,7 +158,7 @@
#ifndef PHP_WIN32
/* XXX this will need to change later when threaded fastcgi is
implemented. shane */
-@@ -109,8 +117,12 @@
+@@ -115,8 +123,12 @@
static pid_t pgroup;
#endif
@@ -166,7 +171,7 @@
#define PHP_MODE_STANDARD 1
#define PHP_MODE_HIGHLIGHT 2
#define PHP_MODE_INDENT 3
-@@ -140,6 +152,10 @@
+@@ -146,6 +158,10 @@
{'w', 0, "strip"},
{'?', 0, "usage"},/* help alias (both '?' and 'usage') */
{'v', 0, "version"},
@@ -177,7 +182,7 @@
{'z', 1, "zend-extension"},
#if PHP_FASTCGI
{'T', 1, "timing"},
-@@ -164,6 +180,7 @@
+@@ -170,6 +186,7 @@
zend_bool impersonate;
# endif
#endif
@@ -185,7 +190,7 @@
} php_cgi_globals_struct;
#ifdef ZTS
-@@ -444,7 +461,28 @@
+@@ -471,7 +488,28 @@
#if PHP_FASTCGI
if (fcgi_is_fastcgi()) {
fcgi_request *request = (fcgi_request*)
SG(server_context);
@@ -215,7 +220,7 @@
} else {
tmp_read_bytes = read(0, buffer + read_bytes,
count_bytes - read_bytes);
}
-@@ -756,7 +794,12 @@
+@@ -783,7 +821,12 @@
" -s Display colour syntax
highlighted source.\n"
" -v Version number\n"
" -w Display source with stripped
comments and whitespace.\n"
@@ -229,7 +234,7 @@
#if PHP_FASTCGI
" -T <count> Measure execution time of script
repeated <count> times.\n"
#endif
-@@ -1173,6 +1216,7 @@
+@@ -1231,6 +1274,7 @@
# ifdef PHP_WIN32
STD_PHP_INI_ENTRY("fastcgi.impersonate", "0", PHP_INI_SYSTEM,
OnUpdateBool, impersonate, php_cgi_globals_struct, php_cgi_globals)
# endif
@@ -237,7 +242,7 @@
#endif
PHP_INI_END()
-@@ -1195,6 +1239,7 @@
+@@ -1253,6 +1297,7 @@
# ifdef PHP_WIN32
php_cgi_globals->impersonate = 0;
# endif
@@ -245,7 +250,7 @@
#endif
}
/* }}} */
-@@ -1227,9 +1272,47 @@
+@@ -1285,9 +1330,47 @@
static PHP_MINFO_FUNCTION(cgi)
{
DISPLAY_INI_ENTRIES();
@@ -293,7 +298,7 @@
static zend_module_entry cgi_module_entry = {
STANDARD_MODULE_HEADER,
#if PHP_FASTCGI
-@@ -1237,7 +1320,7 @@
+@@ -1295,7 +1378,7 @@
#else
"cgi",
#endif
@@ -302,7 +307,7 @@
PHP_MINIT(cgi),
PHP_MSHUTDOWN(cgi),
NULL,
-@@ -1277,6 +1360,7 @@
+@@ -1335,6 +1418,7 @@
char *bindpath = NULL;
int fcgi_fd = 0;
fcgi_request request;
@@ -310,7 +315,7 @@
int repeats = 1;
int benchmark = 0;
#if HAVE_GETTIMEOFDAY
-@@ -1397,6 +1481,14 @@
+@@ -1455,6 +1539,14 @@
case 's': /* generate highlighted HTML from source */
behavior = PHP_MODE_HIGHLIGHT;
break;
@@ -325,7 +330,7 @@
}
-@@ -1459,6 +1551,19 @@
+@@ -1517,6 +1609,19 @@
#endif /* FORCE_CGI_REDIRECT */
#if PHP_FASTCGI
@@ -345,33 +350,27 @@
if (bindpath) {
fcgi_fd = fcgi_listen(bindpath, 128);
if (fcgi_fd < 0) {
-@@ -1625,7 +1625,11 @@
+@@ -1531,6 +1636,9 @@
if (fastcgi) {
/* How many times to run PHP scripts before dying */
-- if (getenv("PHP_FCGI_MAX_REQUESTS")) {
-+ if (
+#if PHP_FASTCGI_PM
-+ !fpm &&
++ if (!fpm)
+#endif
-+ getenv("PHP_FCGI_MAX_REQUESTS")) {
+ if (getenv("PHP_FCGI_MAX_REQUESTS")) {
max_requests = atoi(getenv("PHP_FCGI_MAX_REQUESTS"));
if (max_requests < 0) {
- fprintf(stderr, "PHP_FCGI_MAX_REQUESTS is not
valid\n");
-@@ -1677,7 +1677,11 @@
+@@ -1548,6 +1656,9 @@
#ifndef PHP_WIN32
/* Pre-fork, if required */
-- if (getenv("PHP_FCGI_CHILDREN")) {
-+ if (
+#if PHP_FASTCGI_PM
-+ !fpm &&
++ if (!fpm)
+#endif
-+ getenv("PHP_FCGI_CHILDREN")) {
+ if (getenv("PHP_FCGI_CHILDREN")) {
char * children_str = getenv("PHP_FCGI_CHILDREN");
children = atoi(children_str);
- if (children < 0) {
-@@ -1616,6 +1729,8 @@
+@@ -1697,6 +1808,8 @@
#endif
#if PHP_FASTCGI
@@ -380,7 +379,7 @@
SG(server_context) = (void *) &request;
#else
SG(server_context) = (void *) 1; /* avoid server_context==NULL
checks */
-@@ -1623,6 +1730,10 @@
+@@ -1704,6 +1817,10 @@
init_request_info(TSRMLS_C);
CG(interactive) = 0;
@@ -391,7 +390,7 @@
if (!cgi
#if PHP_FASTCGI
&& !fastcgi
-@@ -1914,6 +2025,10 @@
+@@ -1984,6 +2101,10 @@
}
}
@@ -402,7 +401,7 @@
switch (behavior) {
case PHP_MODE_STANDARD:
php_execute_script(&file_handle TSRMLS_CC);
-@@ -1966,6 +2081,10 @@
+@@ -2036,6 +2157,10 @@
#if PHP_FASTCGI
fastcgi_request_done:
@@ -413,7 +412,7 @@
#endif
{
char *path_translated;
-@@ -1979,6 +2098,16 @@
+@@ -2049,6 +2174,16 @@
SG(request_info).path_translated =
path_translated;
}
@@ -430,7 +429,7 @@
php_request_shutdown((void *) 0);
if (exit_status == 0) {
exit_status = EG(exit_status);
-@@ -2016,15 +2145,20 @@
+@@ -2086,15 +2221,20 @@
if (bindpath) {
free(bindpath);
}
@@ -455,9 +454,9 @@
#endif
if (cgi_sapi_module.php_ini_path_override) {
-diff -Nru php-5.2.6.vanilla/sapi/cgi/config9.m4
php-5.2.6.fpm/sapi/cgi/config9.m4
---- php-5.2.6.vanilla/sapi/cgi/config9.m4 2007-07-12 03:20:36.000000000
+0400
-+++ php-5.2.6.fpm/sapi/cgi/config9.m4 2008-07-20 20:46:41.000000000 +0400
+diff -Nru php-5.2.8.vanilla/sapi/cgi/config9.m4
php-5.2.8.fpm/sapi/cgi/config9.m4
+--- 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 @@
[ --disable-path-info-check CGI: If this is disabled, paths such as
/info.php/test?a=b will fail to work], yes, no)
@@ -490,26 +489,22 @@
dnl --enable-force-cgi-redirect
AC_MSG_CHECKING(whether to force Apache CGI redirect)
if test "$PHP_FORCE_CGI_REDIRECT" = "yes"; then
-@@ -108,13 +108,13 @@
-
- case $host_alias in
- *aix*)
-- 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)"
-+ 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) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
+@@ -93,10 +111,10 @@
+ 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) \$(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) \$(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="\$(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)
\$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
;;
*)
-- BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic
\$(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
\$(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
-diff -Nru php-5.2.6.vanilla/sapi/cgi/fastcgi.c php-5.2.6.fpm/sapi/cgi/fastcgi.c
---- php-5.2.6.vanilla/sapi/cgi/fastcgi.c 2008-04-03 14:24:44.000000000
+0400
-+++ php-5.2.6.fpm/sapi/cgi/fastcgi.c 2008-05-15 23:37:01.000000000 +0400
+diff -Nru php-5.2.8.vanilla/sapi/cgi/fastcgi.c php-5.2.8.fpm/sapi/cgi/fastcgi.c
+--- 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
@@ -27,6 +27,11 @@
#include <stdarg.h>
#include <errno.h>
@@ -522,7 +517,7 @@
#ifdef _WIN32
#include <windows.h>
-@@ -240,6 +245,8 @@
+@@ -234,6 +239,8 @@
} else {
return is_fastcgi = 0;
}
@@ -531,7 +526,7 @@
#endif
}
return is_fastcgi;
-@@ -256,11 +256,27 @@
+@@ -249,12 +256,27 @@
}
}
@@ -550,16 +545,17 @@
if (is_initialized) {
zend_hash_destroy(&fcgi_mgmt_vars);
}
-+
+- is_fastcgi = 0;
++ is_fastcgi = 1;
++
+ if (allowed_clients) {
+ free(allowed_clients);
+ allowed_clients = 0;
+ }
-+
- is_fastcgi = 0;
}
-@@ -330,6 +352,41 @@
+ #ifdef _WIN32
+@@ -327,6 +349,41 @@
}
#endif
@@ -601,7 +597,7 @@
static int is_port_number(const char *bindpath)
{
while (*bindpath) {
-@@ -458,38 +515,6 @@
+@@ -455,38 +512,6 @@
if (!tcp) {
chmod(path, 0777);
@@ -640,7 +636,7 @@
}
if (!is_initialized) {
-@@ -829,7 +854,7 @@
+@@ -863,7 +888,7 @@
return n;
}
@@ -649,7 +645,7 @@
{
if (destroy) {
zend_hash_destroy(&req->env);
-@@ -869,6 +894,10 @@
+@@ -903,6 +928,10 @@
close(req->fd);
#endif
req->fd = -1;
@@ -660,7 +656,7 @@
}
}
-@@ -916,6 +945,10 @@
+@@ -950,6 +979,10 @@
sa_t sa;
socklen_t len = sizeof(sa);
@@ -671,7 +667,7 @@
FCGI_LOCK(req->listen_socket);
req->fd = accept(listen_socket, (struct
sockaddr *)&sa, &len);
FCGI_UNLOCK(req->listen_socket);
-@@ -951,6 +984,11 @@
+@@ -985,6 +1018,11 @@
break;
#else
if (req->fd >= 0) {
@@ -683,9 +679,9 @@
#if defined(HAVE_SYS_POLL_H) && defined(HAVE_POLL)
struct pollfd fds;
int ret;
-diff -Nru php-5.2.6.vanilla/sapi/cgi/fastcgi.h php-5.2.6.fpm/sapi/cgi/fastcgi.h
---- php-5.2.6.vanilla/sapi/cgi/fastcgi.h 2007-12-31 10:20:16.000000000
+0300
-+++ php-5.2.6.fpm/sapi/cgi/fastcgi.h 2008-05-01 20:42:06.000000000 +0400
+diff -Nru php-5.2.8.vanilla/sapi/cgi/fastcgi.h php-5.2.8.fpm/sapi/cgi/fastcgi.h
+--- php-5.2.8.vanilla/sapi/cgi/fastcgi.h 2008-10-21 20:43:59.000000000
+0400
++++ php-5.2.8.fpm/sapi/cgi/fastcgi.h 2008-12-09 04:02:39.000000000 +0300
@@ -114,6 +114,9 @@
int fcgi_init(void);
void fcgi_shutdown(void);
@@ -705,10 +701,10 @@
#ifdef PHP_WIN32
void fcgi_impersonate(void);
#endif
-diff -Nru php-5.2.6.vanilla/sapi/cgi/fpm/acinclude.m4
php-5.2.6.fpm/sapi/cgi/fpm/acinclude.m4
---- php-5.2.6.vanilla/sapi/cgi/fpm/acinclude.m4 1970-01-01
03:00:00.000000000 +0300
-+++ php-5.2.6.fpm/sapi/cgi/fpm/acinclude.m4 2008-07-21 06:39:38.000000000
+0400
-@@ -0,0 +1,383 @@
+diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/acinclude.m4
php-5.2.8.fpm/sapi/cgi/fpm/acinclude.m4
+--- php-5.2.8.vanilla/sapi/cgi/fpm/acinclude.m4 1970-01-01
03:00:00.000000000 +0300
++++ php-5.2.8.fpm/sapi/cgi/fpm/acinclude.m4 2008-11-16 17:44:51.000000000
+0300
+@@ -0,0 +1,377 @@
+
+AC_DEFUN([AC_FPM_CHECK_FUNC],
+[
@@ -830,7 +826,7 @@
+
+ AC_MSG_CHECKING([for clock_gettime])
+
-+ AC_TRY_COMPILE([ #include <time.h> ], [struct timespec ts;
clock_gettime(CLOCK_MONOTONIC, &ts);], [
++ AC_TRY_LINK([ #include <time.h> ], [struct timespec ts;
clock_gettime(CLOCK_MONOTONIC, &ts);], [
+ have_clock_gettime=yes
+ AC_MSG_RESULT([yes])
+ ], [
@@ -843,7 +839,7 @@
+ SAVED_LIBS="$LIBS"
+ LIBS="$LIBS -lrt"
+
-+ AC_TRY_COMPILE([ #include <time.h> ], [struct timespec ts;
clock_gettime(CLOCK_MONOTONIC, &ts);], [
++ AC_TRY_LINK([ #include <time.h> ], [struct timespec ts;
clock_gettime(CLOCK_MONOTONIC, &ts);], [
+ have_clock_gettime=yes
+ AC_MSG_RESULT([yes])
+ ], [
@@ -1065,18 +1061,12 @@
+ AC_DEFINE_UNQUOTED([PROC_MEM_FILE], "$proc_mem_file",
[/proc/pid/mem interface])
+ fi
+
-+ FPM_TRACE_SRCS=""
-+
+ if test "$have_ptrace" = "yes"; then
-+ FPM_TRACE_SRCS="fpm_trace_ptrace.c"
++ FPM_SOURCES="$FPM_SOURCES fpm_trace.c fpm_trace_ptrace.c"
+ elif test -n "$proc_mem_file"; then
-+ FPM_TRACE_SRCS="fpm_trace_pread.c"
++ FPM_SOURCES="$FPM_SOURCES fpm_trace.c fpm_trace_pread.c"
+ elif test "$have_mach_vm_read" = "yes" ; then
-+ FPM_TRACE_SRCS="fpm_trace_mach.c"
-+ fi
-+
-+ if test -n "$FPM_TRACE_SRCS"; then
-+ FPM_TRACE_SRCS="fpm_trace.c $FPM_TRACE_SRCS"
++ FPM_SOURCES="$FPM_SOURCES fpm_trace.c fpm_trace_mach.c"
+ fi
+
+])
@@ -1092,9 +1082,9 @@
+ AC_MSG_RESULT([no])
+ ])
+])
-diff -Nru php-5.2.6.vanilla/sapi/cgi/fpm/conf/php-fpm.conf.in
php-5.2.6.fpm/sapi/cgi/fpm/conf/php-fpm.conf.in
---- php-5.2.6.vanilla/sapi/cgi/fpm/conf/php-fpm.conf.in 1970-01-01
03:00:00.000000000 +0300
-+++ php-5.2.6.fpm/sapi/cgi/fpm/conf/php-fpm.conf.in 2008-05-23
00:53:15.000000000 +0400
+diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/conf/php-fpm.conf.in
php-5.2.8.fpm/sapi/cgi/fpm/conf/php-fpm.conf.in
+--- php-5.2.8.vanilla/sapi/cgi/fpm/conf/php-fpm.conf.in 1970-01-01
03:00:00.000000000 +0300
++++ php-5.2.8.fpm/sapi/cgi/fpm/conf/php-fpm.conf.in 2008-05-23
01:08:35.000000000 +0400
@@ -0,0 +1,156 @@
+<?xml version="1.0" ?>
+<configuration>
@@ -1252,11 +1242,12 @@
+ </workers>
+
+</configuration>
---- php-5.2.6.fpm/sapi/cgi/fpm/config.m4 2008-09-19 05:22:37.000000000
+0400
-+++ php-5.2.6.fpm/sapi/cgi/fpm/config.m4 2008-09-19 05:22:37.000000000 +0400
-@@ -0,0 +1,118 @@
+diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/config.m4
php-5.2.8.fpm/sapi/cgi/fpm/config.m4
+--- php-5.2.8.vanilla/sapi/cgi/fpm/config.m4 1970-01-01 03:00:00.000000000
+0300
++++ php-5.2.8.fpm/sapi/cgi/fpm/config.m4 2008-12-13 07:21:53.000000000
+0300
+@@ -0,0 +1,141 @@
+
-+FPM_VERSION="0.5.9"
++FPM_VERSION="0.5.10"
+
+PHP_ARG_WITH(fpm-conf, for php-fpm config file path,
+[ --with-fpm-conf=PATH Set the path for php-fpm configuration file
[PREFIX/etc/php-fpm.conf]], \$prefix/etc/php-fpm.conf, no)
@@ -1267,18 +1258,6 @@
+PHP_ARG_WITH(fpm-pid, for php-fpm pid file path,
+[ --with-fpm-pid=PATH Set the path for php-fpm pid file
[PREFIX/logs/php-fpm.pid]], \$prefix/logs/php-fpm.pid, no)
+
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/php-fpm.patch?r1=1.9&r2=1.10&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
