Author: glen Date: Mon Nov 3 18:27:28 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- allow compiling --without-fpm
---- Files affected:
SOURCES:
php-fpm.patch (1.6 -> 1.7)
---- Diffs:
================================================================
Index: SOURCES/php-fpm.patch
diff -u SOURCES/php-fpm.patch:1.6 SOURCES/php-fpm.patch:1.7
--- SOURCES/php-fpm.patch:1.6 Mon Nov 3 19:13:02 2008
+++ SOURCES/php-fpm.patch Mon Nov 3 19:27:22 2008
@@ -129,9 +129,8 @@
/* 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
+--- 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
@@ -55,6 +55,9 @@
#if HAVE_SYS_WAIT_H
#include <sys/wait.h>
@@ -364,7 +363,33 @@
children = atoi(getenv("PHP_FCGI_CHILDREN"));
if (children < 0) {
fprintf(stderr, "PHP_FCGI_CHILDREN is not valid\n");
-@@ -1616,6 +1721,8 @@
+@@ -1520,7 +1625,11 @@
+
+ if (fastcgi) {
+ /* How many times to run PHP scripts before dying */
+- if (!fpm && getenv("PHP_FCGI_MAX_REQUESTS")) {
++ if (
++#if PHP_FASTCGI_PM
++ !fpm &&
++#endif
++ 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");
+@@ -1537,7 +1646,11 @@
+
+ #ifndef PHP_WIN32
+ /* Pre-fork, if required */
+- if (!fpm && getenv("PHP_FCGI_CHILDREN")) {
++ if (
++#if PHP_FASTCGI_PM
++ !fpm &&
++#endif
++ getenv("PHP_FCGI_CHILDREN")) {
+ children = atoi(getenv("PHP_FCGI_CHILDREN"));
+ if (children < 0) {
+ fprintf(stderr, "PHP_FCGI_CHILDREN is not valid\n");
+@@ -1616,6 +1729,8 @@
#endif
#if PHP_FASTCGI
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/php-fpm.patch?r1=1.6&r2=1.7&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
