Author: glen Date: Mon Nov 3 20:49:37 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- zts params, round 3
- NOTE: it only compiles args validity isn't checked and likely are false
---- Files affected:
SOURCES:
php-fpm-zts.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: SOURCES/php-fpm-zts.patch
diff -u SOURCES/php-fpm-zts.patch:1.2 SOURCES/php-fpm-zts.patch:1.3
--- SOURCES/php-fpm-zts.patch:1.2 Mon Nov 3 21:04:35 2008
+++ SOURCES/php-fpm-zts.patch Mon Nov 3 21:49:31 2008
@@ -290,3 +290,47 @@
static int monotonic_works;
+--- php-5.2.6/sapi/cgi/fpm/fpm.c 2008-11-03 22:08:17.285352817 +0200
++++ php-5.2.6-zts/sapi/cgi/fpm/fpm.c 2008-11-03 22:07:14.678692152 +0200
+@@ -56,7 +56,7 @@
+
+ /* children: return listening socket
+ parent: never return */
+-int fpm_run(int *max_requests)
++int fpm_run(int *max_requests TSRMLS_DC)
+ {
+ struct fpm_worker_pool_s *wp;
+
+@@ -64,7 +64,7 @@
+ for (wp = fpm_worker_all_pools; wp; wp = wp->next) {
+ int is_parent;
+
+- is_parent = fpm_children_create_initial(wp);
++ is_parent = fpm_children_create_initial(wp TSRMLS_CC);
+
+ if (!is_parent) {
+ goto run_child;
+--- php-5.2.6/sapi/cgi/fpm/fpm.h 2008-11-03 22:08:17.288686240 +0200
++++ php-5.2.6-zts/sapi/cgi/fpm/fpm.h 2008-11-03 22:06:06.847658292 +0200
+@@ -6,8 +6,9 @@
+ #define FPM_H 1
+
+ #include <unistd.h>
++#include "TSRM.h"
+
+-int fpm_run(int *max_requests);
++int fpm_run(int *max_requests TSRMLS_DC);
+ int fpm_init(int argc, char **argv, char *config);
+
+ struct fpm_globals_s {
+--- php-5.2.6/sapi/cgi/cgi_main.c~ 2008-11-03 22:09:38.000000000 +0200
++++ php-5.2.6/sapi/cgi/cgi_main.c 2008-11-03 22:13:01.700949038 +0200
+@@ -1604,7 +1604,7 @@
+ return FAILURE;
+ }
+
+- fcgi_fd = fpm_run(&max_requests);
++ fcgi_fd = fpm_run(&max_requests TSRMLS_CC);
+
+ fcgi_set_is_fastcgi(fastcgi = 1);
+ }
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/php-fpm-zts.patch?r1=1.2&r2=1.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
