Author: glen Date: Mon Nov 3 19:14:45 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- fix chunks
---- Files affected:
SOURCES:
php-fpm.patch (1.7 -> 1.8)
---- Diffs:
================================================================
Index: SOURCES/php-fpm.patch
diff -u SOURCES/php-fpm.patch:1.7 SOURCES/php-fpm.patch:1.8
--- SOURCES/php-fpm.patch:1.7 Mon Nov 3 19:27:22 2008
+++ SOURCES/php-fpm.patch Mon Nov 3 20:14:40 2008
@@ -345,29 +345,11 @@
if (bindpath) {
fcgi_fd = fcgi_listen(bindpath, 128);
if (fcgi_fd < 0) {
-@@ -1473,7 +1578,7 @@
+@@ -1625,7 +1625,11 @@
if (fastcgi) {
/* How many times to run PHP scripts before dying */
- if (getenv("PHP_FCGI_MAX_REQUESTS")) {
-+ if (!fpm && 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");
-@@ -1490,7 +1595,7 @@
-
- #ifndef PHP_WIN32
- /* Pre-fork, if required */
-- if (getenv("PHP_FCGI_CHILDREN")) {
-+ if (!fpm && getenv("PHP_FCGI_CHILDREN")) {
- children = atoi(getenv("PHP_FCGI_CHILDREN"));
- if (children < 0) {
- fprintf(stderr, "PHP_FCGI_CHILDREN is not valid\n");
-@@ -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 &&
@@ -376,11 +358,11 @@
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 @@
+@@ -1642,7 +1646,11 @@
#ifndef PHP_WIN32
/* Pre-fork, if required */
-- if (!fpm && getenv("PHP_FCGI_CHILDREN")) {
+- if (getenv("PHP_FCGI_CHILDREN")) {
+ if (
+#if PHP_FASTCGI_PM
+ !fpm &&
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/php-fpm.patch?r1=1.7&r2=1.8&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
