Author: glen Date: Mon Nov 3 17:32:17 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- sed -i -e 's,sapi/cgi,sapi/fpm,g'
---- Files affected:
SOURCES:
php-fpm.patch (1.3 -> 1.4)
---- Diffs:
================================================================
Index: SOURCES/php-fpm.patch
diff -u SOURCES/php-fpm.patch:1.3 SOURCES/php-fpm.patch:1.4
--- SOURCES/php-fpm.patch:1.3 Mon Nov 3 18:16:46 2008
+++ SOURCES/php-fpm.patch Mon Nov 3 18:32:11 2008
@@ -8,8 +8,8 @@
+if test "$PHP_FASTCGI" = "yes" -a "$PHP_FPM" = "yes"; then
+ PHP_CONFIGURE_PART(Running FastCGI Process Manager checks)
-+ sinclude(sapi/cgi/fpm/acinclude.m4)
-+ sinclude(sapi/cgi/fpm/config.m4)
++ sinclude(sapi/fpm/fpm/acinclude.m4)
++ sinclude(sapi/fpm/fpm/config.m4)
+fi
+
divert(3)
@@ -129,9 +129,9 @@
/* Define if system uses EBCDIC */
#undef CHARSET_EBCDIC
-diff -Nru php-5.2.6.vanilla/sapi/cgi/cgi_main.c
php-5.2.6.fpm/sapi/cgi/cgi_main.c
---- php-5.2.6.vanilla/sapi/cgi/cgi_main.c 2008-04-09 13:16:40.000000000
+0400
-+++ php-5.2.6.fpm/sapi/cgi/cgi_main.c 2008-07-22 01:50:58.000000000 +0400
+diff -Nru php-5.2.6.vanilla/sapi/fpm/cgi_main.c
php-5.2.6.fpm/sapi/fpm/cgi_main.c
+--- php-5.2.6.vanilla/sapi/fpm/cgi_main.c 2008-04-09 13:16:40.000000000
+0400
++++ php-5.2.6.fpm/sapi/fpm/cgi_main.c 2008-07-22 01:50:58.000000000 +0400
@@ -55,6 +55,9 @@
#if HAVE_SYS_WAIT_H
#include <sys/wait.h>
@@ -448,9 +448,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.6.vanilla/sapi/fpm/config9.m4
php-5.2.6.fpm/sapi/fpm/config9.m4
+--- php-5.2.6.vanilla/sapi/fpm/config9.m4 2007-07-12 03:20:36.000000000
+0400
++++ php-5.2.6.fpm/sapi/fpm/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)
@@ -496,9 +496,9 @@
;;
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.6.vanilla/sapi/fpm/fastcgi.c php-5.2.6.fpm/sapi/fpm/fastcgi.c
+--- php-5.2.6.vanilla/sapi/fpm/fastcgi.c 2008-04-03 14:24:44.000000000
+0400
++++ php-5.2.6.fpm/sapi/fpm/fastcgi.c 2008-05-15 23:37:01.000000000 +0400
@@ -27,6 +27,11 @@
#include <stdarg.h>
#include <errno.h>
@@ -669,9 +669,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.6.vanilla/sapi/fpm/fastcgi.h php-5.2.6.fpm/sapi/fpm/fastcgi.h
+--- php-5.2.6.vanilla/sapi/fpm/fastcgi.h 2007-12-31 10:20:16.000000000
+0300
++++ php-5.2.6.fpm/sapi/fpm/fastcgi.h 2008-05-01 20:42:06.000000000 +0400
@@ -114,6 +114,9 @@
int fcgi_init(void);
void fcgi_shutdown(void);
@@ -691,9 +691,9 @@
#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
+diff -Nru php-5.2.6.vanilla/sapi/fpm/fpm/acinclude.m4
php-5.2.6.fpm/sapi/fpm/fpm/acinclude.m4
+--- php-5.2.6.vanilla/sapi/fpm/fpm/acinclude.m4 1970-01-01
03:00:00.000000000 +0300
++++ php-5.2.6.fpm/sapi/fpm/fpm/acinclude.m4 2008-07-21 06:39:38.000000000
+0400
@@ -0,0 +1,383 @@
+
+AC_DEFUN([AC_FPM_CHECK_FUNC],
@@ -1078,9 +1078,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.6.vanilla/sapi/fpm/fpm/conf/php-fpm.conf.in
php-5.2.6.fpm/sapi/fpm/fpm/conf/php-fpm.conf.in
+--- php-5.2.6.vanilla/sapi/fpm/fpm/conf/php-fpm.conf.in 1970-01-01
03:00:00.000000000 +0300
++++ php-5.2.6.fpm/sapi/fpm/fpm/conf/php-fpm.conf.in 2008-05-23
00:53:15.000000000 +0400
@@ -0,0 +1,156 @@
+<?xml version="1.0" ?>
+<configuration>
@@ -1238,9 +1238,9 @@
+ </workers>
+
+</configuration>
-diff -Nru php-5.2.6.vanilla/sapi/cgi/fpm/config.m4
php-5.2.6.fpm/sapi/cgi/fpm/config.m4
---- php-5.2.6.vanilla/sapi/cgi/fpm/config.m4 1970-01-01 03:00:00.000000000
+0300
-+++ php-5.2.6.fpm/sapi/cgi/fpm/config.m4 2008-09-19 05:22:37.000000000
+0400
+diff -Nru php-5.2.6.vanilla/sapi/fpm/fpm/config.m4
php-5.2.6.fpm/sapi/fpm/fpm/config.m4
+--- php-5.2.6.vanilla/sapi/fpm/fpm/config.m4 1970-01-01 03:00:00.000000000
+0300
++++ php-5.2.6.fpm/sapi/fpm/fpm/config.m4 2008-09-19 05:22:37.000000000
+0400
@@ -0,0 +1,145 @@
+
+FPM_VERSION="0.5.9"
@@ -1291,7 +1291,7 @@
+FPM_CFLAGS="$LIBEVENT_CFLAGS $LIBXML_CFLAGS $JUDY_CFLAGS"
+
+dnl FPM_CFLAGS="$FPM_CFLAGS -DJUDYERROR_NOTEST" # for Judy
-+FPM_CFLAGS="$FPM_CFLAGS -I$abs_srcdir/sapi/cgi" # for fastcgi.h
++FPM_CFLAGS="$FPM_CFLAGS -I$abs_srcdir/sapi/fpm" # for fastcgi.h
+
+if test "$ICC" = "yes" ; then
+ FPM_ADD_CFLAGS="-Wall -wd279,310,869,810,981"
@@ -1305,11 +1305,11 @@
+
+FPM_CFLAGS="$FPM_ADD_CFLAGS $FPM_CFLAGS"
+
-+PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/cgi/fpm/Makefile.frag)
++PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/fpm/fpm/Makefile.frag)
+
-+PHP_ADD_SOURCES(sapi/cgi/fpm, $FPM_SOURCES, $FPM_CFLAGS, sapi)
++PHP_ADD_SOURCES(sapi/fpm/fpm, $FPM_SOURCES, $FPM_CFLAGS, sapi)
+
-+PHP_ADD_BUILD_DIR(sapi/cgi/fpm)
++PHP_ADD_BUILD_DIR(sapi/fpm/fpm)
+
+install_fpm="install-fpm"
+
@@ -1384,12 +1384,12 @@
+PHP_SUBST_OLD(php_fpm_group)
+PHP_SUBST_OLD(FPM_VERSION)
+
-+PHP_OUTPUT(sapi/cgi/fpm/fpm_autoconf.h)
-+PHP_OUTPUT(sapi/cgi/fpm/php-fpm.conf:sapi/cgi/fpm/conf/php-fpm.conf.in)
-+PHP_OUTPUT(sapi/cgi/fpm/php-fpm:sapi/cgi/fpm/init.d/php-fpm.in)
-diff -Nru php-5.2.6.vanilla/sapi/cgi/fpm/fpm_arrays.h
php-5.2.6.fpm/sapi/cgi/fpm/fpm_arrays.h
---- php-5.2.6.vanilla/sapi/cgi/fpm/fpm_arrays.h 1970-01-01
03:00:00.000000000 +0300
-+++ php-5.2.6.fpm/sapi/cgi/fpm/fpm_arrays.h 2008-05-24 21:38:47.000000000
+0400
++PHP_OUTPUT(sapi/fpm/fpm/fpm_autoconf.h)
++PHP_OUTPUT(sapi/fpm/fpm/php-fpm.conf:sapi/fpm/fpm/conf/php-fpm.conf.in)
++PHP_OUTPUT(sapi/fpm/fpm/php-fpm:sapi/fpm/fpm/init.d/php-fpm.in)
+diff -Nru php-5.2.6.vanilla/sapi/fpm/fpm/fpm_arrays.h
php-5.2.6.fpm/sapi/fpm/fpm/fpm_arrays.h
+--- php-5.2.6.vanilla/sapi/fpm/fpm/fpm_arrays.h 1970-01-01
03:00:00.000000000 +0300
++++ php-5.2.6.fpm/sapi/fpm/fpm/fpm_arrays.h 2008-05-24 21:38:47.000000000
+0400
@@ -0,0 +1,110 @@
+
+ /* $Id$ */
@@ -1501,9 +1501,9 @@
+}
+
+#endif
-diff -Nru php-5.2.6.vanilla/sapi/cgi/fpm/fpm_atomic.h
php-5.2.6.fpm/sapi/cgi/fpm/fpm_atomic.h
---- php-5.2.6.vanilla/sapi/cgi/fpm/fpm_atomic.h 1970-01-01
03:00:00.000000000 +0300
-+++ php-5.2.6.fpm/sapi/cgi/fpm/fpm_atomic.h 2008-09-19 03:34:11.000000000
+0400
+diff -Nru php-5.2.6.vanilla/sapi/fpm/fpm/fpm_atomic.h
php-5.2.6.fpm/sapi/fpm/fpm/fpm_atomic.h
+--- php-5.2.6.vanilla/sapi/fpm/fpm/fpm_atomic.h 1970-01-01
03:00:00.000000000 +0300
++++ php-5.2.6.fpm/sapi/fpm/fpm/fpm_atomic.h 2008-09-19 03:34:11.000000000
+0400
@@ -0,0 +1,85 @@
+
+ /* $Id$ */
@@ -1590,9 +1590,9 @@
+
+#endif
+
-diff -Nru php-5.2.6.vanilla/sapi/cgi/fpm/fpm_autoconf.h.in
php-5.2.6.fpm/sapi/cgi/fpm/fpm_autoconf.h.in
---- php-5.2.6.vanilla/sapi/cgi/fpm/fpm_autoconf.h.in 1970-01-01
03:00:00.000000000 +0300
-+++ php-5.2.6.fpm/sapi/cgi/fpm/fpm_autoconf.h.in 2008-05-24
21:38:47.000000000 +0400
+diff -Nru php-5.2.6.vanilla/sapi/fpm/fpm/fpm_autoconf.h.in
php-5.2.6.fpm/sapi/fpm/fpm/fpm_autoconf.h.in
+--- php-5.2.6.vanilla/sapi/fpm/fpm/fpm_autoconf.h.in 1970-01-01
03:00:00.000000000 +0300
++++ php-5.2.6.fpm/sapi/fpm/fpm/fpm_autoconf.h.in 2008-05-24
21:38:47.000000000 +0400
@@ -0,0 +1,9 @@
+
+ /* $Id$ */
@@ -1603,9 +1603,9 @@
+#define PHP_FPM_LOG_PATH "@php_fpm_log_path@"
+#define PHP_FPM_PID_PATH "@php_fpm_pid_path@"
+
-diff -Nru php-5.2.6.vanilla/sapi/cgi/fpm/fpm.c php-5.2.6.fpm/sapi/cgi/fpm/fpm.c
---- php-5.2.6.vanilla/sapi/cgi/fpm/fpm.c 1970-01-01 03:00:00.000000000
+0300
-+++ php-5.2.6.fpm/sapi/cgi/fpm/fpm.c 2008-07-20 20:38:31.000000000 +0400
+diff -Nru php-5.2.6.vanilla/sapi/fpm/fpm/fpm.c php-5.2.6.fpm/sapi/fpm/fpm/fpm.c
+--- php-5.2.6.vanilla/sapi/fpm/fpm/fpm.c 1970-01-01 03:00:00.000000000
+0300
++++ php-5.2.6.fpm/sapi/fpm/fpm/fpm.c 2008-07-20 20:38:31.000000000 +0400
@@ -0,0 +1,84 @@
+
+ /* $Id$ */
@@ -1691,9 +1691,9 @@
+ return fpm_globals.listening_socket;
+}
+
-diff -Nru php-5.2.6.vanilla/sapi/cgi/fpm/fpm_children.c
php-5.2.6.fpm/sapi/cgi/fpm/fpm_children.c
---- php-5.2.6.vanilla/sapi/cgi/fpm/fpm_children.c 1970-01-01
03:00:00.000000000 +0300
-+++ php-5.2.6.fpm/sapi/cgi/fpm/fpm_children.c 2008-08-26 19:09:15.000000000
+0400
+diff -Nru php-5.2.6.vanilla/sapi/fpm/fpm/fpm_children.c
php-5.2.6.fpm/sapi/fpm/fpm/fpm_children.c
+--- php-5.2.6.vanilla/sapi/fpm/fpm/fpm_children.c 1970-01-01
03:00:00.000000000 +0300
++++ php-5.2.6.fpm/sapi/fpm/fpm/fpm_children.c 2008-08-26 19:09:15.000000000
+0400
@@ -0,0 +1,383 @@
+
+ /* $Id$ */
@@ -2078,9 +2078,9 @@
+ return 0;
+}
+
-diff -Nru php-5.2.6.vanilla/sapi/cgi/fpm/fpm_children.h
php-5.2.6.fpm/sapi/cgi/fpm/fpm_children.h
---- php-5.2.6.vanilla/sapi/cgi/fpm/fpm_children.h 1970-01-01
03:00:00.000000000 +0300
-+++ php-5.2.6.fpm/sapi/cgi/fpm/fpm_children.h 2008-05-24 21:38:47.000000000
+0400
+diff -Nru php-5.2.6.vanilla/sapi/fpm/fpm/fpm_children.h
php-5.2.6.fpm/sapi/fpm/fpm/fpm_children.h
+--- php-5.2.6.vanilla/sapi/fpm/fpm/fpm_children.h 1970-01-01
03:00:00.000000000 +0300
++++ php-5.2.6.fpm/sapi/fpm/fpm/fpm_children.h 2008-05-24 21:38:47.000000000
+0400
@@ -0,0 +1,33 @@
+
+ /* $Id$ */
@@ -2115,9 +2115,9 @@
+};
+
+#endif
-diff -Nru php-5.2.6.vanilla/sapi/cgi/fpm/fpm_cleanup.c
php-5.2.6.fpm/sapi/cgi/fpm/fpm_cleanup.c
---- php-5.2.6.vanilla/sapi/cgi/fpm/fpm_cleanup.c 1970-01-01
03:00:00.000000000 +0300
-+++ php-5.2.6.fpm/sapi/cgi/fpm/fpm_cleanup.c 2008-05-24 21:38:47.000000000
+0400
+diff -Nru php-5.2.6.vanilla/sapi/fpm/fpm/fpm_cleanup.c
php-5.2.6.fpm/sapi/fpm/fpm/fpm_cleanup.c
+--- php-5.2.6.vanilla/sapi/fpm/fpm/fpm_cleanup.c 1970-01-01
03:00:00.000000000 +0300
++++ php-5.2.6.fpm/sapi/fpm/fpm/fpm_cleanup.c 2008-05-24 21:38:47.000000000
+0400
@@ -0,0 +1,51 @@
+
+ /* $Id$ */
@@ -2170,9 +2170,9 @@
+ fpm_array_free(&cleanups);
+}
+
-diff -Nru php-5.2.6.vanilla/sapi/cgi/fpm/fpm_cleanup.h
php-5.2.6.fpm/sapi/cgi/fpm/fpm_cleanup.h
---- php-5.2.6.vanilla/sapi/cgi/fpm/fpm_cleanup.h 1970-01-01
03:00:00.000000000 +0300
-+++ php-5.2.6.fpm/sapi/cgi/fpm/fpm_cleanup.h 2008-05-24 21:38:47.000000000
+0400
+diff -Nru php-5.2.6.vanilla/sapi/fpm/fpm/fpm_cleanup.h
php-5.2.6.fpm/sapi/fpm/fpm/fpm_cleanup.h
+--- php-5.2.6.vanilla/sapi/fpm/fpm/fpm_cleanup.h 1970-01-01
03:00:00.000000000 +0300
++++ php-5.2.6.fpm/sapi/fpm/fpm/fpm_cleanup.h 2008-05-24 21:38:47.000000000
+0400
@@ -0,0 +1,21 @@
+
+ /* $Id$ */
@@ -2195,9 +2195,9 @@
+
+#endif
+
-diff -Nru php-5.2.6.vanilla/sapi/cgi/fpm/fpm_clock.c
php-5.2.6.fpm/sapi/cgi/fpm/fpm_clock.c
---- php-5.2.6.vanilla/sapi/cgi/fpm/fpm_clock.c 1970-01-01 03:00:00.000000000
+0300
-+++ php-5.2.6.fpm/sapi/cgi/fpm/fpm_clock.c 2008-09-19 03:19:59.000000000
+0400
+diff -Nru php-5.2.6.vanilla/sapi/fpm/fpm/fpm_clock.c
php-5.2.6.fpm/sapi/fpm/fpm/fpm_clock.c
+--- php-5.2.6.vanilla/sapi/fpm/fpm/fpm_clock.c 1970-01-01 03:00:00.000000000
+0300
++++ php-5.2.6.fpm/sapi/fpm/fpm/fpm_clock.c 2008-09-19 03:19:59.000000000
+0400
@@ -0,0 +1,115 @@
+
+ /* $Id$ */
@@ -2314,9 +2314,9 @@
+}
+
+#endif
-diff -Nru php-5.2.6.vanilla/sapi/cgi/fpm/fpm_clock.h
php-5.2.6.fpm/sapi/cgi/fpm/fpm_clock.h
---- php-5.2.6.vanilla/sapi/cgi/fpm/fpm_clock.h 1970-01-01 03:00:00.000000000
+0300
-+++ php-5.2.6.fpm/sapi/cgi/fpm/fpm_clock.h 2008-05-24 21:38:47.000000000
+0400
+diff -Nru php-5.2.6.vanilla/sapi/fpm/fpm/fpm_clock.h
php-5.2.6.fpm/sapi/fpm/fpm/fpm_clock.h
+--- php-5.2.6.vanilla/sapi/fpm/fpm/fpm_clock.h 1970-01-01 03:00:00.000000000
+0300
++++ php-5.2.6.fpm/sapi/fpm/fpm/fpm_clock.h 2008-05-24 21:38:47.000000000
+0400
@@ -0,0 +1,13 @@
+
+ /* $Id$ */
@@ -2331,9 +2331,9 @@
+int fpm_clock_get(struct timeval *tv);
+
+#endif
-diff -Nru php-5.2.6.vanilla/sapi/cgi/fpm/fpm_conf.c
php-5.2.6.fpm/sapi/cgi/fpm/fpm_conf.c
---- php-5.2.6.vanilla/sapi/cgi/fpm/fpm_conf.c 1970-01-01 03:00:00.000000000
+0300
-+++ php-5.2.6.fpm/sapi/cgi/fpm/fpm_conf.c 2008-09-19 04:54:15.000000000
+0400
+diff -Nru php-5.2.6.vanilla/sapi/fpm/fpm/fpm_conf.c
php-5.2.6.fpm/sapi/fpm/fpm/fpm_conf.c
+--- php-5.2.6.vanilla/sapi/fpm/fpm/fpm_conf.c 1970-01-01 03:00:00.000000000
+0300
++++ php-5.2.6.fpm/sapi/fpm/fpm/fpm_conf.c 2008-09-19 04:54:15.000000000
+0400
@@ -0,0 +1,530 @@
+
+ /* $Id$ */
@@ -2865,9 +2865,9 @@
+
+ return 0;
+}
-diff -Nru php-5.2.6.vanilla/sapi/cgi/fpm/fpm_conf.h
php-5.2.6.fpm/sapi/cgi/fpm/fpm_conf.h
---- php-5.2.6.vanilla/sapi/cgi/fpm/fpm_conf.h 1970-01-01 03:00:00.000000000
+0300
-+++ php-5.2.6.fpm/sapi/cgi/fpm/fpm_conf.h 2008-08-26 19:09:15.000000000
+0400
+diff -Nru php-5.2.6.vanilla/sapi/fpm/fpm/fpm_conf.h
php-5.2.6.fpm/sapi/fpm/fpm/fpm_conf.h
+--- php-5.2.6.vanilla/sapi/fpm/fpm/fpm_conf.h 1970-01-01 03:00:00.000000000
+0300
++++ php-5.2.6.fpm/sapi/fpm/fpm/fpm_conf.h 2008-08-26 19:09:15.000000000
+0400
@@ -0,0 +1,73 @@
+
+ /* $Id$ */
@@ -2942,9 +2942,9 @@
+
+#endif
+
-diff -Nru php-5.2.6.vanilla/sapi/cgi/fpm/fpm_config.h
php-5.2.6.fpm/sapi/cgi/fpm/fpm_config.h
---- php-5.2.6.vanilla/sapi/cgi/fpm/fpm_config.h 1970-01-01
03:00:00.000000000 +0300
-+++ php-5.2.6.fpm/sapi/cgi/fpm/fpm_config.h 2008-05-25 04:30:43.000000000
+0400
+diff -Nru php-5.2.6.vanilla/sapi/fpm/fpm/fpm_config.h
php-5.2.6.fpm/sapi/fpm/fpm/fpm_config.h
+--- php-5.2.6.vanilla/sapi/fpm/fpm/fpm_config.h 1970-01-01
03:00:00.000000000 +0300
++++ php-5.2.6.fpm/sapi/fpm/fpm/fpm_config.h 2008-05-25 04:30:43.000000000
+0400
@@ -0,0 +1,39 @@
+
+ /* $Id$ */
@@ -2985,9 +2985,9 @@
+#define HAVE_FPM_TRACE 0
+#endif
+
-diff -Nru php-5.2.6.vanilla/sapi/cgi/fpm/fpm_env.c
php-5.2.6.fpm/sapi/cgi/fpm/fpm_env.c
---- php-5.2.6.vanilla/sapi/cgi/fpm/fpm_env.c 1970-01-01 03:00:00.000000000
+0300
-+++ php-5.2.6.fpm/sapi/cgi/fpm/fpm_env.c 2008-09-19 03:19:59.000000000
+0400
+diff -Nru php-5.2.6.vanilla/sapi/fpm/fpm/fpm_env.c
php-5.2.6.fpm/sapi/fpm/fpm/fpm_env.c
+--- php-5.2.6.vanilla/sapi/fpm/fpm/fpm_env.c 1970-01-01 03:00:00.000000000
+0300
++++ php-5.2.6.fpm/sapi/fpm/fpm/fpm_env.c 2008-09-19 03:19:59.000000000
+0400
@@ -0,0 +1,125 @@
+
+ /* $Id$ */
@@ -3114,9 +3114,9 @@
+
+ return 0;
+}
-diff -Nru php-5.2.6.vanilla/sapi/cgi/fpm/fpm_env.h
php-5.2.6.fpm/sapi/cgi/fpm/fpm_env.h
---- php-5.2.6.vanilla/sapi/cgi/fpm/fpm_env.h 1970-01-01 03:00:00.000000000
+0300
-+++ php-5.2.6.fpm/sapi/cgi/fpm/fpm_env.h 2008-09-19 03:19:59.000000000
+0400
+diff -Nru php-5.2.6.vanilla/sapi/fpm/fpm/fpm_env.h
php-5.2.6.fpm/sapi/fpm/fpm/fpm_env.h
+--- php-5.2.6.vanilla/sapi/fpm/fpm/fpm_env.h 1970-01-01 03:00:00.000000000
+0300
++++ php-5.2.6.fpm/sapi/fpm/fpm/fpm_env.h 2008-09-19 03:19:59.000000000
+0400
@@ -0,0 +1,24 @@
+
+ /* $Id$ */
@@ -3142,9 +3142,9 @@
+
+#endif
+
-diff -Nru php-5.2.6.vanilla/sapi/cgi/fpm/fpm_events.c
php-5.2.6.fpm/sapi/cgi/fpm/fpm_events.c
---- php-5.2.6.vanilla/sapi/cgi/fpm/fpm_events.c 1970-01-01
03:00:00.000000000 +0300
-+++ php-5.2.6.fpm/sapi/cgi/fpm/fpm_events.c 2008-08-26 19:09:15.000000000
+0400
+diff -Nru php-5.2.6.vanilla/sapi/fpm/fpm/fpm_events.c
php-5.2.6.fpm/sapi/fpm/fpm/fpm_events.c
+--- php-5.2.6.vanilla/sapi/fpm/fpm/fpm_events.c 1970-01-01
03:00:00.000000000 +0300
++++ php-5.2.6.fpm/sapi/fpm/fpm/fpm_events.c 2008-08-26 19:09:15.000000000
+0400
@@ -0,0 +1,133 @@
+
+ /* $Id$ */
@@ -3279,9 +3279,9 @@
+ (*ev->ev_callback)( (int) ev->ev_fd, (short) ev->ev_res, ev->ev_arg);
+}
+
-diff -Nru php-5.2.6.vanilla/sapi/cgi/fpm/fpm_events.h
php-5.2.6.fpm/sapi/cgi/fpm/fpm_events.h
---- php-5.2.6.vanilla/sapi/cgi/fpm/fpm_events.h 1970-01-01
03:00:00.000000000 +0300
-+++ php-5.2.6.fpm/sapi/cgi/fpm/fpm_events.h 2008-05-24 21:38:47.000000000
+0400
+diff -Nru php-5.2.6.vanilla/sapi/fpm/fpm/fpm_events.h
php-5.2.6.fpm/sapi/fpm/fpm/fpm_events.h
+--- php-5.2.6.vanilla/sapi/fpm/fpm/fpm_events.h 1970-01-01
03:00:00.000000000 +0300
++++ php-5.2.6.fpm/sapi/fpm/fpm/fpm_events.h 2008-05-24 21:38:47.000000000
+0400
@@ -0,0 +1,16 @@
+
+ /* $Id$ */
@@ -3299,9 +3299,9 @@
+
+
+#endif
-diff -Nru php-5.2.6.vanilla/sapi/cgi/fpm/fpm.h php-5.2.6.fpm/sapi/cgi/fpm/fpm.h
---- php-5.2.6.vanilla/sapi/cgi/fpm/fpm.h 1970-01-01 03:00:00.000000000
+0300
-+++ php-5.2.6.fpm/sapi/cgi/fpm/fpm.h 2008-05-24 21:38:47.000000000 +0400
+diff -Nru php-5.2.6.vanilla/sapi/fpm/fpm/fpm.h php-5.2.6.fpm/sapi/fpm/fpm/fpm.h
+--- php-5.2.6.vanilla/sapi/fpm/fpm/fpm.h 1970-01-01 03:00:00.000000000
+0300
++++ php-5.2.6.fpm/sapi/fpm/fpm/fpm.h 2008-05-24 21:38:47.000000000 +0400
@@ -0,0 +1,30 @@
+
+ /* $Id$ */
@@ -3333,9 +3333,9 @@
+extern int fpm;
+
+#endif
-diff -Nru php-5.2.6.vanilla/sapi/cgi/fpm/fpm_php.c
php-5.2.6.fpm/sapi/cgi/fpm/fpm_php.c
---- php-5.2.6.vanilla/sapi/cgi/fpm/fpm_php.c 1970-01-01 03:00:00.000000000
+0300
-+++ php-5.2.6.fpm/sapi/cgi/fpm/fpm_php.c 2008-07-20 20:16:28.000000000
+0400
+diff -Nru php-5.2.6.vanilla/sapi/fpm/fpm/fpm_php.c
php-5.2.6.fpm/sapi/fpm/fpm/fpm_php.c
+--- php-5.2.6.vanilla/sapi/fpm/fpm/fpm_php.c 1970-01-01 03:00:00.000000000
+0300
++++ php-5.2.6.fpm/sapi/fpm/fpm/fpm_php.c 2008-07-20 20:16:28.000000000
+0400
@@ -0,0 +1,171 @@
+
+ /* $Id$ */
@@ -3508,9 +3508,9 @@
+
+ return 0;
+}
-diff -Nru php-5.2.6.vanilla/sapi/cgi/fpm/fpm_php.h
php-5.2.6.fpm/sapi/cgi/fpm/fpm_php.h
---- php-5.2.6.vanilla/sapi/cgi/fpm/fpm_php.h 1970-01-01 03:00:00.000000000
+0300
-+++ php-5.2.6.fpm/sapi/cgi/fpm/fpm_php.h 2008-05-24 21:38:47.000000000
+0400
+diff -Nru php-5.2.6.vanilla/sapi/fpm/fpm/fpm_php.h
php-5.2.6.fpm/sapi/fpm/fpm/fpm_php.h
+--- php-5.2.6.vanilla/sapi/fpm/fpm/fpm_php.h 1970-01-01 03:00:00.000000000
+0300
++++ php-5.2.6.fpm/sapi/fpm/fpm/fpm_php.h 2008-05-24 21:38:47.000000000
+0400
@@ -0,0 +1,20 @@
+
+ /* $Id$ */
@@ -3532,9 +3532,9 @@
+
+#endif
+
-diff -Nru php-5.2.6.vanilla/sapi/cgi/fpm/fpm_php_trace.c
php-5.2.6.fpm/sapi/cgi/fpm/fpm_php_trace.c
---- php-5.2.6.vanilla/sapi/cgi/fpm/fpm_php_trace.c 1970-01-01
03:00:00.000000000 +0300
-+++ php-5.2.6.fpm/sapi/cgi/fpm/fpm_php_trace.c 2008-08-26 19:09:15.000000000
+0400
+diff -Nru php-5.2.6.vanilla/sapi/fpm/fpm/fpm_php_trace.c
php-5.2.6.fpm/sapi/fpm/fpm/fpm_php_trace.c
+--- php-5.2.6.vanilla/sapi/fpm/fpm/fpm_php_trace.c 1970-01-01
03:00:00.000000000 +0300
++++ php-5.2.6.fpm/sapi/fpm/fpm/fpm_php_trace.c 2008-08-26 19:09:15.000000000
+0400
@@ -0,0 +1,170 @@
+
+ /* $Id$ */
@@ -3706,9 +3706,9 @@
+
+#endif
+
-diff -Nru php-5.2.6.vanilla/sapi/cgi/fpm/fpm_php_trace.h
php-5.2.6.fpm/sapi/cgi/fpm/fpm_php_trace.h
---- php-5.2.6.vanilla/sapi/cgi/fpm/fpm_php_trace.h 1970-01-01
03:00:00.000000000 +0300
-+++ php-5.2.6.fpm/sapi/cgi/fpm/fpm_php_trace.h 2008-05-24 21:38:47.000000000
+0400
+diff -Nru php-5.2.6.vanilla/sapi/fpm/fpm/fpm_php_trace.h
php-5.2.6.fpm/sapi/fpm/fpm/fpm_php_trace.h
+--- php-5.2.6.vanilla/sapi/fpm/fpm/fpm_php_trace.h 1970-01-01
03:00:00.000000000 +0300
++++ php-5.2.6.fpm/sapi/fpm/fpm/fpm_php_trace.h 2008-05-24 21:38:47.000000000
+0400
@@ -0,0 +1,13 @@
+
+ /* $Id$ */
@@ -3723,9 +3723,9 @@
+
+#endif
+
-diff -Nru php-5.2.6.vanilla/sapi/cgi/fpm/fpm_process_ctl.c
php-5.2.6.fpm/sapi/cgi/fpm/fpm_process_ctl.c
---- php-5.2.6.vanilla/sapi/cgi/fpm/fpm_process_ctl.c 1970-01-01
03:00:00.000000000 +0300
-+++ php-5.2.6.fpm/sapi/cgi/fpm/fpm_process_ctl.c 2008-07-21
17:13:44.000000000 +0400
+diff -Nru php-5.2.6.vanilla/sapi/fpm/fpm/fpm_process_ctl.c
php-5.2.6.fpm/sapi/fpm/fpm/fpm_process_ctl.c
+--- php-5.2.6.vanilla/sapi/fpm/fpm/fpm_process_ctl.c 1970-01-01
03:00:00.000000000 +0300
++++ php-5.2.6.fpm/sapi/fpm/fpm/fpm_process_ctl.c 2008-07-21
17:13:44.000000000 +0400
@@ -0,0 +1,352 @@
+
+ /* $Id$ */
@@ -4079,9 +4079,9 @@
+ evtimer_add(&heartbeat, &tv);
+}
+
-diff -Nru php-5.2.6.vanilla/sapi/cgi/fpm/fpm_process_ctl.h
php-5.2.6.fpm/sapi/cgi/fpm/fpm_process_ctl.h
---- php-5.2.6.vanilla/sapi/cgi/fpm/fpm_process_ctl.h 1970-01-01
03:00:00.000000000 +0300
-+++ php-5.2.6.fpm/sapi/cgi/fpm/fpm_process_ctl.h 2008-07-21
01:33:10.000000000 +0400
+diff -Nru php-5.2.6.vanilla/sapi/fpm/fpm/fpm_process_ctl.h
php-5.2.6.fpm/sapi/fpm/fpm/fpm_process_ctl.h
+--- php-5.2.6.vanilla/sapi/fpm/fpm/fpm_process_ctl.h 1970-01-01
03:00:00.000000000 +0300
++++ php-5.2.6.fpm/sapi/fpm/fpm/fpm_process_ctl.h 2008-07-21
01:33:10.000000000 +0400
@@ -0,0 +1,39 @@
+
+ /* $Id$ */
@@ -4122,9 +4122,9 @@
+
+#endif
+
-diff -Nru php-5.2.6.vanilla/sapi/cgi/fpm/fpm_request.c
php-5.2.6.fpm/sapi/cgi/fpm/fpm_request.c
---- php-5.2.6.vanilla/sapi/cgi/fpm/fpm_request.c 1970-01-01
03:00:00.000000000 +0300
-+++ php-5.2.6.fpm/sapi/cgi/fpm/fpm_request.c 2008-09-01 03:34:36.000000000
+0400
+diff -Nru php-5.2.6.vanilla/sapi/fpm/fpm/fpm_request.c
php-5.2.6.fpm/sapi/fpm/fpm/fpm_request.c
+--- php-5.2.6.vanilla/sapi/fpm/fpm/fpm_request.c 1970-01-01
03:00:00.000000000 +0300
++++ php-5.2.6.fpm/sapi/fpm/fpm/fpm_request.c 2008-09-01 03:34:36.000000000
+0400
@@ -0,0 +1,163 @@
+
+ /* $Id$ */
@@ -4289,9 +4289,9 @@
+
+}
+
-diff -Nru php-5.2.6.vanilla/sapi/cgi/fpm/fpm_request.h
php-5.2.6.fpm/sapi/cgi/fpm/fpm_request.h
---- php-5.2.6.vanilla/sapi/cgi/fpm/fpm_request.h 1970-01-01
03:00:00.000000000 +0300
-+++ php-5.2.6.fpm/sapi/cgi/fpm/fpm_request.h 2008-07-20 05:47:16.000000000
+0400
+diff -Nru php-5.2.6.vanilla/sapi/fpm/fpm/fpm_request.h
php-5.2.6.fpm/sapi/fpm/fpm/fpm_request.h
+--- php-5.2.6.vanilla/sapi/fpm/fpm/fpm_request.h 1970-01-01
03:00:00.000000000 +0300
++++ php-5.2.6.fpm/sapi/fpm/fpm/fpm_request.h 2008-07-20 05:47:16.000000000
+0400
@@ -0,0 +1,27 @@
+
+ /* $Id$ */
@@ -4320,9 +4320,9 @@
+};
+
+#endif
-diff -Nru php-5.2.6.vanilla/sapi/cgi/fpm/fpm_shm.c
php-5.2.6.fpm/sapi/cgi/fpm/fpm_shm.c
---- php-5.2.6.vanilla/sapi/cgi/fpm/fpm_shm.c 1970-01-01 03:00:00.000000000
+0300
-+++ php-5.2.6.fpm/sapi/cgi/fpm/fpm_shm.c 2008-05-24 21:38:47.000000000
+0400
+diff -Nru php-5.2.6.vanilla/sapi/fpm/fpm/fpm_shm.c
php-5.2.6.fpm/sapi/fpm/fpm/fpm_shm.c
+--- php-5.2.6.vanilla/sapi/fpm/fpm/fpm_shm.c 1970-01-01 03:00:00.000000000
+0300
++++ php-5.2.6.fpm/sapi/fpm/fpm/fpm_shm.c 2008-05-24 21:38:47.000000000
+0400
@@ -0,0 +1,100 @@
+
+ /* $Id$ */
@@ -4424,9 +4424,9 @@
+ return ret;
+}
+
-diff -Nru php-5.2.6.vanilla/sapi/cgi/fpm/fpm_shm.h
php-5.2.6.fpm/sapi/cgi/fpm/fpm_shm.h
---- php-5.2.6.vanilla/sapi/cgi/fpm/fpm_shm.h 1970-01-01 03:00:00.000000000
+0300
-+++ php-5.2.6.fpm/sapi/cgi/fpm/fpm_shm.h 2008-05-24 21:38:47.000000000
+0400
+diff -Nru php-5.2.6.vanilla/sapi/fpm/fpm/fpm_shm.h
php-5.2.6.fpm/sapi/fpm/fpm/fpm_shm.h
+--- php-5.2.6.vanilla/sapi/fpm/fpm/fpm_shm.h 1970-01-01 03:00:00.000000000
+0300
++++ php-5.2.6.fpm/sapi/fpm/fpm/fpm_shm.h 2008-05-24 21:38:47.000000000
+0400
@@ -0,0 +1,22 @@
+
+ /* $Id$ */
@@ -4450,9 +4450,9 @@
+
+#endif
+
-diff -Nru php-5.2.6.vanilla/sapi/cgi/fpm/fpm_shm_slots.c
php-5.2.6.fpm/sapi/cgi/fpm/fpm_shm_slots.c
---- php-5.2.6.vanilla/sapi/cgi/fpm/fpm_shm_slots.c 1970-01-01
03:00:00.000000000 +0300
-+++ php-5.2.6.fpm/sapi/cgi/fpm/fpm_shm_slots.c 2008-05-24 21:38:47.000000000
+0400
+diff -Nru php-5.2.6.vanilla/sapi/fpm/fpm/fpm_shm_slots.c
php-5.2.6.fpm/sapi/fpm/fpm/fpm_shm_slots.c
+--- php-5.2.6.vanilla/sapi/fpm/fpm/fpm_shm_slots.c 1970-01-01
03:00:00.000000000 +0300
++++ php-5.2.6.fpm/sapi/fpm/fpm/fpm_shm_slots.c 2008-05-24 21:38:47.000000000
+0400
@@ -0,0 +1,127 @@
+
+ /* $Id$ */
@@ -4581,9 +4581,9 @@
+ s->lock = 0;
+}
+
-diff -Nru php-5.2.6.vanilla/sapi/cgi/fpm/fpm_shm_slots.h
php-5.2.6.fpm/sapi/cgi/fpm/fpm_shm_slots.h
---- php-5.2.6.vanilla/sapi/cgi/fpm/fpm_shm_slots.h 1970-01-01
03:00:00.000000000 +0300
-+++ php-5.2.6.fpm/sapi/cgi/fpm/fpm_shm_slots.h 2008-05-24 21:38:47.000000000
+0400
+diff -Nru php-5.2.6.vanilla/sapi/fpm/fpm/fpm_shm_slots.h
php-5.2.6.fpm/sapi/fpm/fpm/fpm_shm_slots.h
+--- php-5.2.6.vanilla/sapi/fpm/fpm/fpm_shm_slots.h 1970-01-01
03:00:00.000000000 +0300
++++ php-5.2.6.fpm/sapi/fpm/fpm/fpm_shm_slots.h 2008-05-24 21:38:47.000000000
+0400
@@ -0,0 +1,43 @@
+
+ /* $Id$ */
@@ -4628,9 +4628,9 @@
+
+#endif
+
-diff -Nru php-5.2.6.vanilla/sapi/cgi/fpm/fpm_signals.c
php-5.2.6.fpm/sapi/cgi/fpm/fpm_signals.c
---- php-5.2.6.vanilla/sapi/cgi/fpm/fpm_signals.c 1970-01-01
03:00:00.000000000 +0300
-+++ php-5.2.6.fpm/sapi/cgi/fpm/fpm_signals.c 2008-08-26 19:09:15.000000000
+0400
+diff -Nru php-5.2.6.vanilla/sapi/fpm/fpm/fpm_signals.c
php-5.2.6.fpm/sapi/fpm/fpm/fpm_signals.c
+--- php-5.2.6.vanilla/sapi/fpm/fpm/fpm_signals.c 1970-01-01
03:00:00.000000000 +0300
++++ php-5.2.6.fpm/sapi/fpm/fpm/fpm_signals.c 2008-08-26 19:09:15.000000000
+0400
@@ -0,0 +1,252 @@
+
+ /* $Id$ */
@@ -4884,9 +4884,9 @@
+{
+ return sp[0];
+}
-diff -Nru php-5.2.6.vanilla/sapi/cgi/fpm/fpm_signals.h
php-5.2.6.fpm/sapi/cgi/fpm/fpm_signals.h
---- php-5.2.6.vanilla/sapi/cgi/fpm/fpm_signals.h 1970-01-01
03:00:00.000000000 +0300
-+++ php-5.2.6.fpm/sapi/cgi/fpm/fpm_signals.h 2008-05-24 21:38:47.000000000
+0400
+diff -Nru php-5.2.6.vanilla/sapi/fpm/fpm/fpm_signals.h
php-5.2.6.fpm/sapi/fpm/fpm/fpm_signals.h
+--- php-5.2.6.vanilla/sapi/fpm/fpm/fpm_signals.h 1970-01-01
03:00:00.000000000 +0300
++++ php-5.2.6.fpm/sapi/fpm/fpm/fpm_signals.h 2008-05-24 21:38:47.000000000
+0400
@@ -0,0 +1,16 @@
+
+ /* $Id$ */
@@ -4904,9 +4904,9 @@
+extern const char *fpm_signal_names[NSIG + 1];
+
+#endif
-diff -Nru php-5.2.6.vanilla/sapi/cgi/fpm/fpm_sockets.c
php-5.2.6.fpm/sapi/cgi/fpm/fpm_sockets.c
---- php-5.2.6.vanilla/sapi/cgi/fpm/fpm_sockets.c 1970-01-01
03:00:00.000000000 +0300
-+++ php-5.2.6.fpm/sapi/cgi/fpm/fpm_sockets.c 2008-08-26 19:09:15.000000000
+0400
+diff -Nru php-5.2.6.vanilla/sapi/fpm/fpm/fpm_sockets.c
php-5.2.6.fpm/sapi/fpm/fpm/fpm_sockets.c
+--- php-5.2.6.vanilla/sapi/fpm/fpm/fpm_sockets.c 1970-01-01
03:00:00.000000000 +0300
++++ php-5.2.6.fpm/sapi/fpm/fpm/fpm_sockets.c 2008-08-26 19:09:15.000000000
+0400
@@ -0,0 +1,425 @@
+
+ /* $Id$ */
@@ -5333,9 +5333,9 @@
+
+ return 0;
+}
-diff -Nru php-5.2.6.vanilla/sapi/cgi/fpm/fpm_sockets.h
php-5.2.6.fpm/sapi/cgi/fpm/fpm_sockets.h
---- php-5.2.6.vanilla/sapi/cgi/fpm/fpm_sockets.h 1970-01-01
03:00:00.000000000 +0300
-+++ php-5.2.6.fpm/sapi/cgi/fpm/fpm_sockets.h 2008-08-26 19:09:15.000000000
+0400
+diff -Nru php-5.2.6.vanilla/sapi/fpm/fpm/fpm_sockets.h
php-5.2.6.fpm/sapi/fpm/fpm/fpm_sockets.h
+--- php-5.2.6.vanilla/sapi/fpm/fpm/fpm_sockets.h 1970-01-01
03:00:00.000000000 +0300
++++ php-5.2.6.fpm/sapi/fpm/fpm/fpm_sockets.h 2008-08-26 19:09:15.000000000
+0400
@@ -0,0 +1,37 @@
+
+ /* $Id$ */
@@ -5374,9 +5374,9 @@
+ (unsigned int) ((unsigned char *)
&(sin_addr)->s_addr)[3]
+
+#endif
-diff -Nru php-5.2.6.vanilla/sapi/cgi/fpm/fpm_stdio.c
php-5.2.6.fpm/sapi/cgi/fpm/fpm_stdio.c
---- php-5.2.6.vanilla/sapi/cgi/fpm/fpm_stdio.c 1970-01-01 03:00:00.000000000
+0300
-+++ php-5.2.6.fpm/sapi/cgi/fpm/fpm_stdio.c 2008-05-24 21:38:47.000000000
+0400
+diff -Nru php-5.2.6.vanilla/sapi/fpm/fpm/fpm_stdio.c
php-5.2.6.fpm/sapi/fpm/fpm/fpm_stdio.c
+--- php-5.2.6.vanilla/sapi/fpm/fpm/fpm_stdio.c 1970-01-01 03:00:00.000000000
+0300
++++ php-5.2.6.fpm/sapi/fpm/fpm/fpm_stdio.c 2008-05-24 21:38:47.000000000
+0400
@@ -0,0 +1,277 @@
+
+ /* $Id$ */
@@ -5655,9 +5655,9 @@
+
+ return 0;
+}
-diff -Nru php-5.2.6.vanilla/sapi/cgi/fpm/fpm_stdio.h
php-5.2.6.fpm/sapi/cgi/fpm/fpm_stdio.h
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/php-fpm.patch?r1=1.3&r2=1.4&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
