SOURCES: php-fpm.patch - shared libevent (merged again: 1.5 -> 1.6)
glen
glen at pld-linux.org
Tue Dec 16 19:31:54 CET 2008
Author: glen Date: Tue Dec 16 18:31:54 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- shared libevent (merged again: 1.5 -> 1.6)
---- Files affected:
SOURCES:
php-fpm.patch (1.11 -> 1.12)
---- Diffs:
================================================================
Index: SOURCES/php-fpm.patch
diff -u SOURCES/php-fpm.patch:1.11 SOURCES/php-fpm.patch:1.12
--- SOURCES/php-fpm.patch:1.11 Tue Dec 16 17:04:29 2008
+++ SOURCES/php-fpm.patch Tue Dec 16 19:31:48 2008
@@ -82,7 +82,6 @@
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 @@
@@ -133,7 +132,6 @@
/* Define if system uses EBCDIC */
#undef CHARSET_EBCDIC
-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 @@
@@ -454,7 +452,6 @@
#endif
if (cgi_sapi_module.php_ini_path_override) {
-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 @@
@@ -502,7 +499,6 @@
;;
esac
-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 @@
@@ -679,7 +675,6 @@
#if defined(HAVE_SYS_POLL_H) && defined(HAVE_POLL)
struct pollfd fds;
int ret;
-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 @@
@@ -701,7 +696,6 @@
#ifdef PHP_WIN32
void fcgi_impersonate(void);
#endif
-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 @@
@@ -1082,7 +1076,6 @@
+ AC_MSG_RESULT([no])
+ ])
+])
-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 @@
@@ -1242,10 +1235,9 @@
+ </workers>
+
+</configuration>
-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 @@
+@@ -0,0 +1,117 @@
+
+FPM_VERSION="0.5.10"
+
@@ -1286,8 +1278,8 @@
+AC_FPM_TRACE
+dnl AC_FPM_JUDY
+
-+LIBEVENT_CFLAGS="-I$abs_srcdir/libevent"
-+LIBEVENT_LIBS="$abs_builddir/libevent/libevent.a"
++LIBEVENT_CFLAGS=""
++LIBEVENT_LIBS="-levent"
+
+SAPI_EXTRA_DEPS="$LIBEVENT_LIBS"
+
@@ -1316,30 +1308,6 @@
+
+install_fpm="install-fpm"
+
-+PHP_CONFIGURE_PART(Configuring libevent)
-+
-+test -d "$abs_builddir/libevent" || mkdir -p $abs_builddir/libevent
-+
-+dnl this is a bad hack
-+
-+chmod +x "$abs_srcdir/libevent/configure" \
-+ "$abs_srcdir/libevent/depcomp" \
-+ "$abs_srcdir/libevent/install-sh" \
-+ "$abs_srcdir/libevent/missing"
-+
-+libevent_configure="cd $abs_builddir/libevent ; CFLAGS=\"$CFLAGS $GCC_CFLAGS\" $abs_srcdir/libevent/configure --disable-shared"
-+
-+(eval $libevent_configure)
-+
-+if test ! -f "$abs_builddir/libevent/Makefile" ; then
-+ echo "Failed to configure libevent" >&2
-+ exit 1
-+fi
-+
-+dnl another hack for stealing libevent dependant library list
-+
-+LIBEVENT_LIBS="$LIBEVENT_LIBS `echo "@LIBS@" | $abs_builddir/libevent/config.status --file=-:-`"
-+
+SAPI_EXTRA_LIBS="$LIBEVENT_LIBS $LIBXML_LIBS $JUDY_LIBS"
+
+
@@ -1501,7 +1469,6 @@
+}
+
+#endif
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/fpm_atomic.h php-5.2.8.fpm/sapi/cgi/fpm/fpm_atomic.h
--- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_atomic.h 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_atomic.h 2008-09-19 03:34:11.000000000 +0400
@@ -0,0 +1,85 @@
@@ -1590,7 +1557,6 @@
+
+#endif
+
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/fpm_autoconf.h.in php-5.2.8.fpm/sapi/cgi/fpm/fpm_autoconf.h.in
--- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_autoconf.h.in 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_autoconf.h.in 2008-05-24 21:38:47.000000000 +0400
@@ -0,0 +1,9 @@
@@ -1603,7 +1569,6 @@
+#define PHP_FPM_LOG_PATH "@php_fpm_log_path@"
+#define PHP_FPM_PID_PATH "@php_fpm_pid_path@"
+
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/fpm.c php-5.2.8.fpm/sapi/cgi/fpm/fpm.c
--- php-5.2.8.vanilla/sapi/cgi/fpm/fpm.c 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/fpm.c 2008-07-20 20:38:31.000000000 +0400
@@ -0,0 +1,84 @@
@@ -1691,7 +1656,6 @@
+ return fpm_globals.listening_socket;
+}
+
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/fpm_children.c php-5.2.8.fpm/sapi/cgi/fpm/fpm_children.c
--- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_children.c 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_children.c 2008-12-13 06:21:18.000000000 +0300
@@ -0,0 +1,385 @@
@@ -2080,7 +2044,6 @@
+ return 0;
+}
+
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/fpm_children.h php-5.2.8.fpm/sapi/cgi/fpm/fpm_children.h
--- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_children.h 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_children.h 2008-05-24 21:38:47.000000000 +0400
@@ -0,0 +1,33 @@
@@ -2117,7 +2080,6 @@
+};
+
+#endif
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/fpm_cleanup.c php-5.2.8.fpm/sapi/cgi/fpm/fpm_cleanup.c
--- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_cleanup.c 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_cleanup.c 2008-05-24 21:38:47.000000000 +0400
@@ -0,0 +1,51 @@
@@ -2172,7 +2134,6 @@
+ fpm_array_free(&cleanups);
+}
+
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/fpm_cleanup.h php-5.2.8.fpm/sapi/cgi/fpm/fpm_cleanup.h
--- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_cleanup.h 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_cleanup.h 2008-05-24 21:38:47.000000000 +0400
@@ -0,0 +1,21 @@
@@ -2197,7 +2158,6 @@
+
+#endif
+
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/fpm_clock.c php-5.2.8.fpm/sapi/cgi/fpm/fpm_clock.c
--- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_clock.c 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_clock.c 2008-09-19 03:19:59.000000000 +0400
@@ -0,0 +1,115 @@
@@ -2316,7 +2276,6 @@
+}
+
+#endif
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/fpm_clock.h php-5.2.8.fpm/sapi/cgi/fpm/fpm_clock.h
--- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_clock.h 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_clock.h 2008-05-24 21:38:47.000000000 +0400
@@ -0,0 +1,13 @@
@@ -2333,7 +2292,6 @@
+int fpm_clock_get(struct timeval *tv);
+
+#endif
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/fpm_conf.c php-5.2.8.fpm/sapi/cgi/fpm/fpm_conf.c
--- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_conf.c 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_conf.c 2008-12-13 06:50:29.000000000 +0300
@@ -0,0 +1,532 @@
@@ -2869,7 +2827,6 @@
+
+ return 0;
+}
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/fpm_conf.h php-5.2.8.fpm/sapi/cgi/fpm/fpm_conf.h
--- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_conf.h 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_conf.h 2008-12-13 06:46:49.000000000 +0300
@@ -0,0 +1,73 @@
@@ -2946,7 +2903,6 @@
+
+#endif
+
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/fpm_config.h php-5.2.8.fpm/sapi/cgi/fpm/fpm_config.h
--- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_config.h 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_config.h 2008-05-25 04:30:43.000000000 +0400
@@ -0,0 +1,39 @@
@@ -2989,7 +2945,6 @@
+#define HAVE_FPM_TRACE 0
+#endif
+
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/fpm_env.c php-5.2.8.fpm/sapi/cgi/fpm/fpm_env.c
--- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_env.c 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_env.c 2008-09-19 03:19:59.000000000 +0400
@@ -0,0 +1,125 @@
@@ -3118,7 +3073,6 @@
+
+ return 0;
+}
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/fpm_env.h php-5.2.8.fpm/sapi/cgi/fpm/fpm_env.h
--- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_env.h 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_env.h 2008-09-19 03:19:59.000000000 +0400
@@ -0,0 +1,24 @@
@@ -3146,7 +3100,6 @@
+
+#endif
+
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/fpm_events.c php-5.2.8.fpm/sapi/cgi/fpm/fpm_events.c
--- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_events.c 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_events.c 2008-12-13 06:21:18.000000000 +0300
@@ -0,0 +1,135 @@
@@ -3285,7 +3238,6 @@
+ (*ev->ev_callback)( (int) ev->ev_fd, (short) ev->ev_res, ev->ev_arg);
+}
+
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/fpm_events.h php-5.2.8.fpm/sapi/cgi/fpm/fpm_events.h
--- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_events.h 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_events.h 2008-05-24 21:38:47.000000000 +0400
@@ -0,0 +1,16 @@
@@ -3305,7 +3257,6 @@
+
+
+#endif
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/fpm.h php-5.2.8.fpm/sapi/cgi/fpm/fpm.h
--- php-5.2.8.vanilla/sapi/cgi/fpm/fpm.h 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/fpm.h 2008-05-24 21:38:47.000000000 +0400
@@ -0,0 +1,30 @@
@@ -3339,7 +3290,6 @@
+extern int fpm;
+
+#endif
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/fpm_php.c php-5.2.8.fpm/sapi/cgi/fpm/fpm_php.c
--- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_php.c 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_php.c 2008-12-13 06:21:18.000000000 +0300
@@ -0,0 +1,190 @@
@@ -3533,7 +3483,6 @@
+
+ return 0;
+}
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/fpm_php.h php-5.2.8.fpm/sapi/cgi/fpm/fpm_php.h
--- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_php.h 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_php.h 2008-11-15 03:57:24.000000000 +0300
@@ -0,0 +1,22 @@
@@ -3559,7 +3508,6 @@
+
+#endif
+
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/fpm_php_trace.c php-5.2.8.fpm/sapi/cgi/fpm/fpm_php_trace.c
--- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_php_trace.c 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_php_trace.c 2008-11-15 03:57:24.000000000 +0300
@@ -0,0 +1,171 @@
@@ -3734,7 +3682,6 @@
+
+#endif
+
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/fpm_php_trace.h php-5.2.8.fpm/sapi/cgi/fpm/fpm_php_trace.h
--- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_php_trace.h 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_php_trace.h 2008-05-24 21:38:47.000000000 +0400
@@ -0,0 +1,13 @@
@@ -3751,7 +3698,6 @@
+
+#endif
+
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/fpm_process_ctl.c php-5.2.8.fpm/sapi/cgi/fpm/fpm_process_ctl.c
--- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_process_ctl.c 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_process_ctl.c 2008-12-13 06:21:18.000000000 +0300
@@ -0,0 +1,354 @@
@@ -4109,7 +4055,6 @@
+ evtimer_add(&heartbeat, &tv);
+}
+
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/fpm_process_ctl.h php-5.2.8.fpm/sapi/cgi/fpm/fpm_process_ctl.h
--- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_process_ctl.h 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_process_ctl.h 2008-07-21 01:33:10.000000000 +0400
@@ -0,0 +1,39 @@
@@ -4152,7 +4097,6 @@
+
+#endif
+
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/fpm_request.c php-5.2.8.fpm/sapi/cgi/fpm/fpm_request.c
--- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_request.c 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_request.c 2008-11-15 03:57:24.000000000 +0300
@@ -0,0 +1,164 @@
@@ -4320,7 +4264,6 @@
+
+}
+
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/fpm_request.h php-5.2.8.fpm/sapi/cgi/fpm/fpm_request.h
--- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_request.h 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_request.h 2008-07-20 05:47:16.000000000 +0400
@@ -0,0 +1,27 @@
@@ -4351,7 +4294,6 @@
+};
+
+#endif
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/fpm_shm.c php-5.2.8.fpm/sapi/cgi/fpm/fpm_shm.c
--- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_shm.c 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_shm.c 2008-05-24 21:38:47.000000000 +0400
@@ -0,0 +1,100 @@
@@ -4455,7 +4397,6 @@
+ return ret;
+}
+
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/fpm_shm.h php-5.2.8.fpm/sapi/cgi/fpm/fpm_shm.h
--- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_shm.h 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_shm.h 2008-05-24 21:38:47.000000000 +0400
@@ -0,0 +1,22 @@
@@ -4481,7 +4422,6 @@
+
+#endif
+
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/fpm_shm_slots.c php-5.2.8.fpm/sapi/cgi/fpm/fpm_shm_slots.c
--- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_shm_slots.c 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_shm_slots.c 2008-05-24 21:38:47.000000000 +0400
@@ -0,0 +1,127 @@
@@ -4612,7 +4552,6 @@
+ s->lock = 0;
+}
+
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/fpm_shm_slots.h php-5.2.8.fpm/sapi/cgi/fpm/fpm_shm_slots.h
--- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_shm_slots.h 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_shm_slots.h 2008-05-24 21:38:47.000000000 +0400
@@ -0,0 +1,43 @@
@@ -4659,7 +4598,6 @@
+
+#endif
+
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/fpm_signals.c php-5.2.8.fpm/sapi/cgi/fpm/fpm_signals.c
--- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_signals.c 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_signals.c 2008-08-26 19:09:15.000000000 +0400
@@ -0,0 +1,252 @@
@@ -4915,7 +4853,6 @@
+{
+ return sp[0];
+}
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/fpm_signals.h php-5.2.8.fpm/sapi/cgi/fpm/fpm_signals.h
--- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_signals.h 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_signals.h 2008-05-24 21:38:47.000000000 +0400
@@ -0,0 +1,16 @@
@@ -4935,7 +4872,6 @@
+extern const char *fpm_signal_names[NSIG + 1];
+
+#endif
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/fpm_sockets.c php-5.2.8.fpm/sapi/cgi/fpm/fpm_sockets.c
--- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_sockets.c 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_sockets.c 2008-12-13 06:21:18.000000000 +0300
@@ -0,0 +1,427 @@
@@ -5366,7 +5302,6 @@
+
+ return 0;
+}
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/fpm_sockets.h php-5.2.8.fpm/sapi/cgi/fpm/fpm_sockets.h
--- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_sockets.h 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_sockets.h 2008-08-26 19:09:15.000000000 +0400
@@ -0,0 +1,37 @@
@@ -5407,7 +5342,6 @@
+ (unsigned int) ((unsigned char *) &(sin_addr)->s_addr)[3]
+
+#endif
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/fpm_stdio.c php-5.2.8.fpm/sapi/cgi/fpm/fpm_stdio.c
--- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_stdio.c 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_stdio.c 2008-12-13 06:32:24.000000000 +0300
@@ -0,0 +1,286 @@
@@ -5697,7 +5631,6 @@
+
+ return 0;
+}
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/fpm_stdio.h php-5.2.8.fpm/sapi/cgi/fpm/fpm_stdio.h
--- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_stdio.h 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_stdio.h 2008-05-24 21:38:47.000000000 +0400
@@ -0,0 +1,20 @@
@@ -5721,7 +5654,6 @@
+
+#endif
+
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/fpm_str.h php-5.2.8.fpm/sapi/cgi/fpm/fpm_str.h
--- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_str.h 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_str.h 2008-05-24 21:38:47.000000000 +0400
@@ -0,0 +1,49 @@
@@ -5774,7 +5706,6 @@
+}
+
+#endif
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/fpm_trace.c php-5.2.8.fpm/sapi/cgi/fpm/fpm_trace.c
--- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_trace.c 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_trace.c 2008-07-21 00:59:00.000000000 +0400
@@ -0,0 +1,46 @@
@@ -5824,7 +5755,6 @@
+ }
+}
+
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/fpm_trace.h php-5.2.8.fpm/sapi/cgi/fpm/fpm_trace.h
--- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_trace.h 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_trace.h 2008-07-21 02:43:39.000000000 +0400
@@ -0,0 +1,17 @@
@@ -5845,7 +5775,6 @@
+
+#endif
+
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/fpm_trace_mach.c php-5.2.8.fpm/sapi/cgi/fpm/fpm_trace_mach.c
--- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_trace_mach.c 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_trace_mach.c 2008-08-26 19:09:15.000000000 +0400
@@ -0,0 +1,102 @@
@@ -5951,7 +5880,6 @@
+ return 0;
+}
+
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/fpm_trace_pread.c php-5.2.8.fpm/sapi/cgi/fpm/fpm_trace_pread.c
--- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_trace_pread.c 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_trace_pread.c 2008-08-26 19:09:15.000000000 +0400
@@ -0,0 +1,67 @@
@@ -6022,7 +5950,6 @@
+ return 0;
+}
+
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/fpm_trace_ptrace.c php-5.2.8.fpm/sapi/cgi/fpm/fpm_trace_ptrace.c
--- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_trace_ptrace.c 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_trace_ptrace.c 2008-09-19 03:34:11.000000000 +0400
@@ -0,0 +1,85 @@
@@ -6111,7 +6038,6 @@
+ return 0;
+}
+
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/fpm_unix.c php-5.2.8.fpm/sapi/cgi/fpm/fpm_unix.c
--- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_unix.c 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_unix.c 2008-12-13 06:18:23.000000000 +0300
@@ -0,0 +1,289 @@
@@ -6404,7 +6330,6 @@
+
+ return 0;
+}
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/fpm_unix.h php-5.2.8.fpm/sapi/cgi/fpm/fpm_unix.h
--- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_unix.h 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_unix.h 2008-05-25 17:21:13.000000000 +0400
@@ -0,0 +1,17 @@
@@ -6425,7 +6350,6 @@
+
+#endif
+
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/fpm_worker_pool.c php-5.2.8.fpm/sapi/cgi/fpm/fpm_worker_pool.c
--- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_worker_pool.c 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_worker_pool.c 2008-12-13 06:21:18.000000000 +0300
@@ -0,0 +1,69 @@
@@ -6498,7 +6422,6 @@
+
+ return 0;
+}
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/fpm_worker_pool.h php-5.2.8.fpm/sapi/cgi/fpm/fpm_worker_pool.h
--- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_worker_pool.h 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_worker_pool.h 2008-08-26 19:09:15.000000000 +0400
@@ -0,0 +1,46 @@
@@ -6548,7 +6471,6 @@
+
+#endif
+
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/init.d/php-fpm.in php-5.2.8.fpm/sapi/cgi/fpm/init.d/php-fpm.in
--- php-5.2.8.vanilla/sapi/cgi/fpm/init.d/php-fpm.in 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/init.d/php-fpm.in 2008-08-26 19:09:18.000000000 +0400
@@ -0,0 +1,139 @@
@@ -6691,7 +6613,6 @@
+ ;;
+
+esac
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/Makefile.frag php-5.2.8.fpm/sapi/cgi/fpm/Makefile.frag
--- php-5.2.8.vanilla/sapi/cgi/fpm/Makefile.frag 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/Makefile.frag 2008-03-28 21:58:30.000000000 +0300
@@ -0,0 +1,21 @@
@@ -6716,7 +6637,6 @@
+$(top_builddir)/libevent/libevent.a: $(top_builddir)/libevent/Makefile
+ cd $(top_builddir)/libevent && $(MAKE) libevent.a
+
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/xml_config.c php-5.2.8.fpm/sapi/cgi/fpm/xml_config.c
--- php-5.2.8.vanilla/sapi/cgi/fpm/xml_config.c 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/xml_config.c 2008-08-26 19:09:15.000000000 +0400
@@ -0,0 +1,278 @@
@@ -6998,7 +6918,6 @@
+ return 0;
+}
+
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/xml_config.h php-5.2.8.fpm/sapi/cgi/fpm/xml_config.h
--- php-5.2.8.vanilla/sapi/cgi/fpm/xml_config.h 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/xml_config.h 2008-09-19 03:02:58.000000000 +0400
@@ -0,0 +1,43 @@
@@ -7045,7 +6964,6 @@
+enum { XML_CONF_SCALAR = 1, XML_CONF_SUBSECTION = 2 };
+
+#endif
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/zlog.c php-5.2.8.fpm/sapi/cgi/fpm/zlog.c
--- php-5.2.8.vanilla/sapi/cgi/fpm/zlog.c 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/zlog.c 2008-05-23 01:08:32.000000000 +0400
@@ -0,0 +1,113 @@
@@ -7162,7 +7080,6 @@
+
+ write(zlog_fd > -1 ? zlog_fd : STDERR_FILENO, buf, len);
+}
-diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/zlog.h php-5.2.8.fpm/sapi/cgi/fpm/zlog.h
--- php-5.2.8.vanilla/sapi/cgi/fpm/zlog.h 1970-01-01 03:00:00.000000000 +0300
+++ php-5.2.8.fpm/sapi/cgi/fpm/zlog.h 2008-05-23 01:08:32.000000000 +0400
@@ -0,0 +1,34 @@
@@ -7200,7 +7117,6 @@
+#define ZLOG_SYSERROR (ZLOG_ERROR | ZLOG_HAVE_ERRNO)
+
+#endif
-diff -Nru php-5.2.8.vanilla/sapi/cgi/Makefile.frag php-5.2.8.fpm/sapi/cgi/Makefile.frag
--- php-5.2.8.vanilla/sapi/cgi/Makefile.frag 2003-07-02 05:08:26.000000000 +0400
+++ php-5.2.8.fpm/sapi/cgi/Makefile.frag 2008-05-01 20:42:06.000000000 +0400
@@ -1,2 +1,2 @@
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/php-fpm.patch?r1=1.11&r2=1.12&f=u
More information about the pld-cvs-commit
mailing list