1 diff -Nru php-5.2.8.vanilla/configure php-5.2.8.fpm/configure
2 diff -Nru php-5.2.8.vanilla/configure.in php-5.2.8.fpm/configure.in
3 --- php-5.2.8.vanilla/configure.in 2008-12-07 22:23:25.000000000 +0300
4 +++ php-5.2.8.fpm/configure.in 2008-12-09 04:00:14.000000000 +0300
9 +if test "$PHP_FASTCGI" = "yes" -a "$PHP_FPM" = "yes"; then
10 + PHP_CONFIGURE_PART(Running FastCGI Process Manager checks)
11 + sinclude(sapi/cgi/fpm/acinclude.m4)
12 + sinclude(sapi/cgi/fpm/config.m4)
17 dnl ## In diversion 3 we check for compile-time options to the PHP
27 PHP_SUBST_OLD(EXTRA_LDFLAGS)
28 PHP_SUBST_OLD(EXTRA_LDFLAGS_PROGRAM)
29 PHP_SUBST_OLD(EXTRA_LIBS)
30 +PHP_SUBST_OLD(SAPI_EXTRA_LIBS)
31 +PHP_SUBST_OLD(SAPI_EXTRA_DEPS)
32 PHP_SUBST_OLD(ZEND_EXTRA_LIBS)
33 PHP_SUBST_OLD(INCLUDES)
34 PHP_SUBST_OLD(EXTRA_INCLUDES)
36 install_targets="$PHP_INSTALL_CLI_TARGET $install_targets"
39 - install_targets="install-sapi $PHP_INSTALL_CLI_TARGET $install_targets"
40 + install_targets="install-sapi $install_fpm $PHP_INSTALL_CLI_TARGET $install_targets"
44 diff -Nru php-5.2.8.vanilla/libevent/aclocal.m4 php-5.2.8.fpm/libevent/aclocal.m4
45 diff -Nru php-5.2.8.vanilla/libevent/autogen.sh php-5.2.8.fpm/libevent/autogen.sh
46 diff -Nru php-5.2.8.vanilla/libevent/buffer.c php-5.2.8.fpm/libevent/buffer.c
47 diff -Nru php-5.2.8.vanilla/libevent/ChangeLog php-5.2.8.fpm/libevent/ChangeLog
48 diff -Nru php-5.2.8.vanilla/libevent/compat/sys/queue.h php-5.2.8.fpm/libevent/compat/sys/queue.h
49 diff -Nru php-5.2.8.vanilla/libevent/compat/sys/_time.h php-5.2.8.fpm/libevent/compat/sys/_time.h
50 diff -Nru php-5.2.8.vanilla/libevent/config.h.in php-5.2.8.fpm/libevent/config.h.in
51 diff -Nru php-5.2.8.vanilla/libevent/configure php-5.2.8.fpm/libevent/configure
52 diff -Nru php-5.2.8.vanilla/libevent/configure.in php-5.2.8.fpm/libevent/configure.in
53 diff -Nru php-5.2.8.vanilla/libevent/depcomp php-5.2.8.fpm/libevent/depcomp
54 diff -Nru php-5.2.8.vanilla/libevent/devpoll.c php-5.2.8.fpm/libevent/devpoll.c
55 diff -Nru php-5.2.8.vanilla/libevent/epoll.c php-5.2.8.fpm/libevent/epoll.c
56 diff -Nru php-5.2.8.vanilla/libevent/epoll_sub.c php-5.2.8.fpm/libevent/epoll_sub.c
57 diff -Nru php-5.2.8.vanilla/libevent/evbuffer.c php-5.2.8.fpm/libevent/evbuffer.c
58 diff -Nru php-5.2.8.vanilla/libevent/event.3 php-5.2.8.fpm/libevent/event.3
59 diff -Nru php-5.2.8.vanilla/libevent/event.c php-5.2.8.fpm/libevent/event.c
60 diff -Nru php-5.2.8.vanilla/libevent/event-config.h php-5.2.8.fpm/libevent/event-config.h
61 diff -Nru php-5.2.8.vanilla/libevent/event-fpm.h php-5.2.8.fpm/libevent/event-fpm.h
62 diff -Nru php-5.2.8.vanilla/libevent/event.h php-5.2.8.fpm/libevent/event.h
63 diff -Nru php-5.2.8.vanilla/libevent/event-internal.h php-5.2.8.fpm/libevent/event-internal.h
64 diff -Nru php-5.2.8.vanilla/libevent/evhttp.h php-5.2.8.fpm/libevent/evhttp.h
65 diff -Nru php-5.2.8.vanilla/libevent/evport.c php-5.2.8.fpm/libevent/evport.c
66 diff -Nru php-5.2.8.vanilla/libevent/evsignal.h php-5.2.8.fpm/libevent/evsignal.h
67 diff -Nru php-5.2.8.vanilla/libevent/evutil.c php-5.2.8.fpm/libevent/evutil.c
68 diff -Nru php-5.2.8.vanilla/libevent/evutil.h php-5.2.8.fpm/libevent/evutil.h
69 diff -Nru php-5.2.8.vanilla/libevent/http.c php-5.2.8.fpm/libevent/http.c
70 diff -Nru php-5.2.8.vanilla/libevent/http-internal.h php-5.2.8.fpm/libevent/http-internal.h
71 diff -Nru php-5.2.8.vanilla/libevent/install-sh php-5.2.8.fpm/libevent/install-sh
72 diff -Nru php-5.2.8.vanilla/libevent/kqueue.c php-5.2.8.fpm/libevent/kqueue.c
73 diff -Nru php-5.2.8.vanilla/libevent/log.c php-5.2.8.fpm/libevent/log.c
74 diff -Nru php-5.2.8.vanilla/libevent/log.h php-5.2.8.fpm/libevent/log.h
75 diff -Nru php-5.2.8.vanilla/libevent/Makefile.am php-5.2.8.fpm/libevent/Makefile.am
76 diff -Nru php-5.2.8.vanilla/libevent/Makefile.in php-5.2.8.fpm/libevent/Makefile.in
77 diff -Nru php-5.2.8.vanilla/libevent/min_heap.h php-5.2.8.fpm/libevent/min_heap.h
78 diff -Nru php-5.2.8.vanilla/libevent/missing php-5.2.8.fpm/libevent/missing
79 diff -Nru php-5.2.8.vanilla/libevent/poll.c php-5.2.8.fpm/libevent/poll.c
80 diff -Nru php-5.2.8.vanilla/libevent/README php-5.2.8.fpm/libevent/README
81 diff -Nru php-5.2.8.vanilla/libevent/select.c php-5.2.8.fpm/libevent/select.c
82 diff -Nru php-5.2.8.vanilla/libevent/signal.c php-5.2.8.fpm/libevent/signal.c
83 diff -Nru php-5.2.8.vanilla/libevent/strlcpy.c php-5.2.8.fpm/libevent/strlcpy.c
84 diff -Nru php-5.2.8.vanilla/libevent/strlcpy-internal.h php-5.2.8.fpm/libevent/strlcpy-internal.h
85 --- php-5.2.8.vanilla/main/php_config.h.in 2008-12-07 22:31:16.000000000 +0300
86 +++ php-5.2.8.fpm/main/php_config.h.in 2008-12-13 07:23:02.000000000 +0300
88 /* Define if you have the chroot function. */
91 +/* Define if you have the clearenv function. */
94 /* Define if you have the crypt function. */
101 +/* Is experimental fastcgi process manager code activated */
102 +#undef PHP_FASTCGI_PM
105 #undef FORCE_CGI_REDIRECT
109 #undef ENABLE_PATHINFO_CHECK
111 +/* do we have libxml? */
114 +/* do we have prctl? */
117 +/* do we have clock_gettime? */
118 +#undef HAVE_CLOCK_GETTIME
120 +/* do we have clock_get_time? */
121 +#undef HAVE_CLOCK_GET_TIME
123 +/* do we have ptrace? */
126 +/* do we have mach_vm_read? */
127 +#undef HAVE_MACH_VM_READ
129 +/* /proc/pid/mem interface */
130 +#undef PROC_MEM_FILE
132 /* Define if system uses EBCDIC */
133 #undef CHARSET_EBCDIC
135 --- php-5.2.8.vanilla/sapi/cgi/cgi_main.c 2008-11-28 14:56:50.000000000 +0300
136 +++ php-5.2.8.fpm/sapi/cgi/cgi_main.c 2008-12-09 07:17:03.000000000 +0300
139 #include <sys/wait.h>
145 #include "zend_extensions.h"
152 +#include "fpm/fpm.h"
153 +#include "fpm/fpm_request.h"
157 /* XXX this will need to change later when threaded fastcgi is
158 implemented. shane */
163 +static int request_body_fd;
167 +static char *sapi_cgibin_getenv(char *name, size_t name_len TSRMLS_DC);
169 #define PHP_MODE_STANDARD 1
170 #define PHP_MODE_HIGHLIGHT 2
171 #define PHP_MODE_INDENT 3
174 {'?', 0, "usage"},/* help alias (both '?' and 'usage') */
178 + {'y', 1, "fpm-config"},
180 {'z', 1, "zend-extension"},
184 zend_bool impersonate;
187 + char *error_header;
188 } php_cgi_globals_struct;
193 if (fcgi_is_fastcgi()) {
194 fcgi_request *request = (fcgi_request*) SG(server_context);
195 - tmp_read_bytes = fcgi_read(request, buffer + read_bytes, count_bytes - read_bytes);
197 + if (request_body_fd == -1) {
198 + char *request_body_filename = sapi_cgibin_getenv((char *) "REQUEST_BODY_FILE",
199 + sizeof("REQUEST_BODY_FILE")-1 TSRMLS_CC);
201 + if (request_body_filename && *request_body_filename) {
202 + request_body_fd = open(request_body_filename, O_RDONLY);
204 + if (0 > request_body_fd) {
205 + php_error(E_WARNING, "REQUEST_BODY_FILE: open('%s') failed: %s (%d)",
206 + request_body_filename, strerror(errno), errno);
212 + /* If REQUEST_BODY_FILE variable not available - read post body from fastcgi stream */
213 + if (request_body_fd < 0) {
214 + tmp_read_bytes = fcgi_read(request, buffer + read_bytes, count_bytes - read_bytes);
216 + tmp_read_bytes = read(request_body_fd, buffer + read_bytes, count_bytes - read_bytes);
219 tmp_read_bytes = read(0, buffer + read_bytes, count_bytes - read_bytes);
222 " -s Display colour syntax highlighted source.\n"
223 " -v Version number\n"
224 " -w Display source with stripped comments and whitespace.\n"
225 - " -z <file> Load Zend extension <file>.\n"
227 + " -x, --fpm Run in FastCGI process manager mode.\n"
228 + " -y, --fpm-config <file>\n"
229 + " Specify alternative path to FastCGI process manager config file.\n"
231 + " -z <file> Load Zend extension <file>.\n"
233 " -T <count> Measure execution time of script repeated <count> times.\n"
235 @@ -1231,6 +1274,7 @@
237 STD_PHP_INI_ENTRY("fastcgi.impersonate", "0", PHP_INI_SYSTEM, OnUpdateBool, impersonate, php_cgi_globals_struct, php_cgi_globals)
239 + STD_PHP_INI_ENTRY("fastcgi.error_header", NULL, PHP_INI_SYSTEM, OnUpdateString, error_header, php_cgi_globals_struct, php_cgi_globals)
243 @@ -1253,6 +1297,7 @@
245 php_cgi_globals->impersonate = 0;
247 + php_cgi_globals->error_header = NULL;
251 @@ -1285,9 +1330,47 @@
252 static PHP_MINFO_FUNCTION(cgi)
254 DISPLAY_INI_ENTRIES();
258 +#include "fpm/fpm_autoconf.h"
260 + php_info_print_table_start();
261 + php_info_print_table_row(2, "php-fpm", fpm ? "active" : "inactive");
262 + php_info_print_table_row(2, "php-fpm version", PHP_FPM_VERSION);
263 + php_info_print_table_end();
270 +PHP_FUNCTION(fastcgi_finish_request)
272 + fcgi_request *request = (fcgi_request*) SG(server_context);
274 + if (fcgi_is_fastcgi() && request->fd >= 0) {
276 + php_end_ob_buffers(1 TSRMLS_CC);
277 + php_header(TSRMLS_C);
279 + fcgi_flush(request, 1);
280 + fcgi_close(request, 0, 0);
289 +function_entry cgi_fcgi_sapi_functions[] = {
291 + PHP_FE(fastcgi_finish_request, NULL)
296 static zend_module_entry cgi_module_entry = {
297 STANDARD_MODULE_HEADER,
299 @@ -1295,7 +1378,7 @@
304 + cgi_fcgi_sapi_functions,
308 @@ -1335,6 +1418,7 @@
309 char *bindpath = NULL;
311 fcgi_request request;
312 + char *fpm_config = NULL;
315 #if HAVE_GETTIMEOFDAY
316 @@ -1455,6 +1539,14 @@
317 case 's': /* generate highlighted HTML from source */
318 behavior = PHP_MODE_HIGHLIGHT;
322 + fpm_config = php_optarg;
331 @@ -1517,6 +1609,19 @@
332 #endif /* FORCE_CGI_REDIRECT */
337 + if (0 > fpm_init(argc, argv, fpm_config)) {
341 + fcgi_fd = fpm_run(&max_requests);
343 + fcgi_set_is_fastcgi(fastcgi = 1);
349 fcgi_fd = fcgi_listen(bindpath, 128);
351 @@ -1531,6 +1636,9 @@
354 /* How many times to run PHP scripts before dying */
358 if (getenv("PHP_FCGI_MAX_REQUESTS")) {
359 max_requests = atoi(getenv("PHP_FCGI_MAX_REQUESTS"));
360 if (max_requests < 0) {
361 @@ -1548,6 +1656,9 @@
364 /* Pre-fork, if required */
368 if (getenv("PHP_FCGI_CHILDREN")) {
369 char * children_str = getenv("PHP_FCGI_CHILDREN");
370 children = atoi(children_str);
371 @@ -1697,6 +1808,8 @@
375 + request_body_fd = -1;
377 SG(server_context) = (void *) &request;
379 SG(server_context) = (void *) 1; /* avoid server_context==NULL checks */
380 @@ -1704,6 +1817,10 @@
381 init_request_info(TSRMLS_C);
385 + if (fpm) fpm_request_info();
391 @@ -1984,6 +2101,10 @@
396 + if (fpm) fpm_request_executing();
400 case PHP_MODE_STANDARD:
401 php_execute_script(&file_handle TSRMLS_CC);
402 @@ -2036,6 +2157,10 @@
405 fastcgi_request_done:
407 + if (request_body_fd != -1) close(request_body_fd);
409 + request_body_fd = -2;
412 char *path_translated;
413 @@ -2049,6 +2174,16 @@
414 SG(request_info).path_translated = path_translated;
417 + if (EG(exit_status) == 255) {
418 + if (CGIG(error_header) && *CGIG(error_header)) {
419 + sapi_header_line ctr = {0};
421 + ctr.line = CGIG(error_header);
422 + ctr.line_len = strlen(CGIG(error_header));
423 + sapi_header_op(SAPI_HEADER_REPLACE, &ctr TSRMLS_CC);
427 php_request_shutdown((void *) 0);
428 if (exit_status == 0) {
429 exit_status = EG(exit_status);
430 @@ -2086,15 +2221,20 @@
434 - if (max_requests != 1) {
435 - /* no need to return exit_status of the last request */
440 /* end of fastcgi loop */
444 + if (fcgi_in_shutdown() || /* graceful shutdown by a signal */
445 + (max_requests && (requests == max_requests)) /* we were told to process max_requests and we are done */
454 if (cgi_sapi_module.php_ini_path_override) {
455 --- php-5.2.8.vanilla/sapi/cgi/config9.m4 2007-07-12 03:20:36.000000000 +0400
456 +++ php-5.2.8.fpm/sapi/cgi/config9.m4 2008-07-20 20:46:41.000000000 +0400
458 [ --disable-path-info-check CGI: If this is disabled, paths such as
459 /info.php/test?a=b will fail to work], yes, no)
461 +PHP_ARG_ENABLE(fpm,,
462 +[ --enable-fpm FastCGI: If this is enabled, the fastcgi support
463 + will include experimental process manager code], no, no)
469 AC_DEFINE_UNQUOTED(PHP_FASTCGI, $PHP_ENABLE_FASTCGI, [ ])
470 AC_MSG_RESULT($PHP_FASTCGI)
473 + if test "$PHP_FASTCGI" = "yes"; then
474 + AC_MSG_CHECKING(whether to enable FastCGI Process Manager)
475 + if test "$PHP_FPM" = "yes"; then
480 + AC_MSG_RESULT($PHP_FPM)
484 + AC_DEFINE_UNQUOTED(PHP_FASTCGI_PM, $PHP_FASTCGI_PM, [Is experimental fastcgi process manager code activated])
486 dnl --enable-force-cgi-redirect
487 AC_MSG_CHECKING(whether to force Apache CGI redirect)
488 if test "$PHP_FORCE_CGI_REDIRECT" = "yes"; then
489 @@ -111,10 +111,10 @@
490 BUILD_CGI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
493 - BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
494 + BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(SAPI_EXTRA_LIBS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
497 - BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
498 + BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
502 --- php-5.2.8.vanilla/sapi/cgi/fastcgi.c 2008-10-21 20:43:59.000000000 +0400
503 +++ php-5.2.8.fpm/sapi/cgi/fastcgi.c 2008-12-09 04:02:34.000000000 +0300
509 +#include "fpm/fpm.h"
510 +#include "fpm/fpm_request.h"
518 return is_fastcgi = 0;
521 + fcgi_set_allowed_clients(getenv("FCGI_WEB_SERVER_ADDRS"));
525 @@ -249,12 +256,27 @@
529 +void fcgi_set_is_fastcgi(int new_value)
531 + is_fastcgi = new_value;
534 +void fcgi_set_in_shutdown(int new_value)
536 + in_shutdown = new_value;
539 void fcgi_shutdown(void)
541 if (is_initialized) {
542 zend_hash_destroy(&fcgi_mgmt_vars);
546 + if (allowed_clients) {
547 + free(allowed_clients);
548 + allowed_clients = 0;
557 +void fcgi_set_allowed_clients(char *ip)
567 + if (*cur == ',') n++;
570 + if (allowed_clients) free(allowed_clients);
571 + allowed_clients = malloc(sizeof(in_addr_t) * (n+2));
575 + end = strchr(cur, ',');
580 + allowed_clients[n] = inet_addr(cur);
581 + if (allowed_clients[n] == INADDR_NONE) {
582 + fprintf(stderr, "Wrong IP address '%s' in FCGI_WEB_SERVER_ADDRS\n", cur);
587 + allowed_clients[n] = INADDR_NONE;
592 static int is_port_number(const char *bindpath)
600 - char *ip = getenv("FCGI_WEB_SERVER_ADDRS");
609 - if (*cur == ',') n++;
612 - allowed_clients = malloc(sizeof(in_addr_t) * (n+2));
616 - end = strchr(cur, ',');
621 - allowed_clients[n] = inet_addr(cur);
622 - if (allowed_clients[n] == INADDR_NONE) {
623 - fprintf(stderr, "Wrong IP address '%s' in FCGI_WEB_SERVER_ADDRS\n", cur);
628 - allowed_clients[n] = INADDR_NONE;
633 if (!is_initialized) {
638 -static inline void fcgi_close(fcgi_request *req, int force, int destroy)
639 +void fcgi_close(fcgi_request *req, int force, int destroy)
642 zend_hash_destroy(&req->env);
649 + if (fpm) fpm_request_finished();
656 socklen_t len = sizeof(sa);
659 + if (fpm) fpm_request_accepting();
662 FCGI_LOCK(req->listen_socket);
663 req->fd = accept(listen_socket, (struct sockaddr *)&sa, &len);
664 FCGI_UNLOCK(req->listen_socket);
665 @@ -985,6 +1018,11 @@
671 + if (fpm) fpm_request_reading_headers();
674 #if defined(HAVE_SYS_POLL_H) && defined(HAVE_POLL)
677 --- php-5.2.8.vanilla/sapi/cgi/fastcgi.h 2008-10-21 20:43:59.000000000 +0400
678 +++ php-5.2.8.fpm/sapi/cgi/fastcgi.h 2008-12-09 04:02:39.000000000 +0300
681 void fcgi_shutdown(void);
682 int fcgi_is_fastcgi(void);
683 +void fcgi_set_is_fastcgi(int);
684 +void fcgi_set_in_shutdown(int);
685 +void fcgi_set_allowed_clients(char *);
686 int fcgi_in_shutdown(void);
687 int fcgi_listen(const char *path, int backlog);
688 void fcgi_init_request(fcgi_request *req, int listen_socket);
690 int fcgi_write(fcgi_request *req, fcgi_request_type type, const char *str, int len);
691 int fcgi_flush(fcgi_request *req, int close);
693 +void fcgi_close(fcgi_request *req, int force, int destroy);
696 void fcgi_impersonate(void);
698 --- php-5.2.8.vanilla/sapi/cgi/fpm/acinclude.m4 1970-01-01 03:00:00.000000000 +0300
699 +++ php-5.2.8.fpm/sapi/cgi/fpm/acinclude.m4 2008-11-16 17:44:51.000000000 +0300
702 +AC_DEFUN([AC_FPM_CHECK_FUNC],
704 + SAVED_CFLAGS="$CFLAGS"
705 + CFLAGS="$CFLAGS $2"
709 + AC_CHECK_FUNC([$1],[$4],[$5])
711 + CFLAGS="$SAVED_CFLAGS"
715 +AC_DEFUN([AC_FPM_LIBEVENT],
717 + AC_ARG_WITH([libevent],
718 + [ --with-libevent=DIR FPM: libevent install directory])
721 + LIBEVENT_LIBS="-levent"
722 + LIBEVENT_INCLUDE_PATH=""
724 + if test "$with_libevent" != "no" -a -n "$with_libevent"; then
725 + LIBEVENT_CFLAGS="-I$with_libevent/include"
726 + LIBEVENT_LIBS="-L$with_libevent/lib $LIBEVENT_LIBS"
727 + LIBEVENT_INCLUDE_PATH="$with_libevent/include"
730 + AC_MSG_CHECKING([for event.h])
734 + for dir in "$LIBEVENT_INCLUDE_PATH" /usr/include ; do
735 + if test -r "$dir/event.h" ; then
741 + AC_MSG_RESULT([$found])
743 + AC_FPM_CHECK_FUNC([event_set], [$LIBEVENT_CFLAGS], [$LIBEVENT_LIBS], ,
744 + [AC_MSG_ERROR([Failed to link with libevent. Perhaps --with-libevent=DIR option could help.])])
746 + AC_FPM_CHECK_FUNC([event_base_free], [$LIBEVENT_CFLAGS], [$LIBEVENT_LIBS], ,
747 + [AC_MSG_ERROR([You have too old version. libevent version >= 1.2 is required.])])
751 +AC_DEFUN([AC_FPM_LIBXML],
753 + AC_MSG_RESULT([checking for XML configuration])
755 + AC_ARG_WITH(xml-config,
756 + [ --with-xml-config=PATH FPM: use xml-config in PATH to find libxml],
757 + [XMLCONFIG="$withval"],
758 + [AC_PATH_PROGS(XMLCONFIG, [xml2-config xml-config], "")]
761 + if test "x$XMLCONFIG" = "x"; then
762 + AC_MSG_ERROR([XML configuration could not be found])
764 + AC_MSG_CHECKING([for libxml library])
766 + if test ! -x "$XMLCONFIG"; then
767 + AC_MSG_ERROR([$XMLCONFIG cannot be executed])
770 + LIBXML_LIBS="`$XMLCONFIG --libs`"
771 + LIBXML_CFLAGS="`$XMLCONFIG --cflags`"
772 + LIBXML_VERSION="`$XMLCONFIG --version`"
774 + AC_MSG_RESULT([yes, $LIBXML_VERSION])
776 + AC_FPM_CHECK_FUNC([xmlParseFile], [$LIBXML_CFLAGS], [$LIBXML_LIBS], ,
777 + [AC_MSG_ERROR([Failed to link with libxml])])
779 + AC_DEFINE(HAVE_LIBXML, 1, [do we have libxml?])
783 +AC_DEFUN([AC_FPM_JUDY],
785 + AC_ARG_WITH([Judy],
786 + [ --with-Judy=DIR FPM: Judy install directory])
790 + JUDY_INCLUDE_PATH=""
792 + if test "$with_Judy" != "no" -a -n "$with_Judy"; then
793 + JUDY_INCLUDE_PATH="$with_Judy/include"
794 + JUDY_CFLAGS="-I$with_Judy/include $JUDY_CFLAGS"
795 + JUDY_LIBS="-L$with_Judy/lib $JUDY_LIBS"
798 + AC_MSG_CHECKING([for Judy.h])
802 + for dir in "$JUDY_INCLUDE_PATH" /usr/include ; do
803 + if test -r "$dir/Judy.h" ; then
809 + AC_MSG_RESULT([$found])
811 + AC_FPM_CHECK_FUNC([JudyLCount], [$JUDY_CFLAGS], [$JUDY_LIBS], ,
812 + [AC_MSG_ERROR([Failed to link with Judy])])
816 +AC_DEFUN([AC_FPM_CLOCK],
818 + have_clock_gettime=no
820 + AC_MSG_CHECKING([for clock_gettime])
822 + AC_TRY_LINK([ #include <time.h> ], [struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts);], [
823 + have_clock_gettime=yes
824 + AC_MSG_RESULT([yes])
826 + AC_MSG_RESULT([no])
829 + if test "$have_clock_gettime" = "no"; then
830 + AC_MSG_CHECKING([for clock_gettime in -lrt])
835 + AC_TRY_LINK([ #include <time.h> ], [struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts);], [
836 + have_clock_gettime=yes
837 + AC_MSG_RESULT([yes])
840 + AC_MSG_RESULT([no])
844 + if test "$have_clock_gettime" = "yes"; then
845 + AC_DEFINE([HAVE_CLOCK_GETTIME], 1, [do we have clock_gettime?])
848 + have_clock_get_time=no
850 + if test "$have_clock_gettime" = "no"; then
851 + AC_MSG_CHECKING([for clock_get_time])
853 + AC_TRY_RUN([ #include <mach/mach.h>
854 + #include <mach/clock.h>
855 + #include <mach/mach_error.h>
859 + kern_return_t ret; clock_serv_t aClock; mach_timespec_t aTime;
860 + ret = host_get_clock_service(mach_host_self(), REALTIME_CLOCK, &aClock);
862 + if (ret != KERN_SUCCESS) {
866 + ret = clock_get_time(aClock, &aTime);
867 + if (ret != KERN_SUCCESS) {
874 + have_clock_get_time=yes
875 + AC_MSG_RESULT([yes])
877 + AC_MSG_RESULT([no])
881 + if test "$have_clock_get_time" = "yes"; then
882 + AC_DEFINE([HAVE_CLOCK_GET_TIME], 1, [do we have clock_get_time?])
886 +AC_DEFUN([AC_FPM_TRACE],
889 + have_broken_ptrace=no
891 + AC_MSG_CHECKING([for ptrace])
894 + #include <sys/types.h>
895 + #include <sys/ptrace.h> ], [ptrace(0, 0, (void *) 0, 0);], [
897 + AC_MSG_RESULT([yes])
899 + AC_MSG_RESULT([no])
902 + if test "$have_ptrace" = "yes"; then
903 + AC_MSG_CHECKING([whether ptrace works])
906 + #include <unistd.h>
907 + #include <signal.h>
908 + #include <sys/wait.h>
909 + #include <sys/types.h>
910 + #include <sys/ptrace.h>
913 + #if !defined(PTRACE_ATTACH) && defined(PT_ATTACH)
914 + #define PTRACE_ATTACH PT_ATTACH
917 + #if !defined(PTRACE_DETACH) && defined(PT_DETACH)
918 + #define PTRACE_DETACH PT_DETACH
921 + #if !defined(PTRACE_PEEKDATA) && defined(PT_READ_D)
922 + #define PTRACE_PEEKDATA PT_READ_D
927 + long v1 = (unsigned int) -1; /* copy will fail if sizeof(long) == 8 and we've got "int ptrace()" */
932 + if ( (child = fork()) ) { /* parent */
935 + if (0 > ptrace(PTRACE_ATTACH, child, 0, 0)) {
939 + waitpid(child, &status, 0);
942 + struct ptrace_io_desc ptio = {
943 + .piod_op = PIOD_READ_D,
946 + .piod_len = sizeof(v1)
949 + if (0 > ptrace(PT_IO, child, (void *) &ptio, 0)) {
955 + v2 = ptrace(PTRACE_PEEKDATA, child, (void *) &v1, 0);
961 + ptrace(PTRACE_DETACH, child, (void *) 1, 0);
963 + kill(child, SIGKILL);
965 + return ret ? ret : (v1 != v2);
973 + AC_MSG_RESULT([yes])
976 + have_broken_ptrace=yes
977 + AC_MSG_RESULT([no])
981 + if test "$have_ptrace" = "yes"; then
982 + AC_DEFINE([HAVE_PTRACE], 1, [do we have ptrace?])
985 + have_mach_vm_read=no
987 + if test "$have_broken_ptrace" = "yes"; then
988 + AC_MSG_CHECKING([for mach_vm_read])
990 + AC_TRY_COMPILE([ #include <mach/mach.h>
991 + #include <mach/mach_vm.h>
993 + mach_vm_read((vm_map_t)0, (mach_vm_address_t)0, (mach_vm_size_t)0, (vm_offset_t *)0, (mach_msg_type_number_t*)0);
995 + have_mach_vm_read=yes
996 + AC_MSG_RESULT([yes])
998 + AC_MSG_RESULT([no])
1002 + if test "$have_mach_vm_read" = "yes"; then
1003 + AC_DEFINE([HAVE_MACH_VM_READ], 1, [do we have mach_vm_read?])
1008 + if test -r /proc/$$/mem ; then
1009 + proc_mem_file="mem"
1011 + if test -r /proc/$$/as ; then
1012 + proc_mem_file="as"
1016 + if test -n "$proc_mem_file" ; then
1017 + AC_MSG_CHECKING([for proc mem file])
1020 + #define _GNU_SOURCE
1021 + #define _FILE_OFFSET_BITS 64
1022 + #include <stdint.h>
1023 + #include <unistd.h>
1024 + #include <sys/types.h>
1025 + #include <sys/stat.h>
1026 + #include <fcntl.h>
1027 + #include <stdio.h>
1030 + long v1 = (unsigned int) -1, v2 = 0;
1033 + sprintf(buf, "/proc/%d/$proc_mem_file", getpid());
1034 + fd = open(buf, O_RDONLY);
1038 + if (sizeof(long) != pread(fd, &v2, sizeof(long), (uintptr_t) &v1)) {
1046 + AC_MSG_RESULT([$proc_mem_file])
1049 + AC_MSG_RESULT([no])
1053 + if test -n "$proc_mem_file"; then
1054 + AC_DEFINE_UNQUOTED([PROC_MEM_FILE], "$proc_mem_file", [/proc/pid/mem interface])
1057 + if test "$have_ptrace" = "yes"; then
1058 + FPM_SOURCES="$FPM_SOURCES fpm_trace.c fpm_trace_ptrace.c"
1059 + elif test -n "$proc_mem_file"; then
1060 + FPM_SOURCES="$FPM_SOURCES fpm_trace.c fpm_trace_pread.c"
1061 + elif test "$have_mach_vm_read" = "yes" ; then
1062 + FPM_SOURCES="$FPM_SOURCES fpm_trace.c fpm_trace_mach.c"
1067 +AC_DEFUN([AC_FPM_PRCTL],
1069 + AC_MSG_CHECKING([for prctl])
1071 + AC_TRY_COMPILE([ #include <sys/prctl.h> ], [prctl(0, 0, 0, 0, 0);], [
1072 + AC_DEFINE([HAVE_PRCTL], 1, [do we have prctl?])
1073 + AC_MSG_RESULT([yes])
1075 + AC_MSG_RESULT([no])
1078 --- php-5.2.8.vanilla/sapi/cgi/fpm/conf/php-fpm.conf.in 1970-01-01 03:00:00.000000000 +0300
1079 +++ php-5.2.8.fpm/sapi/cgi/fpm/conf/php-fpm.conf.in 2008-05-23 01:08:35.000000000 +0400
1081 +<?xml version="1.0" ?>
1084 + All relative paths in this config are relative to php's install prefix
1086 + <section name="global_options">
1089 + <value name="pid_file">@php_fpm_pid_path@</value>
1092 + <value name="error_log">@php_fpm_log_path@</value>
1095 + <value name="log_level">notice</value>
1097 + When this amount of php processes exited with SIGSEGV or SIGBUS ...
1098 + <value name="emergency_restart_threshold">10</value>
1100 + ... in a less than this interval of time, a graceful restart will be initiated.
1101 + Useful to work around accidental curruptions in accelerator's shared memory.
1102 + <value name="emergency_restart_interval">1m</value>
1104 + Time limit on waiting child's reaction on signals from master
1105 + <value name="process_control_timeout">5s</value>
1107 + Set to 'no' to debug fpm
1108 + <value name="daemonize">yes</value>
1114 + <section name="pool">
1116 + Name of pool. Used in logs and stats.
1117 + <value name="name">default</value>
1119 + Address to accept fastcgi requests on.
1120 + Valid syntax is 'ip.ad.re.ss:port' or just 'port' or '/path/to/unix/socket'
1121 + <value name="listen_address">127.0.0.1:9000</value>
1123 + <value name="listen_options">
1125 + Set listen(2) backlog
1126 + <value name="backlog">-1</value>
1128 + Set permissions for unix socket, if one used.
1129 + In Linux read/write permissions must be set in order to allow connections from web server.
1130 + Many BSD-derrived systems allow connections regardless of permissions.
1131 + <value name="owner"></value>
1132 + <value name="group"></value>
1133 + <value name="mode">0666</value>
1136 + Additional php.ini defines, specific to this pool of workers.
1137 + <value name="php_defines">
1138 + <!-- <value name="sendmail_path">/usr/sbin/sendmail -t -i</value> -->
1139 + <!-- <value name="display_errors">0</value> -->
1142 + Unix user of processes
1143 + <!-- <value name="user">nobody</value> -->
1145 + Unix group of processes
1146 + <!-- <value name="group">@php_fpm_group@</value> -->
1148 + Process manager settings
1151 + Sets style of controling worker process count.
1152 + Valid values are 'static' and 'apache-like'
1153 + <value name="style">static</value>
1155 + Sets the limit on the number of simultaneous requests that will be served.
1156 + Equivalent to Apache MaxClients directive.
1157 + Equivalent to PHP_FCGI_CHILDREN environment in original php.fcgi
1158 + Used with any pm_style.
1159 + <value name="max_children">5</value>
1161 + Settings group for 'apache-like' pm style
1162 + <value name="apache_like">
1164 + Sets the number of server processes created on startup.
1165 + Used only when 'apache-like' pm_style is selected
1166 + <value name="StartServers">20</value>
1168 + Sets the desired minimum number of idle server processes.
1169 + Used only when 'apache-like' pm_style is selected
1170 + <value name="MinSpareServers">5</value>
1172 + Sets the desired maximum number of idle server processes.
1173 + Used only when 'apache-like' pm_style is selected
1174 + <value name="MaxSpareServers">35</value>
1180 + The timeout (in seconds) for serving a single request after which the worker process will be terminated
1181 + Should be used when 'max_execution_time' ini option does not stop script execution for some reason
1183 + <value name="request_terminate_timeout">0s</value>
1185 + The timeout (in seconds) for serving of single request after which a php backtrace will be dumped to slow.log file
1187 + <value name="request_slowlog_timeout">0s</value>
1189 + The log file for slow requests
1190 + <value name="slowlog">logs/slow.log</value>
1192 + Set open file desc rlimit
1193 + <value name="rlimit_files">1024</value>
1195 + Set max core size rlimit
1196 + <value name="rlimit_core">0</value>
1198 + Chroot to this directory at the start, absolute path
1199 + <value name="chroot"></value>
1201 + Chdir to this directory at the start, absolute path
1202 + <value name="chdir"></value>
1204 + Redirect workers' stdout and stderr into main error log.
1205 + If not set, they will be redirected to /dev/null, according to FastCGI specs
1206 + <value name="catch_workers_output">yes</value>
1208 + How much requests each process should execute before respawn.
1209 + Useful to work around memory leaks in 3rd party libraries.
1210 + For endless request processing please specify 0
1211 + Equivalent to PHP_FCGI_MAX_REQUESTS
1212 + <value name="max_requests">500</value>
1214 + Comma separated list of ipv4 addresses of FastCGI clients that allowed to connect.
1215 + Equivalent to FCGI_WEB_SERVER_ADDRS environment in original php.fcgi (5.2.2+)
1216 + Makes sense only with AF_INET listening socket.
1217 + <value name="allowed_clients">127.0.0.1</value>
1219 + Pass environment variables like LD_LIBRARY_PATH
1220 + All $VARIABLEs are taken from current environment
1221 + <value name="environment">
1222 + <value name="HOSTNAME">$HOSTNAME</value>
1223 + <value name="PATH">/usr/local/bin:/usr/bin:/bin</value>
1224 + <value name="TMP">/tmp</value>
1225 + <value name="TMPDIR">/tmp</value>
1226 + <value name="TEMP">/tmp</value>
1227 + <value name="OSTYPE">$OSTYPE</value>
1228 + <value name="MACHTYPE">$MACHTYPE</value>
1229 + <value name="MALLOC_CHECK_">2</value>
1237 --- php-5.2.8.vanilla/sapi/cgi/fpm/config.m4 1970-01-01 03:00:00.000000000 +0300
1238 +++ php-5.2.8.fpm/sapi/cgi/fpm/config.m4 2008-12-13 07:21:53.000000000 +0300
1241 +FPM_VERSION="0.5.10"
1243 +PHP_ARG_WITH(fpm-conf, for php-fpm config file path,
1244 +[ --with-fpm-conf=PATH Set the path for php-fpm configuration file [PREFIX/etc/php-fpm.conf]], \$prefix/etc/php-fpm.conf, no)
1246 +PHP_ARG_WITH(fpm-log, for php-fpm log file path,
1247 +[ --with-fpm-log=PATH Set the path for php-fpm log file [PREFIX/logs/php-fpm.log]], \$prefix/logs/php-fpm.log, no)
1249 +PHP_ARG_WITH(fpm-pid, for php-fpm pid file path,
1250 +[ --with-fpm-pid=PATH Set the path for php-fpm pid file [PREFIX/logs/php-fpm.pid]], \$prefix/logs/php-fpm.pid, no)
1252 +FPM_SOURCES="fpm.c \
1256 + fpm_worker_pool.c \
1265 + fpm_process_ctl.c \
1273 +dnl AC_FPM_LIBEVENT
1281 +LIBEVENT_LIBS="-levent"
1283 +SAPI_EXTRA_DEPS="$LIBEVENT_LIBS"
1285 +FPM_CFLAGS="$LIBEVENT_CFLAGS $LIBXML_CFLAGS $JUDY_CFLAGS"
1287 +dnl FPM_CFLAGS="$FPM_CFLAGS -DJUDYERROR_NOTEST" # for Judy
1288 +FPM_CFLAGS="$FPM_CFLAGS -I$abs_srcdir/sapi/cgi" # for fastcgi.h
1290 +if test "$ICC" = "yes" ; then
1291 + FPM_ADD_CFLAGS="-Wall -wd279,310,869,810,981"
1292 +elif test "$GCC" = "yes" ; then
1293 + FPM_ADD_CFLAGS="-Wall -Wpointer-arith -Wno-unused-parameter -Wunused-variable -Wunused-value -fno-strict-aliasing"
1296 +if test -n "$FPM_WERROR" ; then
1297 + FPM_ADD_CFLAGS="$FPM_ADD_CFLAGS -Werror"
1300 +FPM_CFLAGS="$FPM_ADD_CFLAGS $FPM_CFLAGS"
1302 +PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/cgi/fpm/Makefile.frag)
1304 +PHP_ADD_SOURCES(sapi/cgi/fpm, $FPM_SOURCES, $FPM_CFLAGS, sapi)
1306 +PHP_ADD_BUILD_DIR(sapi/cgi/fpm)
1308 +install_fpm="install-fpm"
1310 +SAPI_EXTRA_LIBS="$LIBEVENT_LIBS $LIBXML_LIBS $JUDY_LIBS"
1313 +if test "$prefix" = "NONE" ; then
1314 + fpm_prefix=/usr/local
1316 + fpm_prefix="$prefix"
1319 +if test "$PHP_FPM_CONF" = "\$prefix/etc/php-fpm.conf" ; then
1320 + php_fpm_conf_path="$fpm_prefix/etc/php-fpm.conf"
1322 + php_fpm_conf_path="$PHP_FPM_CONF"
1325 +if test "$PHP_FPM_LOG" = "\$prefix/logs/php-fpm.log" ; then
1326 + php_fpm_log_path="$fpm_prefix/logs/php-fpm.log"
1328 + php_fpm_log_path="$PHP_FPM_LOG"
1331 +if test "$PHP_FPM_PID" = "\$prefix/logs/php-fpm.pid" ; then
1332 + php_fpm_pid_path="$fpm_prefix/logs/php-fpm.pid"
1334 + php_fpm_pid_path="$PHP_FPM_PID"
1338 +if grep nobody /etc/group >/dev/null 2>&1; then
1339 + php_fpm_group=nobody
1341 + if grep nogroup /etc/group >/dev/null 2>&1; then
1342 + php_fpm_group=nogroup
1344 + php_fpm_group=nobody
1348 +PHP_SUBST_OLD(php_fpm_conf_path)
1349 +PHP_SUBST_OLD(php_fpm_log_path)
1350 +PHP_SUBST_OLD(php_fpm_pid_path)
1351 +PHP_SUBST_OLD(php_fpm_group)
1352 +PHP_SUBST_OLD(FPM_VERSION)
1354 +PHP_OUTPUT(sapi/cgi/fpm/fpm_autoconf.h)
1355 +PHP_OUTPUT(sapi/cgi/fpm/php-fpm.conf:sapi/cgi/fpm/conf/php-fpm.conf.in)
1356 +PHP_OUTPUT(sapi/cgi/fpm/php-fpm:sapi/cgi/fpm/init.d/php-fpm.in)
1357 diff -Nru php-5.2.8.vanilla/sapi/cgi/fpm/fpm_arrays.h php-5.2.8.fpm/sapi/cgi/fpm/fpm_arrays.h
1358 --- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_arrays.h 1970-01-01 03:00:00.000000000 +0300
1359 +++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_arrays.h 2008-05-24 21:38:47.000000000 +0400
1363 + /* (c) 2007,2008 Andrei Nigmatulin */
1365 +#ifndef FPM_ARRAYS_H
1366 +#define FPM_ARRAYS_H 1
1368 +#include <stdlib.h>
1369 +#include <string.h>
1371 +struct fpm_array_s {
1378 +static inline struct fpm_array_s *fpm_array_init(struct fpm_array_s *a, unsigned int sz, unsigned int initial_num)
1380 + void *allocated = 0;
1383 + a = malloc(sizeof(struct fpm_array_s));
1394 + a->data = calloc(sz, initial_num);
1401 + a->allocated = initial_num;
1407 +static inline void *fpm_array_item(struct fpm_array_s *a, unsigned int n)
1411 + ret = (char *) a->data + a->sz * n;
1416 +static inline void *fpm_array_item_last(struct fpm_array_s *a)
1418 + return fpm_array_item(a, a->used - 1);
1421 +static inline int fpm_array_item_remove(struct fpm_array_s *a, unsigned int n)
1425 + if (n < a->used - 1) {
1426 + void *last = fpm_array_item(a, a->used - 1);
1427 + void *to_remove = fpm_array_item(a, n);
1429 + memcpy(to_remove, last, a->sz);
1439 +static inline void *fpm_array_push(struct fpm_array_s *a)
1443 + if (a->used == a->allocated) {
1444 + size_t new_allocated = a->allocated ? a->allocated * 2 : 20;
1445 + void *new_ptr = realloc(a->data, a->sz * new_allocated);
1451 + a->data = new_ptr;
1452 + a->allocated = new_allocated;
1455 + ret = fpm_array_item(a, a->used);
1462 +static inline void fpm_array_free(struct fpm_array_s *a)
1467 + a->used = a->allocated = 0;
1471 --- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_atomic.h 1970-01-01 03:00:00.000000000 +0300
1472 +++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_atomic.h 2008-09-19 03:34:11.000000000 +0400
1476 + /* (c) 2007,2008 Andrei Nigmatulin */
1478 +#ifndef FPM_ATOMIC_H
1479 +#define FPM_ATOMIC_H 1
1481 +#include <stdint.h>
1484 +#if ( __i386__ || __i386 )
1486 +typedef int32_t atomic_int_t;
1487 +typedef uint32_t atomic_uint_t;
1488 +typedef volatile atomic_uint_t atomic_t;
1491 +static inline atomic_int_t atomic_fetch_add(atomic_t *value, atomic_int_t add)
1493 + __asm__ volatile ( "lock;" "xaddl %0, %1;" :
1494 + "+r" (add) : "m" (*value) : "memory");
1499 +static inline atomic_uint_t atomic_cmp_set(atomic_t *lock, atomic_uint_t old, atomic_uint_t set)
1501 + unsigned char res;
1503 + __asm__ volatile ( "lock;" "cmpxchgl %3, %1;" "sete %0;" :
1504 + "=a" (res) : "m" (*lock), "a" (old), "r" (set) : "memory");
1509 +#elif ( __amd64__ || __amd64 )
1511 +typedef int64_t atomic_int_t;
1512 +typedef uint64_t atomic_uint_t;
1513 +typedef volatile atomic_uint_t atomic_t;
1515 +static inline atomic_int_t atomic_fetch_add(atomic_t *value, atomic_int_t add)
1517 + __asm__ volatile ( "lock;" "xaddq %0, %1;" :
1518 + "+r" (add) : "m" (*value) : "memory");
1523 +static inline atomic_uint_t atomic_cmp_set(atomic_t *lock, atomic_uint_t old, atomic_uint_t set)
1525 + unsigned char res;
1527 + __asm__ volatile ( "lock;" "cmpxchgq %3, %1;" "sete %0;" :
1528 + "=a" (res) : "m" (*lock), "a" (old), "r" (set) : "memory");
1535 +#error unsupported processor. please write a patch and send it to me
1539 +static inline int fpm_spinlock(atomic_t *lock, int try_once)
1542 + return atomic_cmp_set(lock, 0, 1) ? 0 : -1;
1547 + if (atomic_cmp_set(lock, 0, 1)) {
1559 --- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_autoconf.h.in 1970-01-01 03:00:00.000000000 +0300
1560 +++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_autoconf.h.in 2008-05-24 21:38:47.000000000 +0400
1564 + /* (c) 2007,2008 Andrei Nigmatulin */
1566 +#define PHP_FPM_VERSION "@FPM_VERSION@"
1567 +#define PHP_FPM_CONF_PATH "@php_fpm_conf_path@"
1568 +#define PHP_FPM_LOG_PATH "@php_fpm_log_path@"
1569 +#define PHP_FPM_PID_PATH "@php_fpm_pid_path@"
1571 --- php-5.2.8.vanilla/sapi/cgi/fpm/fpm.c 1970-01-01 03:00:00.000000000 +0300
1572 +++ php-5.2.8.fpm/sapi/cgi/fpm/fpm.c 2008-07-20 20:38:31.000000000 +0400
1576 + /* (c) 2007,2008 Andrei Nigmatulin */
1578 +#include "fpm_config.h"
1580 +#include <stdlib.h> /* for exit */
1583 +#include "fpm_children.h"
1584 +#include "fpm_signals.h"
1585 +#include "fpm_env.h"
1586 +#include "fpm_events.h"
1587 +#include "fpm_cleanup.h"
1588 +#include "fpm_php.h"
1589 +#include "fpm_sockets.h"
1590 +#include "fpm_unix.h"
1591 +#include "fpm_process_ctl.h"
1592 +#include "fpm_conf.h"
1593 +#include "fpm_worker_pool.h"
1594 +#include "fpm_stdio.h"
1599 +struct fpm_globals_s fpm_globals;
1601 +int fpm_init(int argc, char **argv, char *config)
1603 + fpm_globals.argc = argc;
1604 + fpm_globals.argv = argv;
1605 + fpm_globals.config = config;
1607 + if (0 > fpm_php_init_main() ||
1608 + 0 > fpm_stdio_init_main() ||
1609 + 0 > fpm_conf_init_main() ||
1610 + 0 > fpm_unix_init_main() ||
1611 + 0 > fpm_env_init_main() ||
1612 + 0 > fpm_signals_init_main() ||
1613 + 0 > fpm_pctl_init_main() ||
1614 + 0 > fpm_children_init_main() ||
1615 + 0 > fpm_sockets_init_main() ||
1616 + 0 > fpm_worker_pool_init_main() ||
1617 + 0 > fpm_event_init_main()) {
1621 + if (0 > fpm_conf_write_pid()) {
1625 + zlog(ZLOG_STUFF, ZLOG_NOTICE, "fpm is running, pid %d", (int) fpm_globals.parent_pid);
1630 +/* children: return listening socket
1631 + parent: never return */
1632 +int fpm_run(int *max_requests)
1634 + struct fpm_worker_pool_s *wp;
1636 + /* create initial children in all pools */
1637 + for (wp = fpm_worker_all_pools; wp; wp = wp->next) {
1640 + is_parent = fpm_children_create_initial(wp);
1647 + /* run event loop forever */
1650 +run_child: /* only workers reach this point */
1652 + fpm_cleanups_run(FPM_CLEANUP_CHILD);
1654 + *max_requests = fpm_globals.max_requests;
1655 + return fpm_globals.listening_socket;
1658 --- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_children.c 1970-01-01 03:00:00.000000000 +0300
1659 +++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_children.c 2008-12-13 06:21:18.000000000 +0300
1663 + /* (c) 2007,2008 Andrei Nigmatulin */
1665 +#include "fpm_config.h"
1667 +#include <sys/types.h>
1668 +#include <sys/wait.h>
1670 +#include <unistd.h>
1671 +#include <string.h>
1675 +#include "fpm_children.h"
1676 +#include "fpm_signals.h"
1677 +#include "fpm_worker_pool.h"
1678 +#include "fpm_sockets.h"
1679 +#include "fpm_process_ctl.h"
1680 +#include "fpm_php.h"
1681 +#include "fpm_conf.h"
1682 +#include "fpm_cleanup.h"
1683 +#include "fpm_events.h"
1684 +#include "fpm_clock.h"
1685 +#include "fpm_stdio.h"
1686 +#include "fpm_unix.h"
1687 +#include "fpm_env.h"
1688 +#include "fpm_shm_slots.h"
1692 +static time_t *last_faults;
1695 +static int fpm_children_make(struct fpm_worker_pool_s *wp, int in_event_loop);
1697 +static void fpm_children_cleanup(int which, void *arg)
1699 + free(last_faults);
1702 +static struct fpm_child_s *fpm_child_alloc()
1704 + struct fpm_child_s *ret;
1706 + ret = malloc(sizeof(struct fpm_child_s));
1708 + if (!ret) return 0;
1710 + memset(ret, 0, sizeof(*ret));
1715 +static void fpm_child_free(struct fpm_child_s *child)
1720 +static void fpm_child_close(struct fpm_child_s *child, int in_event_loop)
1722 + if (child->fd_stdout != -1) {
1723 + if (in_event_loop) {
1724 + fpm_event_fire(&child->ev_stdout);
1726 + if (child->fd_stdout != -1) {
1727 + close(child->fd_stdout);
1731 + if (child->fd_stderr != -1) {
1732 + if (in_event_loop) {
1733 + fpm_event_fire(&child->ev_stderr);
1735 + if (child->fd_stderr != -1) {
1736 + close(child->fd_stderr);
1740 + fpm_child_free(child);
1743 +static void fpm_child_link(struct fpm_child_s *child)
1745 + struct fpm_worker_pool_s *wp = child->wp;
1747 + ++wp->running_children;
1748 + ++fpm_globals.running_children;
1750 + child->next = wp->children;
1751 + if (child->next) child->next->prev = child;
1753 + wp->children = child;
1756 +static void fpm_child_unlink(struct fpm_child_s *child)
1758 + --child->wp->running_children;
1759 + --fpm_globals.running_children;
1761 + if (child->prev) child->prev->next = child->next;
1762 + else child->wp->children = child->next;
1763 + if (child->next) child->next->prev = child->prev;
1767 +static struct fpm_child_s *fpm_child_find(pid_t pid)
1769 + struct fpm_worker_pool_s *wp;
1770 + struct fpm_child_s *child = 0;
1772 + for (wp = fpm_worker_all_pools; wp; wp = wp->next) {
1774 + for (child = wp->children; child; child = child->next) {
1775 + if (child->pid == pid) {
1790 +static void fpm_child_init(struct fpm_worker_pool_s *wp)
1792 + fpm_globals.max_requests = wp->config->max_requests;
1794 + if (0 > fpm_stdio_init_child(wp) ||
1795 + 0 > fpm_unix_init_child(wp) ||
1796 + 0 > fpm_signals_init_child() ||
1797 + 0 > fpm_env_init_child(wp) ||
1798 + 0 > fpm_php_init_child(wp)) {
1800 + zlog(ZLOG_STUFF, ZLOG_ERROR, "child failed to initialize (pool %s)", wp->config->name);
1805 +int fpm_children_free(struct fpm_child_s *child)
1807 + struct fpm_child_s *next;
1809 + for (; child; child = next) {
1810 + next = child->next;
1811 + fpm_child_close(child, 0 /* in_event_loop */);
1817 +void fpm_children_bury()
1821 + struct fpm_child_s *child;
1823 + while ( (pid = waitpid(-1, &status, WNOHANG | WUNTRACED)) > 0) {
1825 + int severity = ZLOG_NOTICE;
1827 + child = fpm_child_find(pid);
1829 + if (WIFEXITED(status)) {
1831 + snprintf(buf, sizeof(buf), "with code %d", WEXITSTATUS(status));
1833 + if (WEXITSTATUS(status) != 0) {
1834 + severity = ZLOG_WARNING;
1838 + else if (WIFSIGNALED(status)) {
1839 + const char *signame = fpm_signal_names[WTERMSIG(status)];
1840 + const char *have_core = WCOREDUMP(status) ? " (core dumped)" : "";
1842 + if (signame == NULL) {
1846 + snprintf(buf, sizeof(buf), "on signal %d %s%s", WTERMSIG(status), signame, have_core);
1848 + if (WTERMSIG(status) != SIGQUIT) { /* possible request loss */
1849 + severity = ZLOG_WARNING;
1852 + else if (WIFSTOPPED(status)) {
1854 + zlog(ZLOG_STUFF, ZLOG_NOTICE, "child %d stopped for tracing", (int) pid);
1856 + if (child && child->tracer) {
1857 + child->tracer(child);
1864 + struct fpm_worker_pool_s *wp = child->wp;
1865 + struct timeval tv1, tv2;
1867 + fpm_child_unlink(child);
1869 + fpm_shm_slots_discard_slot(child);
1871 + fpm_clock_get(&tv1);
1873 + timersub(&tv1, &child->started, &tv2);
1875 + zlog(ZLOG_STUFF, severity, "child %d (pool %s) exited %s after %ld.%06d seconds from start", (int) pid,
1876 + child->wp->config->name, buf, tv2.tv_sec, (int) tv2.tv_usec);
1878 + fpm_child_close(child, 1 /* in event_loop */);
1880 + fpm_pctl_child_exited();
1882 + if (last_faults && (WTERMSIG(status) == SIGSEGV || WTERMSIG(status) == SIGBUS)) {
1883 + time_t now = tv1.tv_sec;
1884 + int restart_condition = 1;
1887 + last_faults[fault++] = now;
1889 + if (fault == fpm_global_config.emergency_restart_threshold) {
1893 + for (i = 0; i < fpm_global_config.emergency_restart_threshold; i++) {
1894 + if (now - last_faults[i] > fpm_global_config.emergency_restart_interval) {
1895 + restart_condition = 0;
1900 + if (restart_condition) {
1902 + zlog(ZLOG_STUFF, ZLOG_WARNING, "failed processes threshold (%d in %d sec) is reached, initiating reload",
1903 + fpm_global_config.emergency_restart_threshold, fpm_global_config.emergency_restart_interval);
1905 + fpm_pctl(FPM_PCTL_STATE_RELOADING, FPM_PCTL_ACTION_SET);
1909 + fpm_children_make(wp, 1 /* in event loop */);
1911 + if (fpm_globals.is_child) {
1916 + zlog(ZLOG_STUFF, ZLOG_ALERT, "oops, unknown child exited %s", buf);
1922 +static struct fpm_child_s *fpm_resources_prepare(struct fpm_worker_pool_s *wp)
1924 + struct fpm_child_s *c;
1926 + c = fpm_child_alloc();
1929 + zlog(ZLOG_STUFF, ZLOG_ERROR, "malloc failed (pool %s)", wp->config->name);
1934 + c->fd_stdout = -1; c->fd_stderr = -1;
1936 + if (0 > fpm_stdio_prepare_pipes(c)) {
1937 + fpm_child_free(c);
1941 + if (0 > fpm_shm_slots_prepare_slot(c)) {
1942 + fpm_stdio_discard_pipes(c);
1943 + fpm_child_free(c);
1950 +static void fpm_resources_discard(struct fpm_child_s *child)
1952 + fpm_shm_slots_discard_slot(child);
1953 + fpm_stdio_discard_pipes(child);
1954 + fpm_child_free(child);
1957 +static void fpm_child_resources_use(struct fpm_child_s *child)
1959 + fpm_shm_slots_child_use_slot(child);
1960 + fpm_stdio_child_use_pipes(child);
1961 + fpm_child_free(child);
1964 +static void fpm_parent_resources_use(struct fpm_child_s *child)
1966 + fpm_shm_slots_parent_use_slot(child);
1967 + fpm_stdio_parent_use_pipes(child);
1968 + fpm_child_link(child);
1971 +static int fpm_children_make(struct fpm_worker_pool_s *wp, int in_event_loop)
1975 + struct fpm_child_s *child;
1977 + while (!enough && fpm_pctl_can_spawn_children() && wp->running_children < wp->config->pm->max_children) {
1979 + child = fpm_resources_prepare(wp);
1991 + fpm_child_resources_use(child);
1992 + fpm_globals.is_child = 1;
1993 + if (in_event_loop) {
1994 + fpm_event_exit_loop();
1996 + fpm_child_init(wp);
2000 + zlog(ZLOG_STUFF, ZLOG_SYSERROR, "fork() failed");
2003 + fpm_resources_discard(child);
2005 + break; /* dont try any more on error */
2009 + fpm_clock_get(&child->started);
2010 + fpm_parent_resources_use(child);
2012 + zlog(ZLOG_STUFF, ZLOG_NOTICE, "child %d (pool %s) started", (int) pid, wp->config->name);
2017 + return 1; /* we are done */
2020 +int fpm_children_create_initial(struct fpm_worker_pool_s *wp)
2022 + return fpm_children_make(wp, 0 /* not in event loop yet */);
2025 +int fpm_children_init_main()
2027 + if (fpm_global_config.emergency_restart_threshold &&
2028 + fpm_global_config.emergency_restart_interval) {
2030 + last_faults = malloc(sizeof(time_t) * fpm_global_config.emergency_restart_threshold);
2032 + if (!last_faults) {
2036 + memset(last_faults, 0, sizeof(time_t) * fpm_global_config.emergency_restart_threshold);
2039 + if (0 > fpm_cleanup_add(FPM_CLEANUP_ALL, fpm_children_cleanup, 0)) {
2046 --- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_children.h 1970-01-01 03:00:00.000000000 +0300
2047 +++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_children.h 2008-05-24 21:38:47.000000000 +0400
2051 + /* (c) 2007,2008 Andrei Nigmatulin */
2053 +#ifndef FPM_CHILDREN_H
2054 +#define FPM_CHILDREN_H 1
2056 +#include <sys/time.h>
2057 +#include <sys/types.h>
2060 +#include "fpm_worker_pool.h"
2062 +int fpm_children_create_initial(struct fpm_worker_pool_s *wp);
2063 +int fpm_children_free(struct fpm_child_s *child);
2064 +void fpm_children_bury();
2065 +int fpm_children_init_main();
2067 +struct fpm_child_s;
2069 +struct fpm_child_s {
2070 + struct fpm_child_s *prev, *next;
2071 + struct timeval started;
2072 + struct fpm_worker_pool_s *wp;
2073 + struct event ev_stdout, ev_stderr;
2075 + int fd_stdout, fd_stderr;
2076 + void (*tracer)(struct fpm_child_s *);
2077 + struct timeval slow_logged;
2082 --- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_cleanup.c 1970-01-01 03:00:00.000000000 +0300
2083 +++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_cleanup.c 2008-05-24 21:38:47.000000000 +0400
2087 + /* (c) 2007,2008 Andrei Nigmatulin */
2089 +#include "fpm_config.h"
2091 +#include <stdlib.h>
2093 +#include "fpm_arrays.h"
2094 +#include "fpm_cleanup.h"
2099 + void (*cleanup)(int, void *);
2103 +static struct fpm_array_s cleanups = { .sz = sizeof(struct cleanup_s) };
2105 +int fpm_cleanup_add(int type, void (*cleanup)(int, void *), void *arg)
2107 + struct cleanup_s *c;
2109 + c = fpm_array_push(&cleanups);
2116 + c->cleanup = cleanup;
2122 +void fpm_cleanups_run(int type)
2124 + struct cleanup_s *c = fpm_array_item_last(&cleanups);
2125 + int cl = cleanups.used;
2127 + for ( ; cl--; c--) {
2128 + if (c->type & type) {
2129 + c->cleanup(type, c->arg);
2133 + fpm_array_free(&cleanups);
2136 --- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_cleanup.h 1970-01-01 03:00:00.000000000 +0300
2137 +++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_cleanup.h 2008-05-24 21:38:47.000000000 +0400
2141 + /* (c) 2007,2008 Andrei Nigmatulin */
2143 +#ifndef FPM_CLEANUP_H
2144 +#define FPM_CLEANUP_H 1
2146 +int fpm_cleanup_add(int type, void (*cleanup)(int, void *), void *);
2147 +void fpm_cleanups_run(int type);
2150 + FPM_CLEANUP_CHILD = (1 << 0),
2151 + FPM_CLEANUP_PARENT_EXIT = (1 << 1),
2152 + FPM_CLEANUP_PARENT_EXIT_MAIN = (1 << 2),
2153 + FPM_CLEANUP_PARENT_EXEC = (1 << 3),
2154 + FPM_CLEANUP_PARENT = (1 << 1) | (1 << 2) | (1 << 3),
2155 + FPM_CLEANUP_ALL = ~0,
2160 --- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_clock.c 1970-01-01 03:00:00.000000000 +0300
2161 +++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_clock.c 2008-09-19 03:19:59.000000000 +0400
2165 + /* (c) 2007,2008 Andrei Nigmatulin */
2167 +#include "fpm_config.h"
2169 +#if defined(HAVE_CLOCK_GETTIME)
2170 +#include <time.h> /* for CLOCK_MONOTONIC */
2173 +#include "fpm_clock.h"
2177 +/* posix monotonic clock - preferred source of time */
2178 +#if defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_MONOTONIC)
2180 +static int monotonic_works;
2182 +int fpm_clock_init()
2184 + struct timespec ts;
2186 + monotonic_works = 0;
2188 + if (0 == clock_gettime(CLOCK_MONOTONIC, &ts)) {
2189 + monotonic_works = 1;
2195 +int fpm_clock_get(struct timeval *tv)
2197 + if (monotonic_works) {
2198 + struct timespec ts;
2200 + if (0 > clock_gettime(CLOCK_MONOTONIC, &ts)) {
2201 + zlog(ZLOG_STUFF, ZLOG_SYSERROR, "clock_gettime() failed");
2205 + tv->tv_sec = ts.tv_sec;
2206 + tv->tv_usec = ts.tv_nsec / 1000;
2210 + return gettimeofday(tv, 0);
2214 +#elif defined(HAVE_CLOCK_GET_TIME)
2216 +#include <mach/mach.h>
2217 +#include <mach/clock.h>
2218 +#include <mach/mach_error.h>
2220 +static clock_serv_t mach_clock;
2222 +/* this code borrowed from here: http://lists.apple.com/archives/Darwin-development/2002/Mar/msg00746.html */
2223 +/* mach_clock also should be re-initialized in child process after fork */
2224 +int fpm_clock_init()
2226 + kern_return_t ret;
2227 + mach_timespec_t aTime;
2229 + ret = host_get_clock_service(mach_host_self(), REALTIME_CLOCK, &mach_clock);
2231 + if (ret != KERN_SUCCESS) {
2232 + zlog(ZLOG_STUFF, ZLOG_ERROR, "host_get_clock_service() failed: %s", mach_error_string(ret));
2236 + /* test if it works */
2237 + ret = clock_get_time(mach_clock, &aTime);
2239 + if (ret != KERN_SUCCESS) {
2240 + zlog(ZLOG_STUFF, ZLOG_ERROR, "clock_get_time() failed: %s", mach_error_string(ret));
2247 +int fpm_clock_get(struct timeval *tv)
2249 + kern_return_t ret;
2250 + mach_timespec_t aTime;
2252 + ret = clock_get_time(mach_clock, &aTime);
2254 + if (ret != KERN_SUCCESS) {
2255 + zlog(ZLOG_STUFF, ZLOG_ERROR, "clock_get_time() failed: %s", mach_error_string(ret));
2259 + tv->tv_sec = aTime.tv_sec;
2260 + tv->tv_usec = aTime.tv_nsec / 1000;
2265 +#else /* no clock */
2267 +int fpm_clock_init()
2272 +int fpm_clock_get(struct timeval *tv)
2274 + return gettimeofday(tv, 0);
2278 --- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_clock.h 1970-01-01 03:00:00.000000000 +0300
2279 +++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_clock.h 2008-05-24 21:38:47.000000000 +0400
2283 + /* (c) 2007,2008 Andrei Nigmatulin */
2285 +#ifndef FPM_CLOCK_H
2286 +#define FPM_CLOCK_H 1
2288 +#include <sys/time.h>
2290 +int fpm_clock_init();
2291 +int fpm_clock_get(struct timeval *tv);
2294 --- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_conf.c 1970-01-01 03:00:00.000000000 +0300
2295 +++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_conf.c 2008-12-13 06:50:29.000000000 +0300
2299 + /* (c) 2007,2008 Andrei Nigmatulin */
2301 +#include "fpm_config.h"
2303 +#include <sys/types.h>
2304 +#include <sys/stat.h>
2306 +#include <string.h>
2307 +#include <stdlib.h>
2308 +#include <stddef.h>
2309 +#include <stdint.h>
2311 +#include <unistd.h>
2314 +#include "fpm_conf.h"
2315 +#include "fpm_stdio.h"
2316 +#include "fpm_worker_pool.h"
2317 +#include "fpm_cleanup.h"
2318 +#include "fpm_php.h"
2319 +#include "fpm_sockets.h"
2320 +#include "xml_config.h"
2324 +struct fpm_global_config_s fpm_global_config;
2326 +static void *fpm_global_config_ptr()
2328 + return &fpm_global_config;
2331 +static char *fpm_conf_set_log_level(void **conf, char *name, void *vv, intptr_t offset)
2335 + if (!strcmp(value, "debug")) {
2336 + fpm_globals.log_level = ZLOG_DEBUG;
2338 + else if (!strcmp(value, "notice")) {
2339 + fpm_globals.log_level = ZLOG_NOTICE;
2341 + else if (!strcmp(value, "warn")) {
2342 + fpm_globals.log_level = ZLOG_WARNING;
2344 + else if (!strcmp(value, "error")) {
2345 + fpm_globals.log_level = ZLOG_ERROR;
2347 + else if (!strcmp(value, "alert")) {
2348 + fpm_globals.log_level = ZLOG_ALERT;
2351 + return "invalid value for 'log_level'";
2357 +static struct xml_conf_section xml_section_fpm_global_options = {
2358 + .conf = &fpm_global_config_ptr,
2359 + .path = "/configuration/global_options",
2360 + .parsers = (struct xml_value_parser []) {
2361 + { XML_CONF_SCALAR, "emergency_restart_threshold", &xml_conf_set_slot_integer, offsetof(struct fpm_global_config_s, emergency_restart_threshold) },
2362 + { XML_CONF_SCALAR, "emergency_restart_interval", &xml_conf_set_slot_time, offsetof(struct fpm_global_config_s, emergency_restart_interval) },
2363 + { XML_CONF_SCALAR, "process_control_timeout", &xml_conf_set_slot_time, offsetof(struct fpm_global_config_s, process_control_timeout) },
2364 + { XML_CONF_SCALAR, "daemonize", &xml_conf_set_slot_boolean, offsetof(struct fpm_global_config_s, daemonize) },
2365 + { XML_CONF_SCALAR, "pid_file", &xml_conf_set_slot_string, offsetof(struct fpm_global_config_s, pid_file) },
2366 + { XML_CONF_SCALAR, "error_log", &xml_conf_set_slot_string, offsetof(struct fpm_global_config_s, error_log) },
2367 + { XML_CONF_SCALAR, "log_level", &fpm_conf_set_log_level, 0 },
2372 +static char *fpm_conf_set_pm_style(void **conf, char *name, void *vv, intptr_t offset)
2375 + struct fpm_pm_s *c = *conf;
2377 + if (!strcmp(value, "static")) {
2378 + c->style = PM_STYLE_STATIC;
2380 + else if (!strcmp(value, "apache-like")) {
2381 + c->style = PM_STYLE_APACHE_LIKE;
2384 + return "invalid value for 'style'";
2390 +static char *fpm_conf_set_rlimit_core(void **conf, char *name, void *vv, intptr_t offset)
2393 + struct fpm_worker_pool_config_s *c = *conf;
2395 + if (!strcmp(value, "unlimited")) {
2396 + c->rlimit_core = -1;
2400 + void *subconf = &int_value;
2403 + error = xml_conf_set_slot_integer(&subconf, name, vv, 0);
2405 + if (error) return error;
2407 + if (int_value < 0) return "invalid value for 'rlimit_core'";
2409 + c->rlimit_core = int_value;
2415 +static char *fpm_conf_set_catch_workers_output(void **conf, char *name, void *vv, intptr_t offset)
2417 + struct fpm_worker_pool_config_s *c = *conf;
2419 + void *subconf = &int_value;
2422 + error = xml_conf_set_slot_boolean(&subconf, name, vv, 0);
2424 + if (error) return error;
2426 + c->catch_workers_output = int_value;
2431 +static struct xml_conf_section fpm_conf_set_apache_like_subsection_conf = {
2432 + .path = "apache_like somewhere", /* fixme */
2433 + .parsers = (struct xml_value_parser []) {
2434 + { XML_CONF_SCALAR, "StartServers", &xml_conf_set_slot_integer, offsetof(struct fpm_pm_s, options_apache_like.StartServers) },
2435 + { XML_CONF_SCALAR, "MinSpareServers", &xml_conf_set_slot_integer, offsetof(struct fpm_pm_s, options_apache_like.MinSpareServers) },
2436 + { XML_CONF_SCALAR, "MaxSpareServers", &xml_conf_set_slot_integer, offsetof(struct fpm_pm_s, options_apache_like.MaxSpareServers) },
2441 +static char *fpm_conf_set_apache_like_subsection(void **conf, char *name, void *xml_node, intptr_t offset)
2443 + return xml_conf_parse_section(conf, &fpm_conf_set_apache_like_subsection_conf, xml_node);
2446 +static struct xml_conf_section fpm_conf_set_listen_options_subsection_conf = {
2447 + .path = "listen options somewhere", /* fixme */
2448 + .parsers = (struct xml_value_parser []) {
2449 + { XML_CONF_SCALAR, "backlog", &xml_conf_set_slot_integer, offsetof(struct fpm_listen_options_s, backlog) },
2450 + { XML_CONF_SCALAR, "owner", &xml_conf_set_slot_string, offsetof(struct fpm_listen_options_s, owner) },
2451 + { XML_CONF_SCALAR, "group", &xml_conf_set_slot_string, offsetof(struct fpm_listen_options_s, group) },
2452 + { XML_CONF_SCALAR, "mode", &xml_conf_set_slot_string, offsetof(struct fpm_listen_options_s, mode) },
2457 +static char *fpm_conf_set_listen_options_subsection(void **conf, char *name, void *xml_node, intptr_t offset)
2459 + void *subconf = (char *) *conf + offset;
2460 + struct fpm_listen_options_s *lo;
2462 + lo = malloc(sizeof(*lo));
2465 + return "malloc() failed";
2468 + memset(lo, 0, sizeof(*lo));
2472 + * (struct fpm_listen_options_s **) subconf = lo;
2476 + return xml_conf_parse_section(&subconf, &fpm_conf_set_listen_options_subsection_conf, xml_node);
2479 +static struct xml_conf_section fpm_conf_set_pm_subsection_conf = {
2480 + .path = "pm settings somewhere", /* fixme */
2481 + .parsers = (struct xml_value_parser []) {
2482 + { XML_CONF_SCALAR, "style", &fpm_conf_set_pm_style, 0 },
2483 + { XML_CONF_SCALAR, "max_children", &xml_conf_set_slot_integer, offsetof(struct fpm_pm_s, max_children) },
2484 + { XML_CONF_SUBSECTION, "apache_like", &fpm_conf_set_apache_like_subsection, offsetof(struct fpm_pm_s, options_apache_like) },
2489 +static char *fpm_conf_set_pm_subsection(void **conf, char *name, void *xml_node, intptr_t offset)
2491 + void *subconf = (char *) *conf + offset;
2492 + struct fpm_pm_s *pm;
2494 + pm = malloc(sizeof(*pm));
2497 + return "fpm_conf_set_pm_subsection(): malloc failed";
2500 + memset(pm, 0, sizeof(*pm));
2502 + * (struct fpm_pm_s **) subconf = pm;
2506 + return xml_conf_parse_section(&subconf, &fpm_conf_set_pm_subsection_conf, xml_node);
2509 +static char *xml_conf_set_slot_key_value_pair(void **conf, char *name, void *vv, intptr_t offset)
2512 + struct key_value_s *kv;
2513 + struct key_value_s ***parent = (struct key_value_s ***) conf;
2515 + kv = malloc(sizeof(*kv));
2518 + return "malloc() failed";
2521 + memset(kv, 0, sizeof(*kv));
2523 + kv->key = strdup(name);
2524 + kv->value = strdup(value);
2526 + if (!kv->key || !kv->value) {
2527 + return "xml_conf_set_slot_key_value_pair(): strdup() failed";
2532 + *parent = &kv->next;
2537 +static struct xml_conf_section fpm_conf_set_key_value_pairs_subsection_conf = {
2538 + .path = "key_value_pairs somewhere", /* fixme */
2539 + .parsers = (struct xml_value_parser []) {
2540 + { XML_CONF_SCALAR, 0, &xml_conf_set_slot_key_value_pair, 0 },
2545 +static char *fpm_conf_set_key_value_pairs_subsection(void **conf, char *name, void *xml_node, intptr_t offset)
2547 + void *next_kv = (char *) *conf + offset;
2549 + return xml_conf_parse_section(&next_kv, &fpm_conf_set_key_value_pairs_subsection_conf, xml_node);
2552 +static void *fpm_worker_pool_config_alloc()
2554 + static struct fpm_worker_pool_s *current_wp = 0;
2555 + struct fpm_worker_pool_s *wp;
2557 + wp = fpm_worker_pool_alloc();
2559 + if (!wp) return 0;
2561 + wp->config = malloc(sizeof(struct fpm_worker_pool_config_s));
2563 + if (!wp->config) return 0;
2565 + memset(wp->config, 0, sizeof(struct fpm_worker_pool_config_s));
2567 + if (current_wp) current_wp->next = wp;
2571 + return wp->config;
2574 +int fpm_worker_pool_config_free(struct fpm_worker_pool_config_s *wpc)
2576 + struct key_value_s *kv, *kv_next;
2579 + free(wpc->listen_address);
2580 + if (wpc->listen_options) {
2581 + free(wpc->listen_options->owner);
2582 + free(wpc->listen_options->group);
2583 + free(wpc->listen_options->mode);
2584 + free(wpc->listen_options);
2586 + for (kv = wpc->php_defines; kv; kv = kv_next) {
2587 + kv_next = kv->next;
2592 + for (kv = wpc->environment; kv; kv = kv_next) {
2593 + kv_next = kv->next;
2601 + free(wpc->chroot);
2603 + free(wpc->allowed_clients);
2604 + free(wpc->slowlog);
2609 +static struct xml_conf_section xml_section_fpm_worker_pool_config = {
2610 + .conf = &fpm_worker_pool_config_alloc,
2611 + .path = "/configuration/workers/pool",
2612 + .parsers = (struct xml_value_parser []) {
2613 + { XML_CONF_SCALAR, "name", &xml_conf_set_slot_string, offsetof(struct fpm_worker_pool_config_s, name) },
2614 + { XML_CONF_SCALAR, "listen_address", &xml_conf_set_slot_string, offsetof(struct fpm_worker_pool_config_s, listen_address) },
2615 + { XML_CONF_SUBSECTION, "listen_options", &fpm_conf_set_listen_options_subsection, offsetof(struct fpm_worker_pool_config_s, listen_options) },
2616 + { XML_CONF_SUBSECTION, "php_defines", &fpm_conf_set_key_value_pairs_subsection, offsetof(struct fpm_worker_pool_config_s, php_defines) },
2617 + { XML_CONF_SCALAR, "user", &xml_conf_set_slot_string, offsetof(struct fpm_worker_pool_config_s, user) },
2618 + { XML_CONF_SCALAR, "group", &xml_conf_set_slot_string, offsetof(struct fpm_worker_pool_config_s, group) },
2619 + { XML_CONF_SCALAR, "chroot", &xml_conf_set_slot_string, offsetof(struct fpm_worker_pool_config_s, chroot) },
2620 + { XML_CONF_SCALAR, "chdir", &xml_conf_set_slot_string, offsetof(struct fpm_worker_pool_config_s, chdir) },
2621 + { XML_CONF_SCALAR, "allowed_clients", &xml_conf_set_slot_string, offsetof(struct fpm_worker_pool_config_s, allowed_clients) },
2622 + { XML_CONF_SUBSECTION, "environment", &fpm_conf_set_key_value_pairs_subsection, offsetof(struct fpm_worker_pool_config_s, environment) },
2623 + { XML_CONF_SCALAR, "request_terminate_timeout", &xml_conf_set_slot_time, offsetof(struct fpm_worker_pool_config_s, request_terminate_timeout) },
2624 + { XML_CONF_SCALAR, "request_slowlog_timeout", &xml_conf_set_slot_time, offsetof(struct fpm_worker_pool_config_s, request_slowlog_timeout) },
2625 + { XML_CONF_SCALAR, "slowlog", &xml_conf_set_slot_string, offsetof(struct fpm_worker_pool_config_s, slowlog) },
2626 + { XML_CONF_SCALAR, "rlimit_files", &xml_conf_set_slot_integer, offsetof(struct fpm_worker_pool_config_s, rlimit_files) },
2627 + { XML_CONF_SCALAR, "rlimit_core", &fpm_conf_set_rlimit_core, 0 },
2628 + { XML_CONF_SCALAR, "max_requests", &xml_conf_set_slot_integer, offsetof(struct fpm_worker_pool_config_s, max_requests) },
2629 + { XML_CONF_SCALAR, "catch_workers_output", &fpm_conf_set_catch_workers_output, 0 },
2630 + { XML_CONF_SUBSECTION, "pm", &fpm_conf_set_pm_subsection, offsetof(struct fpm_worker_pool_config_s, pm) },
2635 +static struct xml_conf_section *fpm_conf_all_sections[] = {
2636 + &xml_section_fpm_global_options,
2637 + &xml_section_fpm_worker_pool_config,
2641 +static int fpm_evaluate_full_path(char **path)
2643 + if (**path != '/') {
2646 + full_path = malloc(sizeof(PHP_PREFIX) + strlen(*path) + 1);
2648 + if (!full_path) return -1;
2650 + sprintf(full_path, "%s/%s", PHP_PREFIX, *path);
2654 + *path = full_path;
2660 +static int fpm_conf_process_all_pools()
2662 + struct fpm_worker_pool_s *wp;
2664 + if (!fpm_worker_all_pools) {
2665 + zlog(ZLOG_STUFF, ZLOG_ERROR, "at least one pool section must be specified in config file");
2669 + for (wp = fpm_worker_all_pools; wp; wp = wp->next) {
2671 + if (wp->config->listen_address && *wp->config->listen_address) {
2673 + wp->listen_address_domain = fpm_sockets_domain_from_address(wp->config->listen_address);
2675 + if (wp->listen_address_domain == FPM_AF_UNIX && *wp->config->listen_address != '/') {
2676 + fpm_evaluate_full_path(&wp->config->listen_address);
2682 + wp->is_template = 1;
2686 + if (wp->config->request_slowlog_timeout) {
2688 + if (! (wp->config->slowlog && *wp->config->slowlog)) {
2689 + zlog(ZLOG_STUFF, ZLOG_ERROR, "pool %s: 'slowlog' must be specified for use with 'request_slowlog_timeout'",
2690 + wp->config->name);
2694 + static int warned = 0;
2697 + zlog(ZLOG_STUFF, ZLOG_WARNING, "pool %s: 'request_slowlog_timeout' is not supported on your system",
2698 + wp->config->name);
2702 + wp->config->request_slowlog_timeout = 0;
2706 + if (wp->config->request_slowlog_timeout && wp->config->slowlog && *wp->config->slowlog) {
2709 + fpm_evaluate_full_path(&wp->config->slowlog);
2711 + if (wp->config->request_slowlog_timeout) {
2712 + fd = open(wp->config->slowlog, O_WRONLY | O_APPEND | O_CREAT, S_IRUSR | S_IWUSR);
2715 + zlog(ZLOG_STUFF, ZLOG_SYSERROR, "open(%s) failed", wp->config->slowlog);
2726 +int fpm_conf_unlink_pid()
2728 + if (fpm_global_config.pid_file) {
2730 + if (0 > unlink(fpm_global_config.pid_file)) {
2731 + zlog(ZLOG_STUFF, ZLOG_SYSERROR, "unlink(\"%s\") failed", fpm_global_config.pid_file);
2740 +int fpm_conf_write_pid()
2744 + if (fpm_global_config.pid_file) {
2748 + unlink(fpm_global_config.pid_file);
2750 + fd = creat(fpm_global_config.pid_file, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
2753 + zlog(ZLOG_STUFF, ZLOG_SYSERROR, "creat(\"%s\") failed", fpm_global_config.pid_file);
2757 + len = sprintf(buf, "%d", (int) fpm_globals.parent_pid);
2759 + if (len != write(fd, buf, len)) {
2760 + zlog(ZLOG_STUFF, ZLOG_SYSERROR, "write() failed");
2770 +static int fpm_conf_post_process()
2772 + if (fpm_global_config.pid_file) {
2773 + fpm_evaluate_full_path(&fpm_global_config.pid_file);
2776 + if (!fpm_global_config.error_log) {
2777 + fpm_global_config.error_log = strdup(PHP_FPM_LOG_PATH);
2780 + fpm_evaluate_full_path(&fpm_global_config.error_log);
2782 + if (0 > fpm_stdio_open_error_log(0)) {
2786 + return fpm_conf_process_all_pools();
2789 +static void fpm_conf_cleanup(int which, void *arg)
2791 + free(fpm_global_config.pid_file);
2792 + free(fpm_global_config.error_log);
2793 + fpm_global_config.pid_file = 0;
2794 + fpm_global_config.error_log = 0;
2797 +int fpm_conf_init_main()
2799 + char *filename = fpm_globals.config;
2802 + if (0 > xml_conf_sections_register(fpm_conf_all_sections)) {
2806 + if (filename == NULL) {
2807 + filename = PHP_FPM_CONF_PATH;
2810 + err = xml_conf_load_file(filename);
2813 + zlog(ZLOG_STUFF, ZLOG_ERROR, "failed to load configuration file: %s", err);
2817 + if (0 > fpm_conf_post_process()) {
2823 + if (0 > fpm_cleanup_add(FPM_CLEANUP_ALL, fpm_conf_cleanup, 0)) {
2829 --- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_conf.h 1970-01-01 03:00:00.000000000 +0300
2830 +++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_conf.h 2008-12-13 06:46:49.000000000 +0300
2834 + /* (c) 2007,2008 Andrei Nigmatulin */
2837 +#define FPM_CONF_H 1
2839 +struct key_value_s;
2841 +struct key_value_s {
2842 + struct key_value_s *next;
2847 +struct fpm_global_config_s {
2848 + int emergency_restart_threshold;
2849 + int emergency_restart_interval;
2850 + int process_control_timeout;
2856 +extern struct fpm_global_config_s fpm_global_config;
2863 + int MinSpareServers;
2864 + int MaxSpareServers;
2865 + } options_apache_like;
2868 +struct fpm_listen_options_s {
2875 +struct fpm_worker_pool_config_s {
2877 + char *listen_address;
2878 + struct fpm_listen_options_s *listen_options;
2879 + struct key_value_s *php_defines;
2884 + char *allowed_clients;
2885 + struct key_value_s *environment;
2886 + struct fpm_pm_s *pm;
2887 + int request_terminate_timeout;
2888 + int request_slowlog_timeout;
2893 + unsigned catch_workers_output:1;
2896 +enum { PM_STYLE_STATIC = 1, PM_STYLE_APACHE_LIKE = 2 };
2898 +int fpm_conf_init_main();
2899 +int fpm_worker_pool_config_free(struct fpm_worker_pool_config_s *wpc);
2900 +int fpm_conf_write_pid();
2901 +int fpm_conf_unlink_pid();
2905 --- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_config.h 1970-01-01 03:00:00.000000000 +0300
2906 +++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_config.h 2008-05-25 04:30:43.000000000 +0400
2910 + /* (c) 2007,2008 Andrei Nigmatulin */
2912 +#include "php_config.h"
2913 +#include "fpm_autoconf.h"
2916 +/* Solaris does not have it */
2917 +#ifndef INADDR_NONE
2918 +#define INADDR_NONE (-1)
2922 +/* If we're not using GNU C, elide __attribute__ */
2924 +# define __attribute__(x) /*NOTHING*/
2928 +/* Solaris does not have it */
2930 +#define timersub(tvp, uvp, vvp) \
2932 + (vvp)->tv_sec = (tvp)->tv_sec - (uvp)->tv_sec; \
2933 + (vvp)->tv_usec = (tvp)->tv_usec - (uvp)->tv_usec; \
2934 + if ((vvp)->tv_usec < 0) { \
2935 + (vvp)->tv_sec--; \
2936 + (vvp)->tv_usec += 1000000; \
2941 +#if defined(HAVE_PTRACE) || defined(PROC_MEM_FILE) || defined(HAVE_MACH_VM_READ)
2942 +#define HAVE_FPM_TRACE 1
2944 +#define HAVE_FPM_TRACE 0
2947 --- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_env.c 1970-01-01 03:00:00.000000000 +0300
2948 +++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_env.c 2008-09-19 03:19:59.000000000 +0400
2952 + /* (c) 2007,2008 Andrei Nigmatulin */
2954 +#include "fpm_config.h"
2956 +#ifdef HAVE_ALLOCA_H
2957 +#include <alloca.h>
2960 +#include <stdlib.h>
2961 +#include <string.h>
2963 +#include "fpm_env.h"
2966 +#ifndef HAVE_SETENV
2967 +int setenv(char *name, char *value, int overwrite)
2969 + int name_len = strlen(name);
2970 + int value_len = strlen(value);
2971 + char *var = alloca(name_len + 1 + value_len + 1);
2973 + memcpy(var, name, name_len);
2975 + var[name_len] = '=';
2977 + memcpy(var + name_len + 1, value, value_len);
2979 + var[name_len + 1 + value_len] = '\0';
2981 + return putenv(var);
2985 +#ifndef HAVE_CLEARENV
2991 + /* this algo is the only one known to me
2992 + that works well on all systems */
2993 + while (*(envp = environ)) {
2994 + char *eq = strchr(*envp, '=');
2996 + s = strdup(*envp);
2998 + if (eq) s[eq - *envp] = '\0';
3008 +int fpm_env_init_child(struct fpm_worker_pool_s *wp)
3010 + struct key_value_s *kv;
3014 + for (kv = wp->config->environment; kv; kv = kv->next) {
3015 + setenv(kv->key, kv->value, 1);
3019 + setenv("USER", wp->user, 1);
3023 + setenv("HOME", wp->home, 1);
3029 +static int fpm_env_conf_wp(struct fpm_worker_pool_s *wp)
3031 + struct key_value_s *kv;
3033 + kv = wp->config->environment;
3035 + for (kv = wp->config->environment; kv; kv = kv->next) {
3036 + if (*kv->value == '$') {
3037 + char *value = getenv(kv->value + 1);
3039 + if (!value) value = "";
3042 + kv->value = strdup(value);
3045 + /* autodetected values should be removed
3046 + if these vars specified in config */
3047 + if (!strcmp(kv->key, "USER")) {
3052 + if (!strcmp(kv->key, "HOME")) {
3061 +int fpm_env_init_main()
3063 + struct fpm_worker_pool_s *wp;
3065 + for (wp = fpm_worker_all_pools; wp; wp = wp->next) {
3067 + if (0 > fpm_env_conf_wp(wp)) {
3075 --- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_env.h 1970-01-01 03:00:00.000000000 +0300
3076 +++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_env.h 2008-09-19 03:19:59.000000000 +0400
3080 + /* (c) 2007,2008 Andrei Nigmatulin */
3083 +#define FPM_ENV_H 1
3085 +#include "fpm_worker_pool.h"
3087 +int fpm_env_init_child(struct fpm_worker_pool_s *wp);
3088 +int fpm_env_init_main();
3090 +extern char **environ;
3092 +#ifndef HAVE_SETENV
3093 +int setenv(char *name, char *value, int overwrite);
3096 +#ifndef HAVE_CLEARENV
3102 --- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_events.c 1970-01-01 03:00:00.000000000 +0300
3103 +++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_events.c 2008-12-13 06:21:18.000000000 +0300
3107 + /* (c) 2007,2008 Andrei Nigmatulin */
3109 +#include "fpm_config.h"
3111 +#include <unistd.h>
3113 +#include <stdlib.h> /* for putenv */
3114 +#include <string.h>
3115 +#include <sys/types.h> /* for event.h below */
3119 +#include "fpm_process_ctl.h"
3120 +#include "fpm_events.h"
3121 +#include "fpm_cleanup.h"
3122 +#include "fpm_stdio.h"
3123 +#include "fpm_signals.h"
3124 +#include "fpm_children.h"
3127 +static void fpm_event_cleanup(int which, void *arg)
3129 + event_base_free(0);
3132 +static void fpm_got_signal(int fd, short ev, void *arg)
3140 + res = read(fd, &c, 1);
3141 + } while (res == -1 && errno == EINTR);
3144 + if (res < 0 && errno != EAGAIN && errno != EWOULDBLOCK) {
3145 + zlog(ZLOG_STUFF, ZLOG_SYSERROR, "read() failed");
3151 + case 'C' : /* SIGCHLD */
3152 + zlog(ZLOG_STUFF, ZLOG_NOTICE, "received SIGCHLD");
3153 + fpm_children_bury();
3155 + case 'I' : /* SIGINT */
3156 + zlog(ZLOG_STUFF, ZLOG_NOTICE, "received SIGINT");
3157 + fpm_pctl(FPM_PCTL_STATE_TERMINATING, FPM_PCTL_ACTION_SET);
3159 + case 'T' : /* SIGTERM */
3160 + zlog(ZLOG_STUFF, ZLOG_NOTICE, "received SIGTERM");
3161 + fpm_pctl(FPM_PCTL_STATE_TERMINATING, FPM_PCTL_ACTION_SET);
3163 + case 'Q' : /* SIGQUIT */
3164 + zlog(ZLOG_STUFF, ZLOG_NOTICE, "received SIGQUIT");
3165 + fpm_pctl(FPM_PCTL_STATE_FINISHING, FPM_PCTL_ACTION_SET);
3167 + case '1' : /* SIGUSR1 */
3168 + zlog(ZLOG_STUFF, ZLOG_NOTICE, "received SIGUSR1");
3169 + if (0 == fpm_stdio_open_error_log(1)) {
3170 + zlog(ZLOG_STUFF, ZLOG_NOTICE, "log file re-opened");
3173 + case '2' : /* SIGUSR2 */
3174 + zlog(ZLOG_STUFF, ZLOG_NOTICE, "received SIGUSR2");
3175 + fpm_pctl(FPM_PCTL_STATE_RELOADING, FPM_PCTL_ACTION_SET);
3179 + if (fpm_globals.is_child) {
3188 +int fpm_event_init_main()
3192 + zlog(ZLOG_STUFF, ZLOG_NOTICE, "libevent: using %s", event_get_method());
3194 + if (0 > fpm_cleanup_add(FPM_CLEANUP_ALL, fpm_event_cleanup, 0)) {
3201 +int fpm_event_loop()
3203 + static struct event signal_fd_event;
3205 + event_set(&signal_fd_event, fpm_signals_get_fd(), EV_PERSIST | EV_READ, &fpm_got_signal, 0);
3207 + event_add(&signal_fd_event, 0);
3209 + fpm_pctl_heartbeat(-1, 0, 0);
3211 + zlog(ZLOG_STUFF, ZLOG_NOTICE, "libevent: entering main loop");
3218 +int fpm_event_add(int fd, struct event *ev, void (*callback)(int, short, void *), void *arg)
3220 + event_set(ev, fd, EV_PERSIST | EV_READ, callback, arg);
3222 + return event_add(ev, 0);
3225 +int fpm_event_del(struct event *ev)
3227 + return event_del(ev);
3230 +void fpm_event_exit_loop()
3232 + event_loopbreak();
3235 +void fpm_event_fire(struct event *ev)
3237 + (*ev->ev_callback)( (int) ev->ev_fd, (short) ev->ev_res, ev->ev_arg);
3240 --- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_events.h 1970-01-01 03:00:00.000000000 +0300
3241 +++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_events.h 2008-05-24 21:38:47.000000000 +0400
3245 + /* (c) 2007,2008 Andrei Nigmatulin */
3247 +#ifndef FPM_EVENTS_H
3248 +#define FPM_EVENTS_H 1
3250 +void fpm_event_exit_loop();
3251 +int fpm_event_loop();
3252 +int fpm_event_add(int fd, struct event *ev, void (*callback)(int, short, void *), void *arg);
3253 +int fpm_event_del(struct event *ev);
3254 +void fpm_event_fire(struct event *ev);
3255 +int fpm_event_init_main();
3259 --- php-5.2.8.vanilla/sapi/cgi/fpm/fpm.h 1970-01-01 03:00:00.000000000 +0300
3260 +++ php-5.2.8.fpm/sapi/cgi/fpm/fpm.h 2008-05-24 21:38:47.000000000 +0400
3264 + /* (c) 2007,2008 Andrei Nigmatulin */
3269 +#include <unistd.h>
3271 +int fpm_run(int *max_requests);
3272 +int fpm_init(int argc, char **argv, char *config);
3274 +struct fpm_globals_s {
3279 + int running_children;
3282 + int listening_socket; /* for this child */
3283 + int max_requests; /* for this child */
3287 +extern struct fpm_globals_s fpm_globals;
3292 --- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_php.c 1970-01-01 03:00:00.000000000 +0300
3293 +++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_php.c 2008-12-13 06:21:18.000000000 +0300
3297 + /* (c) 2007,2008 Andrei Nigmatulin */
3299 +#include "fpm_config.h"
3301 +#include <stdlib.h>
3302 +#include <string.h>
3306 +#include "php_main.h"
3307 +#include "php_ini.h"
3308 +#include "ext/standard/dl.h"
3310 +#include "fastcgi.h"
3313 +#include "fpm_php.h"
3314 +#include "fpm_cleanup.h"
3315 +#include "fpm_worker_pool.h"
3317 +static int zend_ini_alter_master(char *name, int name_length, char *new_value, int new_value_length, int stage TSRMLS_DC)
3319 + zend_ini_entry *ini_entry;
3322 + if (zend_hash_find(EG(ini_directives), name, name_length, (void **) &ini_entry) == FAILURE) {
3326 + duplicate = strdup(new_value);
3328 + if (!ini_entry->on_modify
3329 + || ini_entry->on_modify(ini_entry, duplicate, new_value_length,
3330 + ini_entry->mh_arg1, ini_entry->mh_arg2, ini_entry->mh_arg3, stage TSRMLS_CC) == SUCCESS) {
3331 + ini_entry->value = duplicate;
3332 + ini_entry->value_length = new_value_length;
3340 +static void fpm_php_disable(char *value, int (*zend_disable)(char *, uint TSRMLS_DC) TSRMLS_DC)
3342 + char *s = 0, *e = value;
3350 + zend_disable(s, e - s TSRMLS_CC);
3364 + zend_disable(s, e - s TSRMLS_CC);
3368 +static int fpm_php_apply_defines(struct fpm_worker_pool_s *wp)
3371 + struct key_value_s *kv;
3373 + for (kv = wp->config->php_defines; kv; kv = kv->next) {
3374 + char *name = kv->key;
3375 + char *value = kv->value;
3376 + int name_len = strlen(name);
3377 + int value_len = strlen(value);
3379 + if (!strcmp(name, "extension") && *value) {
3382 +#if defined(PHP_VERSION_ID) && (PHP_VERSION_ID >= 50300)
3383 + php_dl(value, MODULE_PERSISTENT, &zv, 1 TSRMLS_CC);
3386 + ZVAL_STRINGL(&filename, value, value_len, 0);
3387 +#if (PHP_MAJOR_VERSION >= 5)
3388 + php_dl(&filename, MODULE_PERSISTENT, &zv, 1 TSRMLS_CC);
3390 + php_dl(&filename, MODULE_PERSISTENT, &zv TSRMLS_CC);
3396 + zend_ini_alter_master(name, name_len + 1, value, value_len, PHP_INI_STAGE_ACTIVATE TSRMLS_CC);
3398 + if (!strcmp(name, "disable_functions") && *value) {
3399 + char *v = strdup(value);
3400 +#if (PHP_MAJOR_VERSION >= 5)
3401 + PG(disable_functions) = v;
3403 + fpm_php_disable(v, zend_disable_function TSRMLS_CC);
3405 + else if (!strcmp(name, "disable_classes") && *value) {
3406 + char *v = strdup(value);
3407 +#if (PHP_MAJOR_VERSION >= 5)
3408 + PG(disable_classes) = v;
3410 + fpm_php_disable(v, zend_disable_class TSRMLS_CC);
3417 +static int fpm_php_set_allowed_clients(struct fpm_worker_pool_s *wp)
3419 + if (wp->listen_address_domain == FPM_AF_INET) {
3420 + fcgi_set_allowed_clients(wp->config->allowed_clients);
3426 +static int fpm_php_set_fcgi_mgmt_vars(struct fpm_worker_pool_s *wp)
3428 + char max_workers[10 + 1]; /* 4294967295 */
3431 + len = sprintf(max_workers, "%u", (unsigned int) wp->config->pm->max_children);
3433 + fcgi_set_mgmt_var("FCGI_MAX_CONNS", sizeof("FCGI_MAX_CONNS")-1, max_workers, len);
3434 + fcgi_set_mgmt_var("FCGI_MAX_REQS", sizeof("FCGI_MAX_REQS")-1, max_workers, len);
3439 +char *fpm_php_script_filename(TSRMLS_D)
3441 + return SG(request_info).path_translated;
3444 +char *fpm_php_request_method(TSRMLS_D)
3446 + return (char *) SG(request_info).request_method;
3449 +size_t fpm_php_content_length(TSRMLS_D)
3451 + return SG(request_info).content_length;
3454 +static void fpm_php_cleanup(int which, void *arg)
3457 + php_module_shutdown(TSRMLS_C);
3461 +void fpm_php_soft_quit()
3463 + fcgi_set_in_shutdown(1);
3466 +int fpm_php_init_main()
3468 + if (0 > fpm_cleanup_add(FPM_CLEANUP_PARENT, fpm_php_cleanup, 0)) {
3475 +int fpm_php_init_child(struct fpm_worker_pool_s *wp)
3477 + if (0 > fpm_php_apply_defines(wp) ||
3478 + 0 > fpm_php_set_allowed_clients(wp) ||
3479 + 0 > fpm_php_set_fcgi_mgmt_vars(wp)) {
3485 --- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_php.h 1970-01-01 03:00:00.000000000 +0300
3486 +++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_php.h 2008-11-15 03:57:24.000000000 +0300
3490 + /* (c) 2007,2008 Andrei Nigmatulin */
3493 +#define FPM_PHP_H 1
3497 +#include "build-defs.h" /* for PHP_ defines */
3499 +struct fpm_worker_pool_s;
3501 +int fpm_php_init_child(struct fpm_worker_pool_s *wp);
3502 +char *fpm_php_script_filename(TSRMLS_D);
3503 +char *fpm_php_request_method(TSRMLS_D);
3504 +size_t fpm_php_content_length(TSRMLS_D);
3505 +void fpm_php_soft_quit();
3506 +int fpm_php_init_main();
3510 --- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_php_trace.c 1970-01-01 03:00:00.000000000 +0300
3511 +++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_php_trace.c 2008-11-15 03:57:24.000000000 +0300
3515 + /* (c) 2007,2008 Andrei Nigmatulin */
3517 +#include "fpm_config.h"
3522 +#include "php_main.h"
3525 +#include <stddef.h>
3526 +#include <stdint.h>
3527 +#include <unistd.h>
3528 +#include <sys/time.h>
3529 +#include <sys/types.h>
3532 +#include "fpm_trace.h"
3533 +#include "fpm_php_trace.h"
3534 +#include "fpm_children.h"
3535 +#include "fpm_worker_pool.h"
3536 +#include "fpm_process_ctl.h"
3541 +#define valid_ptr(p) ((p) && 0 == ((p) & (sizeof(long) - 1)))
3543 +#if SIZEOF_LONG == 4
3544 +#define PTR_FMT "08"
3545 +#elif SIZEOF_LONG == 8
3546 +#define PTR_FMT "016"
3550 +static int fpm_php_trace_dump(struct fpm_child_s *child, FILE *slowlog TSRMLS_DC)
3552 + int callers_limit = 20;
3553 + pid_t pid = child->pid;
3554 + struct timeval tv;
3555 + static const int buf_size = 1024;
3556 + char buf[buf_size];
3557 + long execute_data;
3560 + gettimeofday(&tv, 0);
3562 + zlog_print_time(&tv, buf, buf_size);
3564 + fprintf(slowlog, "\n%s pid %d (pool %s)\n", buf, (int) pid, child->wp->config->name);
3566 + if (0 > fpm_trace_get_strz(buf, buf_size, (long) &SG(request_info).path_translated)) {
3570 + fprintf(slowlog, "script_filename = %s\n", buf);
3572 + if (0 > fpm_trace_get_long((long) &EG(current_execute_data), &l)) {
3578 + while (execute_data) {
3582 + fprintf(slowlog, "[0x%" PTR_FMT "lx] ", execute_data);
3584 + if (0 > fpm_trace_get_long(execute_data + offsetof(zend_execute_data, function_state.function), &l)) {
3590 + if (valid_ptr(function)) {
3591 + if (0 > fpm_trace_get_strz(buf, buf_size, function + offsetof(zend_function, common.function_name))) {
3595 + fprintf(slowlog, "%s()", buf);
3598 + fprintf(slowlog, "???");
3601 + if (0 > fpm_trace_get_long(execute_data + offsetof(zend_execute_data, op_array), &l)) {
3607 + if (valid_ptr(l)) {
3608 + long op_array = l;
3610 + if (0 > fpm_trace_get_strz(buf, buf_size, op_array + offsetof(zend_op_array, filename))) {
3615 + if (0 > fpm_trace_get_long(execute_data + offsetof(zend_execute_data, opline), &l)) {
3619 + if (valid_ptr(l)) {
3621 + uint *lu = (uint *) &l;
3623 + if (0 > fpm_trace_get_long(opline + offsetof(struct _zend_op, lineno), &l)) {
3630 + fprintf(slowlog, " %s:%u\n", *buf ? buf : "unknown", lineno);
3632 + if (0 > fpm_trace_get_long(execute_data + offsetof(zend_execute_data, prev_execute_data), &l)) {
3638 + if (0 == --callers_limit) {
3646 +void fpm_php_trace(struct fpm_child_s *child)
3651 + zlog(ZLOG_STUFF, ZLOG_NOTICE, "about to trace %d", (int) child->pid);
3653 + slowlog = fopen(child->wp->config->slowlog, "a+");
3656 + zlog(ZLOG_STUFF, ZLOG_SYSERROR, "fopen(%s) failed", child->wp->config->slowlog);
3660 + if (0 > fpm_trace_ready(child->pid)) {
3664 + if (0 > fpm_php_trace_dump(child, slowlog TSRMLS_CC)) {
3665 + fprintf(slowlog, "+++ dump failed\n");
3668 + if (0 > fpm_trace_close(child->pid)) {
3676 + fpm_pctl_kill(child->pid, FPM_PCTL_CONT);
3677 + child->tracer = 0;
3679 + zlog(ZLOG_STUFF, ZLOG_NOTICE, "finished trace of %d", (int) child->pid);
3684 --- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_php_trace.h 1970-01-01 03:00:00.000000000 +0300
3685 +++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_php_trace.h 2008-05-24 21:38:47.000000000 +0400
3689 + /* (c) 2007,2008 Andrei Nigmatulin */
3691 +#ifndef FPM_PHP_TRACE_H
3692 +#define FPM_PHP_TRACE_H 1
3694 +struct fpm_child_s;
3696 +void fpm_php_trace(struct fpm_child_s *);
3700 --- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_process_ctl.c 1970-01-01 03:00:00.000000000 +0300
3701 +++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_process_ctl.c 2008-12-13 06:21:18.000000000 +0300
3705 + /* (c) 2007,2008 Andrei Nigmatulin */
3707 +#include "fpm_config.h"
3709 +#include <sys/types.h>
3710 +#include <signal.h>
3711 +#include <unistd.h>
3712 +#include <stdlib.h>
3715 +#include "fpm_clock.h"
3716 +#include "fpm_children.h"
3717 +#include "fpm_signals.h"
3718 +#include "fpm_events.h"
3719 +#include "fpm_process_ctl.h"
3720 +#include "fpm_cleanup.h"
3721 +#include "fpm_request.h"
3722 +#include "fpm_worker_pool.h"
3726 +static int fpm_state = FPM_PCTL_STATE_NORMAL;
3727 +static int fpm_signal_sent = 0;
3730 +static const char *fpm_state_names[] = {
3731 + [FPM_PCTL_STATE_NORMAL] = "normal",
3732 + [FPM_PCTL_STATE_RELOADING] = "reloading",
3733 + [FPM_PCTL_STATE_TERMINATING] = "terminating",
3734 + [FPM_PCTL_STATE_FINISHING] = "finishing"
3737 +static int saved_argc;
3738 +static char **saved_argv;
3740 +static void fpm_pctl_cleanup(int which, void *arg)
3744 + if (which != FPM_CLEANUP_PARENT_EXEC) {
3746 + for (i = 0; i < saved_argc; i++) {
3747 + free(saved_argv[i]);
3755 +static struct event pctl_event;
3757 +static void fpm_pctl_action(int fd, short which, void *arg)
3759 + evtimer_del(&pctl_event);
3761 + memset(&pctl_event, 0, sizeof(pctl_event));
3763 + fpm_pctl(FPM_PCTL_STATE_UNSPECIFIED, FPM_PCTL_ACTION_TIMEOUT);
3766 +static int fpm_pctl_timeout_set(int sec)
3768 + struct timeval tv = { .tv_sec = sec, .tv_usec = 0 };
3770 + if (evtimer_initialized(&pctl_event)) {
3771 + evtimer_del(&pctl_event);
3774 + evtimer_set(&pctl_event, &fpm_pctl_action, 0);
3776 + evtimer_add(&pctl_event, &tv);
3781 +static void fpm_pctl_exit()
3783 + zlog(ZLOG_STUFF, ZLOG_NOTICE, "exiting, bye-bye!");
3785 + fpm_conf_unlink_pid();
3787 + fpm_cleanups_run(FPM_CLEANUP_PARENT_EXIT_MAIN);
3792 +#define optional_arg(c) (saved_argc > c ? ", \"" : ""), (saved_argc > c ? saved_argv[c] : ""), (saved_argc > c ? "\"" : "")
3794 +static void fpm_pctl_exec()
3797 + zlog(ZLOG_STUFF, ZLOG_NOTICE, "reloading: execvp(\"%s\", {\"%s\""
3798 + "%s%s%s" "%s%s%s" "%s%s%s" "%s%s%s" "%s%s%s"
3799 + "%s%s%s" "%s%s%s" "%s%s%s" "%s%s%s" "%s%s%s"
3801 + saved_argv[0], saved_argv[0],
3814 + fpm_cleanups_run(FPM_CLEANUP_PARENT_EXEC);
3816 + execvp(saved_argv[0], saved_argv);
3818 + zlog(ZLOG_STUFF, ZLOG_SYSERROR, "execvp() failed");
3823 +static void fpm_pctl_action_last()
3825 + switch (fpm_state) {
3827 + case FPM_PCTL_STATE_RELOADING :
3832 + case FPM_PCTL_STATE_FINISHING :
3834 + case FPM_PCTL_STATE_TERMINATING :
3841 +int fpm_pctl_kill(pid_t pid, int how)
3846 + case FPM_PCTL_TERM :
3849 + case FPM_PCTL_STOP :
3852 + case FPM_PCTL_CONT :
3859 + return kill(pid, s);
3862 +static void fpm_pctl_kill_all(int signo)
3864 + struct fpm_worker_pool_s *wp;
3865 + int alive_children = 0;
3867 + for (wp = fpm_worker_all_pools; wp; wp = wp->next) {
3868 + struct fpm_child_s *child;
3870 + for (child = wp->children; child; child = child->next) {
3872 + int res = kill(child->pid, signo);
3874 + zlog(ZLOG_STUFF, ZLOG_NOTICE, "sending signal %d %s to child %d (pool %s)", signo,
3875 + fpm_signal_names[signo] ? fpm_signal_names[signo] : "",
3876 + (int) child->pid, child->wp->config->name);
3878 + if (res == 0) ++alive_children;
3882 + if (alive_children) {
3883 + zlog(ZLOG_STUFF, ZLOG_NOTICE, "%d %s still alive", alive_children, alive_children == 1 ? "child is" : "children are");
3887 +static void fpm_pctl_action_next()
3891 + if (!fpm_globals.running_children) fpm_pctl_action_last();
3893 + if (fpm_signal_sent == 0) {
3894 + if (fpm_state == FPM_PCTL_STATE_TERMINATING) {
3900 + timeout = fpm_global_config.process_control_timeout;
3903 + if (fpm_signal_sent == SIGQUIT) {
3912 + fpm_pctl_kill_all(sig);
3914 + fpm_signal_sent = sig;
3916 + fpm_pctl_timeout_set(timeout);
3919 +void fpm_pctl(int new_state, int action)
3923 + case FPM_PCTL_ACTION_SET :
3925 + if (fpm_state == new_state) { /* already in progress - just ignore duplicate signal */
3929 + switch (fpm_state) { /* check which states can be overridden */
3931 + case FPM_PCTL_STATE_NORMAL :
3933 + /* 'normal' can be overridden by any other state */
3936 + case FPM_PCTL_STATE_RELOADING :
3938 + /* 'reloading' can be overridden by 'finishing' */
3939 + if (new_state == FPM_PCTL_STATE_FINISHING) break;
3941 + case FPM_PCTL_STATE_FINISHING :
3943 + /* 'reloading' and 'finishing' can be overridden by 'terminating' */
3944 + if (new_state == FPM_PCTL_STATE_TERMINATING) break;
3946 + case FPM_PCTL_STATE_TERMINATING :
3948 + /* nothing can override 'terminating' state */
3949 + zlog(ZLOG_STUFF, ZLOG_NOTICE, "not switching to '%s' state, because already in '%s' state",
3950 + fpm_state_names[new_state], fpm_state_names[fpm_state]);
3955 + fpm_signal_sent = 0;
3956 + fpm_state = new_state;
3958 + zlog(ZLOG_STUFF, ZLOG_NOTICE, "switching to '%s' state", fpm_state_names[fpm_state]);
3962 + case FPM_PCTL_ACTION_TIMEOUT :
3964 + fpm_pctl_action_next();
3968 + case FPM_PCTL_ACTION_LAST_CHILD_EXITED :
3970 + fpm_pctl_action_last();
3977 +int fpm_pctl_can_spawn_children()
3979 + return fpm_state == FPM_PCTL_STATE_NORMAL;
3982 +int fpm_pctl_child_exited()
3984 + if (fpm_state == FPM_PCTL_STATE_NORMAL) return 0;
3986 + if (!fpm_globals.running_children) {
3987 + fpm_pctl(FPM_PCTL_STATE_UNSPECIFIED, FPM_PCTL_ACTION_LAST_CHILD_EXITED);
3993 +int fpm_pctl_init_main()
3997 + saved_argc = fpm_globals.argc;
3999 + saved_argv = malloc(sizeof(char *) * (saved_argc + 1));
4001 + if (!saved_argv) {
4005 + for (i = 0; i < saved_argc; i++) {
4006 + saved_argv[i] = strdup(fpm_globals.argv[i]);
4008 + if (!saved_argv[i]) {
4013 + saved_argv[i] = 0;
4015 + if (0 > fpm_cleanup_add(FPM_CLEANUP_ALL, fpm_pctl_cleanup, 0)) {
4022 +static void fpm_pctl_check_request_timeout(struct timeval *now)
4024 + struct fpm_worker_pool_s *wp;
4026 + for (wp = fpm_worker_all_pools; wp; wp = wp->next) {
4027 + int terminate_timeout = wp->config->request_terminate_timeout;
4028 + int slowlog_timeout = wp->config->request_slowlog_timeout;
4029 + struct fpm_child_s *child;
4031 + if (terminate_timeout || slowlog_timeout) {
4032 + for (child = wp->children; child; child = child->next) {
4033 + fpm_request_check_timed_out(child, now, terminate_timeout, slowlog_timeout);
4040 +void fpm_pctl_heartbeat(int fd, short which, void *arg)
4042 + static struct event heartbeat;
4043 + struct timeval tv = { .tv_sec = 0, .tv_usec = 130000 };
4044 + struct timeval now;
4046 + if (which == EV_TIMEOUT) {
4047 + evtimer_del(&heartbeat);
4048 + fpm_clock_get(&now);
4049 + fpm_pctl_check_request_timeout(&now);
4052 + evtimer_set(&heartbeat, &fpm_pctl_heartbeat, 0);
4054 + evtimer_add(&heartbeat, &tv);
4057 --- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_process_ctl.h 1970-01-01 03:00:00.000000000 +0300
4058 +++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_process_ctl.h 2008-07-21 01:33:10.000000000 +0400
4062 + /* (c) 2007,2008 Andrei Nigmatulin */
4064 +#ifndef FPM_PROCESS_CTL_H
4065 +#define FPM_PROCESS_CTL_H 1
4067 +struct fpm_child_s;
4069 +void fpm_pctl(int new_state, int action);
4070 +int fpm_pctl_can_spawn_children();
4071 +int fpm_pctl_kill(pid_t pid, int how);
4072 +void fpm_pctl_heartbeat(int fd, short which, void *arg);
4073 +int fpm_pctl_child_exited();
4074 +int fpm_pctl_init_main();
4078 + FPM_PCTL_STATE_UNSPECIFIED,
4079 + FPM_PCTL_STATE_NORMAL,
4080 + FPM_PCTL_STATE_RELOADING,
4081 + FPM_PCTL_STATE_TERMINATING,
4082 + FPM_PCTL_STATE_FINISHING
4086 + FPM_PCTL_ACTION_SET,
4087 + FPM_PCTL_ACTION_TIMEOUT,
4088 + FPM_PCTL_ACTION_LAST_CHILD_EXITED
4099 --- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_request.c 1970-01-01 03:00:00.000000000 +0300
4100 +++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_request.c 2008-11-15 03:57:24.000000000 +0300
4104 + /* (c) 2007,2008 Andrei Nigmatulin */
4106 +#include "fpm_config.h"
4108 +#include "fpm_php.h"
4109 +#include "fpm_str.h"
4110 +#include "fpm_clock.h"
4111 +#include "fpm_conf.h"
4112 +#include "fpm_trace.h"
4113 +#include "fpm_php_trace.h"
4114 +#include "fpm_process_ctl.h"
4115 +#include "fpm_children.h"
4116 +#include "fpm_shm_slots.h"
4117 +#include "fpm_request.h"
4121 +void fpm_request_accepting()
4123 + struct fpm_shm_slot_s *slot;
4125 + slot = fpm_shm_slots_acquire(0, 0);
4127 + slot->request_stage = FPM_REQUEST_ACCEPTING;
4129 + fpm_clock_get(&slot->tv);
4130 + memset(slot->request_method, 0, sizeof(slot->request_method));
4131 + slot->content_length = 0;
4132 + memset(slot->script_filename, 0, sizeof(slot->script_filename));
4134 + fpm_shm_slots_release(slot);
4137 +void fpm_request_reading_headers()
4139 + struct fpm_shm_slot_s *slot;
4141 + slot = fpm_shm_slots_acquire(0, 0);
4143 + slot->request_stage = FPM_REQUEST_READING_HEADERS;
4145 + fpm_clock_get(&slot->tv);
4146 + slot->accepted = slot->tv;
4148 + fpm_shm_slots_release(slot);
4151 +void fpm_request_info()
4154 + struct fpm_shm_slot_s *slot;
4155 + char *request_method = fpm_php_request_method(TSRMLS_C);
4156 + char *script_filename = fpm_php_script_filename(TSRMLS_C);
4158 + slot = fpm_shm_slots_acquire(0, 0);
4160 + slot->request_stage = FPM_REQUEST_INFO;
4162 + fpm_clock_get(&slot->tv);
4164 + if (request_method) {
4165 + cpystrn(slot->request_method, request_method, sizeof(slot->request_method));
4168 + slot->content_length = fpm_php_content_length(TSRMLS_C);
4170 + /* if cgi.fix_pathinfo is set to "1" and script cannot be found (404)
4171 + the sapi_globals.request_info.path_translated is set to NULL */
4172 + if (script_filename) {
4173 + cpystrn(slot->script_filename, script_filename, sizeof(slot->script_filename));
4176 + fpm_shm_slots_release(slot);
4179 +void fpm_request_executing()
4181 + struct fpm_shm_slot_s *slot;
4183 + slot = fpm_shm_slots_acquire(0, 0);
4185 + slot->request_stage = FPM_REQUEST_EXECUTING;
4187 + fpm_clock_get(&slot->tv);
4189 + fpm_shm_slots_release(slot);
4192 +void fpm_request_finished()
4194 + struct fpm_shm_slot_s *slot;
4196 + slot = fpm_shm_slots_acquire(0, 0);
4198 + slot->request_stage = FPM_REQUEST_FINISHED;
4200 + fpm_clock_get(&slot->tv);
4201 + memset(&slot->accepted, 0, sizeof(slot->accepted));
4203 + fpm_shm_slots_release(slot);
4206 +void fpm_request_check_timed_out(struct fpm_child_s *child, struct timeval *now, int terminate_timeout, int slowlog_timeout)
4208 + struct fpm_shm_slot_s *slot;
4209 + struct fpm_shm_slot_s slot_c;
4211 + slot = fpm_shm_slot(child);
4213 + if (!fpm_shm_slots_acquire(slot, 1)) {
4219 + fpm_shm_slots_release(slot);
4222 + if (child->slow_logged.tv_sec) {
4223 + if (child->slow_logged.tv_sec != slot_c.accepted.tv_sec || child->slow_logged.tv_usec != slot_c.accepted.tv_usec) {
4224 + child->slow_logged.tv_sec = 0;
4225 + child->slow_logged.tv_usec = 0;
4230 + if (slot_c.request_stage > FPM_REQUEST_ACCEPTING && slot_c.request_stage < FPM_REQUEST_FINISHED) {
4231 + char purified_script_filename[sizeof(slot_c.script_filename)];
4232 + struct timeval tv;
4234 + timersub(now, &slot_c.accepted, &tv);
4237 + if (child->slow_logged.tv_sec == 0 && slowlog_timeout &&
4238 + slot_c.request_stage == FPM_REQUEST_EXECUTING && tv.tv_sec >= slowlog_timeout) {
4240 + str_purify_filename(purified_script_filename, slot_c.script_filename, sizeof(slot_c.script_filename));
4242 + child->slow_logged = slot_c.accepted;
4243 + child->tracer = fpm_php_trace;
4245 + fpm_trace_signal(child->pid);
4247 + zlog(ZLOG_STUFF, ZLOG_WARNING, "child %d, script '%s' (pool %s) executing too slow (%d.%06d sec), logging",
4248 + (int) child->pid, purified_script_filename, child->wp->config->name, (int) tv.tv_sec, (int) tv.tv_usec);
4253 + if (terminate_timeout && tv.tv_sec >= terminate_timeout) {
4255 + str_purify_filename(purified_script_filename, slot_c.script_filename, sizeof(slot_c.script_filename));
4257 + fpm_pctl_kill(child->pid, FPM_PCTL_TERM);
4259 + zlog(ZLOG_STUFF, ZLOG_WARNING, "child %d, script '%s' (pool %s) execution timed out (%d.%06d sec), terminating",
4260 + (int) child->pid, purified_script_filename, child->wp->config->name, (int) tv.tv_sec, (int) tv.tv_usec);
4266 --- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_request.h 1970-01-01 03:00:00.000000000 +0300
4267 +++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_request.h 2008-07-20 05:47:16.000000000 +0400
4271 + /* (c) 2007,2008 Andrei Nigmatulin */
4273 +#ifndef FPM_REQUEST_H
4274 +#define FPM_REQUEST_H 1
4276 +void fpm_request_accepting(); /* hanging in accept() */
4277 +void fpm_request_reading_headers(); /* start reading fastcgi request from very first byte */
4278 +void fpm_request_info(); /* not a stage really but a point in the php code, where all request params have become known to sapi */
4279 +void fpm_request_executing(); /* the script is executing */
4280 +void fpm_request_finished(); /* request processed: script response have been sent to web server */
4282 +struct fpm_child_s;
4285 +void fpm_request_check_timed_out(struct fpm_child_s *child, struct timeval *tv, int terminate_timeout, int slowlog_timeout);
4287 +enum fpm_request_stage_e {
4288 + FPM_REQUEST_ACCEPTING = 1,
4289 + FPM_REQUEST_READING_HEADERS,
4291 + FPM_REQUEST_EXECUTING,
4292 + FPM_REQUEST_FINISHED
4296 --- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_shm.c 1970-01-01 03:00:00.000000000 +0300
4297 +++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_shm.c 2008-05-24 21:38:47.000000000 +0400
4301 + /* (c) 2007,2008 Andrei Nigmatulin */
4303 +#include "fpm_config.h"
4305 +#include <unistd.h>
4306 +#include <sys/mman.h>
4307 +#include <stdlib.h>
4309 +#include "fpm_shm.h"
4313 +/* MAP_ANON is depricated, but not in macosx */
4314 +#if defined(MAP_ANON) && !defined(MAP_ANONYMOUS)
4315 +#define MAP_ANONYMOUS MAP_ANON
4319 +struct fpm_shm_s *fpm_shm_alloc(size_t sz)
4321 + struct fpm_shm_s *shm;
4323 + shm = malloc(sizeof(*shm));
4329 + shm->mem = mmap(0, sz, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_SHARED, -1, 0);
4332 + zlog(ZLOG_STUFF, ZLOG_SYSERROR, "mmap(MAP_ANONYMOUS | MAP_SHARED) failed");
4343 +static void fpm_shm_free(struct fpm_shm_s *shm, int do_unmap)
4346 + munmap(shm->mem, shm->sz);
4352 +void fpm_shm_free_list(struct fpm_shm_s *shm, void *mem)
4354 + struct fpm_shm_s *next;
4356 + for (; shm; shm = next) {
4359 + fpm_shm_free(shm, mem != shm->mem);
4363 +void *fpm_shm_alloc_chunk(struct fpm_shm_s **head, size_t sz, void **mem)
4365 + size_t pagesize = getpagesize();
4366 + static const size_t cache_line_size = 16;
4367 + size_t aligned_sz;
4368 + struct fpm_shm_s *shm;
4371 + sz = (sz + cache_line_size - 1) & -cache_line_size;
4375 + if (0 == shm || shm->sz - shm->used < sz) {
4376 + /* allocate one more shm segment */
4378 + aligned_sz = (sz + pagesize - 1) & -pagesize;
4380 + shm = fpm_shm_alloc(aligned_sz);
4386 + shm->next = *head;
4387 + if (shm->next) shm->next->prev = shm;
4393 + ret = (char *) shm->mem + shm->used;
4399 --- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_shm.h 1970-01-01 03:00:00.000000000 +0300
4400 +++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_shm.h 2008-05-24 21:38:47.000000000 +0400
4404 + /* (c) 2007,2008 Andrei Nigmatulin */
4407 +#define FPM_SHM_H 1
4412 + struct fpm_shm_s *prev, *next;
4418 +struct fpm_shm_s *fpm_shm_alloc(size_t sz);
4419 +void fpm_shm_free_list(struct fpm_shm_s *, void *);
4420 +void *fpm_shm_alloc_chunk(struct fpm_shm_s **head, size_t sz, void **mem);
4424 --- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_shm_slots.c 1970-01-01 03:00:00.000000000 +0300
4425 +++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_shm_slots.c 2008-05-24 21:38:47.000000000 +0400
4429 + /* (c) 2007,2008 Andrei Nigmatulin */
4431 +#include "fpm_config.h"
4433 +#include "fpm_atomic.h"
4434 +#include "fpm_worker_pool.h"
4435 +#include "fpm_children.h"
4436 +#include "fpm_shm.h"
4437 +#include "fpm_shm_slots.h"
4440 +static void *shm_mem;
4441 +static struct fpm_shm_slot_s *shm_slot;
4443 +int fpm_shm_slots_prepare_slot(struct fpm_child_s *child)
4445 + struct fpm_worker_pool_s *wp = child->wp;
4446 + struct fpm_shm_slot_ptr_s *shm_slot_ptr;
4448 + child->shm_slot_i = wp->slots_used.used;
4450 + shm_slot_ptr = fpm_array_push(&wp->slots_used);
4452 + if (0 == shm_slot_ptr) {
4456 + if (0 == wp->slots_free.used) {
4457 + shm_slot_ptr->shm_slot = fpm_shm_alloc_chunk(&wp->shm_list, sizeof(struct fpm_shm_slot_s), &shm_slot_ptr->mem);
4459 + if (!shm_slot_ptr->shm_slot) {
4464 + *shm_slot_ptr = *(struct fpm_shm_slot_ptr_s *) fpm_array_item_last(&wp->slots_free);
4466 + --wp->slots_free.used;
4469 + memset(shm_slot_ptr->shm_slot, 0, sizeof(struct fpm_shm_slot_s));
4471 + shm_slot_ptr->child = child;
4476 +void fpm_shm_slots_discard_slot(struct fpm_child_s *child)
4478 + struct fpm_shm_slot_ptr_s *shm_slot_ptr;
4479 + struct fpm_worker_pool_s *wp = child->wp;
4482 + shm_slot_ptr = fpm_array_push(&wp->slots_free);
4484 + if (shm_slot_ptr) {
4486 + struct fpm_shm_slot_ptr_s *shm_slot_ptr_used;
4488 + shm_slot_ptr_used = fpm_array_item(&wp->slots_used, child->shm_slot_i);
4490 + *shm_slot_ptr = *shm_slot_ptr_used;
4492 + shm_slot_ptr->child = 0;
4496 + n = fpm_array_item_remove(&wp->slots_used, child->shm_slot_i);
4499 + shm_slot_ptr = fpm_array_item(&wp->slots_used, n);
4501 + shm_slot_ptr->child->shm_slot_i = n;
4505 +void fpm_shm_slots_child_use_slot(struct fpm_child_s *child)
4507 + struct fpm_shm_slot_ptr_s *shm_slot_ptr;
4508 + struct fpm_worker_pool_s *wp = child->wp;
4510 + shm_slot_ptr = fpm_array_item(&wp->slots_used, child->shm_slot_i);
4512 + shm_slot = shm_slot_ptr->shm_slot;
4513 + shm_mem = shm_slot_ptr->mem;
4516 +void fpm_shm_slots_parent_use_slot(struct fpm_child_s *child)
4518 + /* nothing to do */
4521 +void *fpm_shm_slots_mem()
4526 +struct fpm_shm_slot_s *fpm_shm_slot(struct fpm_child_s *child)
4528 + struct fpm_shm_slot_ptr_s *shm_slot_ptr;
4529 + struct fpm_worker_pool_s *wp = child->wp;
4531 + shm_slot_ptr = fpm_array_item(&wp->slots_used, child->shm_slot_i);
4533 + return shm_slot_ptr->shm_slot;
4536 +struct fpm_shm_slot_s *fpm_shm_slots_acquire(struct fpm_shm_slot_s *s, int nohang)
4542 + if (0 > fpm_spinlock(&s->lock, nohang)) {
4549 +void fpm_shm_slots_release(struct fpm_shm_slot_s *s)
4554 --- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_shm_slots.h 1970-01-01 03:00:00.000000000 +0300
4555 +++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_shm_slots.h 2008-05-24 21:38:47.000000000 +0400
4559 + /* (c) 2007,2008 Andrei Nigmatulin */
4561 +#ifndef FPM_SHM_SLOTS_H
4562 +#define FPM_SHM_SLOTS_H 1
4564 +#include "fpm_atomic.h"
4565 +#include "fpm_worker_pool.h"
4566 +#include "fpm_request.h"
4568 +struct fpm_child_s;
4570 +struct fpm_shm_slot_s {
4575 + enum fpm_request_stage_e request_stage;
4576 + struct timeval accepted;
4577 + struct timeval tv;
4578 + char request_method[16];
4579 + size_t content_length; /* used with POST only */
4580 + char script_filename[256];
4583 +struct fpm_shm_slot_ptr_s {
4585 + struct fpm_shm_slot_s *shm_slot;
4586 + struct fpm_child_s *child;
4589 +int fpm_shm_slots_prepare_slot(struct fpm_child_s *child);
4590 +void fpm_shm_slots_discard_slot(struct fpm_child_s *child);
4591 +void fpm_shm_slots_child_use_slot(struct fpm_child_s *child);
4592 +void fpm_shm_slots_parent_use_slot(struct fpm_child_s *child);
4593 +void *fpm_shm_slots_mem();
4594 +struct fpm_shm_slot_s *fpm_shm_slot(struct fpm_child_s *child);
4595 +struct fpm_shm_slot_s *fpm_shm_slots_acquire(struct fpm_shm_slot_s *, int nohang);
4596 +void fpm_shm_slots_release(struct fpm_shm_slot_s *);
4600 --- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_signals.c 1970-01-01 03:00:00.000000000 +0300
4601 +++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_signals.c 2008-08-26 19:09:15.000000000 +0400
4605 + /* (c) 2007,2008 Andrei Nigmatulin */
4607 +#include "fpm_config.h"
4609 +#include <signal.h>
4611 +#include <sys/types.h>
4612 +#include <sys/socket.h>
4613 +#include <stdlib.h>
4614 +#include <string.h>
4616 +#include <unistd.h>
4620 +#include "fpm_signals.h"
4621 +#include "fpm_sockets.h"
4622 +#include "fpm_php.h"
4627 +const char *fpm_signal_names[NSIG + 1] = {
4629 + [SIGHUP] = "SIGHUP",
4632 + [SIGINT] = "SIGINT",
4635 + [SIGQUIT] = "SIGQUIT",
4638 + [SIGILL] = "SIGILL",
4641 + [SIGTRAP] = "SIGTRAP",
4644 + [SIGABRT] = "SIGABRT",
4647 + [SIGEMT] = "SIGEMT",
4650 + [SIGBUS] = "SIGBUS",
4653 + [SIGFPE] = "SIGFPE",
4656 + [SIGKILL] = "SIGKILL",
4659 + [SIGUSR1] = "SIGUSR1",
4662 + [SIGSEGV] = "SIGSEGV",
4665 + [SIGUSR2] = "SIGUSR2",
4668 + [SIGPIPE] = "SIGPIPE",
4671 + [SIGALRM] = "SIGALRM",
4674 + [SIGTERM] = "SIGTERM",
4677 + [SIGCHLD] = "SIGCHLD",
4680 + [SIGCONT] = "SIGCONT",
4683 + [SIGSTOP] = "SIGSTOP",
4686 + [SIGTSTP] = "SIGTSTP",
4689 + [SIGTTIN] = "SIGTTIN",
4692 + [SIGTTOU] = "SIGTTOU",
4695 + [SIGURG] = "SIGURG",
4698 + [SIGXCPU] = "SIGXCPU",
4701 + [SIGXFSZ] = "SIGXFSZ",
4704 + [SIGVTALRM] = "SIGVTALRM",
4707 + [SIGPROF] = "SIGPROF",
4710 + [SIGWINCH] = "SIGWINCH",
4713 + [SIGINFO] = "SIGINFO",
4716 + [SIGIO] = "SIGIO",
4719 + [SIGPWR] = "SIGPWR",
4722 + [SIGSYS] = "SIGSYS",
4725 + [SIGWAITING] = "SIGWAITING",
4728 + [SIGLWP] = "SIGLWP",
4731 + [SIGFREEZE] = "SIGFREEZE",
4734 + [SIGTHAW] = "SIGTHAW",
4737 + [SIGCANCEL] = "SIGCANCEL",
4740 + [SIGLOST] = "SIGLOST",
4744 +static void sig_soft_quit(int signo)
4746 + int saved_errno = errno;
4748 + /* closing fastcgi listening socket will force fcgi_accept() exit immediately */
4750 + socket(AF_UNIX, SOCK_STREAM, 0);
4752 + fpm_php_soft_quit();
4754 + errno = saved_errno;
4757 +static void sig_handler(int signo)
4759 + static const char sig_chars[NSIG + 1] = {
4770 + if (fpm_globals.parent_pid != getpid()) {
4771 + /* prevent a signal race condition when child process
4772 + have not set up it's own signal handler yet */
4776 + saved_errno = errno;
4778 + s = sig_chars[signo];
4780 + write(sp[1], &s, sizeof(s));
4782 + errno = saved_errno;
4785 +int fpm_signals_init_main()
4787 + struct sigaction act;
4789 + if (0 > socketpair(AF_UNIX, SOCK_STREAM, 0, sp)) {
4790 + zlog(ZLOG_STUFF, ZLOG_SYSERROR, "socketpair() failed");
4794 + if (0 > fd_set_blocked(sp[0], 0) || 0 > fd_set_blocked(sp[1], 0)) {
4795 + zlog(ZLOG_STUFF, ZLOG_SYSERROR, "fd_set_blocked() failed");
4799 + if (0 > fcntl(sp[0], F_SETFD, FD_CLOEXEC) || 0 > fcntl(sp[1], F_SETFD, FD_CLOEXEC)) {
4800 + zlog(ZLOG_STUFF, ZLOG_SYSERROR, "fcntl(F_SETFD, FD_CLOEXEC) failed");
4804 + memset(&act, 0, sizeof(act));
4805 + act.sa_handler = sig_handler;
4806 + sigfillset(&act.sa_mask);
4808 + if (0 > sigaction(SIGTERM, &act, 0) ||
4809 + 0 > sigaction(SIGINT, &act, 0) ||
4810 + 0 > sigaction(SIGUSR1, &act, 0) ||
4811 + 0 > sigaction(SIGUSR2, &act, 0) ||
4812 + 0 > sigaction(SIGCHLD, &act, 0) ||
4813 + 0 > sigaction(SIGQUIT, &act, 0)) {
4815 + zlog(ZLOG_STUFF, ZLOG_SYSERROR, "sigaction() failed");
4822 +int fpm_signals_init_child()
4824 + struct sigaction act, act_dfl;
4826 + memset(&act, 0, sizeof(act));
4827 + memset(&act_dfl, 0, sizeof(act_dfl));
4829 + act.sa_handler = &sig_soft_quit;
4830 + act.sa_flags |= SA_RESTART;
4832 + act_dfl.sa_handler = SIG_DFL;
4837 + if (0 > sigaction(SIGTERM, &act_dfl, 0) ||
4838 + 0 > sigaction(SIGINT, &act_dfl, 0) ||
4839 + 0 > sigaction(SIGUSR1, &act_dfl, 0) ||
4840 + 0 > sigaction(SIGUSR2, &act_dfl, 0) ||
4841 + 0 > sigaction(SIGCHLD, &act_dfl, 0) ||
4842 + 0 > sigaction(SIGQUIT, &act, 0)) {
4844 + zlog(ZLOG_STUFF, ZLOG_SYSERROR, "sigaction() failed");
4851 +int fpm_signals_get_fd()
4855 --- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_signals.h 1970-01-01 03:00:00.000000000 +0300
4856 +++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_signals.h 2008-05-24 21:38:47.000000000 +0400
4860 + /* (c) 2007,2008 Andrei Nigmatulin */
4862 +#ifndef FPM_SIGNALS_H
4863 +#define FPM_SIGNALS_H 1
4865 +#include <signal.h>
4867 +int fpm_signals_init_main();
4868 +int fpm_signals_init_child();
4869 +int fpm_signals_get_fd();
4871 +extern const char *fpm_signal_names[NSIG + 1];
4874 --- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_sockets.c 1970-01-01 03:00:00.000000000 +0300
4875 +++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_sockets.c 2008-12-13 06:21:18.000000000 +0300
4879 + /* (c) 2007,2008 Andrei Nigmatulin */
4881 +#include "fpm_config.h"
4883 +#ifdef HAVE_ALLOCA_H
4884 +#include <alloca.h>
4886 +#include <sys/types.h>
4887 +#include <sys/stat.h> /* for chmod(2) */
4888 +#include <sys/socket.h>
4889 +#include <netinet/in.h>
4890 +#include <arpa/inet.h>
4891 +#include <sys/un.h>
4894 +#include <stdlib.h>
4895 +#include <string.h>
4897 +#include <unistd.h>
4900 +#include "fpm_arrays.h"
4901 +#include "fpm_sockets.h"
4902 +#include "fpm_worker_pool.h"
4903 +#include "fpm_unix.h"
4904 +#include "fpm_str.h"
4905 +#include "fpm_env.h"
4906 +#include "fpm_cleanup.h"
4908 +struct listening_socket_s {
4915 +static struct fpm_array_s sockets_list;
4917 +static int fpm_sockets_resolve_af_inet(char *node, char *service, struct sockaddr_in *addr)
4919 + struct addrinfo *res;
4920 + struct addrinfo hints;
4923 + memset(&hints, 0, sizeof(hints));
4925 + hints.ai_family = AF_INET;
4927 + ret = getaddrinfo(node, service, &hints, &res);
4930 + zlog(ZLOG_STUFF, ZLOG_ERROR, "can't resolve hostname '%s%s%s': getaddrinfo said: %s%s%s\n",
4931 + node, service ? ":" : "", service ? service : "",
4932 + gai_strerror(ret), ret == EAI_SYSTEM ? ", system error: " : "", ret == EAI_SYSTEM ? strerror(errno) : "");
4936 + *addr = *(struct sockaddr_in *) res->ai_addr;
4938 + freeaddrinfo(res);
4943 +enum { FPM_GET_USE_SOCKET = 1, FPM_STORE_SOCKET = 2, FPM_STORE_USE_SOCKET = 3 };
4945 +static void fpm_sockets_cleanup(int which, void *arg)
4948 + char *env_value = 0;
4950 + struct listening_socket_s *ls = sockets_list.data;
4952 + for (i = 0; i < sockets_list.used; i++, ls++) {
4954 + if (which != FPM_CLEANUP_PARENT_EXEC) {
4959 + else { /* on PARENT EXEC we want socket fds to be inherited through environment variable */
4961 + sprintf(fd, "%d", ls->sock);
4962 + env_value = realloc(env_value, p + (p ? 1 : 0) + strlen(ls->key) + 1 + strlen(fd) + 1);
4963 + p += sprintf(env_value + p, "%s%s=%s", p ? "," : "", ls->key, fd);
4966 + if (which == FPM_CLEANUP_PARENT_EXIT_MAIN) {
4968 + if (ls->type == FPM_AF_UNIX) {
4978 + setenv("FPM_SOCKETS", env_value, 1);
4982 + fpm_array_free(&sockets_list);
4985 +static int fpm_sockets_hash_op(int sock, struct sockaddr *sa, char *key, int type, int op)
4988 + if (key == NULL) {
4992 + case FPM_AF_INET : {
4993 + struct sockaddr_in *sa_in = (struct sockaddr_in *) sa;
4995 + key = alloca(sizeof("xxx.xxx.xxx.xxx:ppppp"));
4997 + sprintf(key, "%u.%u.%u.%u:%u", IPQUAD(&sa_in->sin_addr), (unsigned int) ntohs(sa_in->sin_port));
5002 + case FPM_AF_UNIX : {
5003 + struct sockaddr_un *sa_un = (struct sockaddr_un *) sa;
5005 + key = alloca(strlen(sa_un->sun_path) + 1);
5007 + strcpy(key, sa_un->sun_path);
5021 + case FPM_GET_USE_SOCKET :
5025 + struct listening_socket_s *ls = sockets_list.data;
5027 + for (i = 0; i < sockets_list.used; i++, ls++) {
5029 + if (!strcmp(ls->key, key)) {
5038 + case FPM_STORE_SOCKET : /* inherited socket */
5039 + case FPM_STORE_USE_SOCKET : /* just created */
5042 + struct listening_socket_s *ls;
5044 + ls = fpm_array_push(&sockets_list);
5050 + if (op == FPM_STORE_SOCKET) {
5058 + ls->key = strdup(key);
5069 +static int fpm_sockets_new_listening_socket(struct fpm_worker_pool_s *wp, struct sockaddr *sa, int socklen)
5074 + mode_t saved_umask;
5076 + /* we have custom backlog value */
5077 + if (wp->config->listen_options) {
5078 + backlog = wp->config->listen_options->backlog;
5081 + sock = socket(sa->sa_family, SOCK_STREAM, 0);
5084 + zlog(ZLOG_STUFF, ZLOG_SYSERROR, "socket() failed");
5088 + setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &flags, sizeof(flags));
5090 + if (wp->listen_address_domain == FPM_AF_UNIX) {
5091 + unlink( ((struct sockaddr_un *) sa)->sun_path);
5094 + saved_umask = umask(0777 ^ wp->socket_mode);
5096 + if (0 > bind(sock, sa, socklen)) {
5097 + zlog(ZLOG_STUFF, ZLOG_SYSERROR, "bind() for address '%s' failed", wp->config->listen_address);
5101 + if (wp->listen_address_domain == FPM_AF_UNIX) {
5103 + char *path = ((struct sockaddr_un *) sa)->sun_path;
5105 + if (wp->socket_uid != -1 || wp->socket_gid != -1) {
5107 + if (0 > chown(path, wp->socket_uid, wp->socket_gid)) {
5108 + zlog(ZLOG_STUFF, ZLOG_SYSERROR, "chown() for address '%s' failed", wp->config->listen_address);
5116 + umask(saved_umask);
5118 + if (0 > listen(sock, backlog)) {
5119 + zlog(ZLOG_STUFF, ZLOG_SYSERROR, "listen() for address '%s' failed", wp->config->listen_address);
5126 +static int fpm_sockets_get_listening_socket(struct fpm_worker_pool_s *wp, struct sockaddr *sa, int socklen)
5130 + sock = fpm_sockets_hash_op(0, sa, 0, wp->listen_address_domain, FPM_GET_USE_SOCKET);
5132 + if (sock >= 0) return sock;
5134 + sock = fpm_sockets_new_listening_socket(wp, sa, socklen);
5136 + fpm_sockets_hash_op(sock, sa, 0, wp->listen_address_domain, FPM_STORE_USE_SOCKET);
5141 +enum fpm_address_domain fpm_sockets_domain_from_address(char *address)
5143 + if (strchr(address, ':')) return FPM_AF_INET;
5145 + if (strlen(address) == strspn(address, "0123456789")) return FPM_AF_INET;
5147 + return FPM_AF_UNIX;
5150 +static int fpm_socket_af_inet_listening_socket(struct fpm_worker_pool_s *wp)
5152 + struct sockaddr_in sa_in;
5153 + char *dup_address = strdup(wp->config->listen_address);
5154 + char *port_str = strchr(dup_address, ':');
5155 + char *addr = NULL;
5158 + if (port_str) { /* this is host:port pair */
5159 + *port_str++ = '\0';
5160 + port = atoi(port_str);
5161 + addr = dup_address;
5163 + else if (strlen(dup_address) == strspn(dup_address, "0123456789")) { /* this is port */
5164 + port = atoi(dup_address);
5165 + port_str = dup_address;
5169 + zlog(ZLOG_STUFF, ZLOG_ERROR, "invalid port value '%s'", port_str);
5173 + memset(&sa_in, 0, sizeof(sa_in));
5177 + sa_in.sin_addr.s_addr = inet_addr(addr);
5179 + if (sa_in.sin_addr.s_addr == INADDR_NONE) { /* do resolve */
5180 + if (0 > fpm_sockets_resolve_af_inet(addr, NULL, &sa_in)) {
5183 + zlog(ZLOG_STUFF, ZLOG_NOTICE, "address '%s' resolved as %u.%u.%u.%u", addr, IPQUAD(&sa_in.sin_addr));
5188 + sa_in.sin_addr.s_addr = htonl(INADDR_ANY);
5192 + sa_in.sin_family = AF_INET;
5193 + sa_in.sin_port = htons(port);
5195 + free(dup_address);
5197 + return fpm_sockets_get_listening_socket(wp, (struct sockaddr *) &sa_in, sizeof(struct sockaddr_in));
5200 +static int fpm_socket_af_unix_listening_socket(struct fpm_worker_pool_s *wp)
5202 + struct sockaddr_un sa_un;
5204 + memset(&sa_un, 0, sizeof(sa_un));
5206 + cpystrn(sa_un.sun_path, wp->config->listen_address, sizeof(sa_un.sun_path));
5207 + sa_un.sun_family = AF_UNIX;
5209 + return fpm_sockets_get_listening_socket(wp, (struct sockaddr *) &sa_un, sizeof(struct sockaddr_un));
5212 +int fpm_sockets_init_main()
5215 + struct fpm_worker_pool_s *wp;
5216 + char *inherited = getenv("FPM_SOCKETS");
5217 + struct listening_socket_s *ls;
5219 + if (0 == fpm_array_init(&sockets_list, sizeof(struct listening_socket_s), 10)) {
5223 + /* import inherited sockets */
5224 + while (inherited && *inherited) {
5225 + char *comma = strchr(inherited, ',');
5229 + if (comma) *comma = '\0';
5231 + eq = strchr(inherited, '=');
5236 + fd_no = atoi(eq + 1);
5238 + type = fpm_sockets_domain_from_address(inherited);
5240 + zlog(ZLOG_STUFF, ZLOG_NOTICE, "using inherited socket fd=%d, \"%s\"", fd_no, inherited);
5242 + fpm_sockets_hash_op(fd_no, 0, inherited, type, FPM_STORE_SOCKET);
5245 + if (comma) inherited = comma + 1;
5246 + else inherited = 0;
5249 + /* create all required sockets */
5250 + for (wp = fpm_worker_all_pools; wp; wp = wp->next) {
5252 + if (!wp->is_template) {
5254 + switch (wp->listen_address_domain) {
5256 + case FPM_AF_INET :
5258 + wp->listening_socket = fpm_socket_af_inet_listening_socket(wp);
5261 + case FPM_AF_UNIX :
5263 + if (0 > fpm_unix_resolve_socket_premissions(wp)) {
5267 + wp->listening_socket = fpm_socket_af_unix_listening_socket(wp);
5272 + if (wp->listening_socket == -1) {
5279 + /* close unused sockets that was inherited */
5280 + ls = sockets_list.data;
5282 + for (i = 0; i < sockets_list.used; ) {
5284 + if (ls->refcount == 0) {
5286 + if (ls->type == FPM_AF_UNIX) {
5290 + fpm_array_item_remove(&sockets_list, i);
5298 + if (0 > fpm_cleanup_add(FPM_CLEANUP_ALL, fpm_sockets_cleanup, 0)) {
5304 --- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_sockets.h 1970-01-01 03:00:00.000000000 +0300
5305 +++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_sockets.h 2008-08-26 19:09:15.000000000 +0400
5309 + /* (c) 2007,2008 Andrei Nigmatulin */
5312 +#define FPM_MISC_H 1
5314 +#include <unistd.h>
5317 +#include "fpm_worker_pool.h"
5319 +enum fpm_address_domain fpm_sockets_domain_from_address(char *addr);
5320 +int fpm_sockets_init_main();
5323 +static inline int fd_set_blocked(int fd, int blocked)
5325 + int flags = fcntl(fd, F_GETFL);
5327 + if (flags < 0) return -1;
5330 + flags &= ~O_NONBLOCK;
5332 + flags |= O_NONBLOCK;
5334 + return fcntl(fd, F_SETFL, flags);
5337 +#define IPQUAD(sin_addr) \
5338 + (unsigned int) ((unsigned char *) &(sin_addr)->s_addr)[0], \
5339 + (unsigned int) ((unsigned char *) &(sin_addr)->s_addr)[1], \
5340 + (unsigned int) ((unsigned char *) &(sin_addr)->s_addr)[2], \
5341 + (unsigned int) ((unsigned char *) &(sin_addr)->s_addr)[3]
5344 --- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_stdio.c 1970-01-01 03:00:00.000000000 +0300
5345 +++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_stdio.c 2008-12-13 06:32:24.000000000 +0300
5349 + /* (c) 2007,2008 Andrei Nigmatulin */
5351 +#include "fpm_config.h"
5353 +#include <sys/types.h>
5354 +#include <sys/stat.h>
5355 +#include <string.h>
5357 +#include <unistd.h>
5361 +#include "fpm_children.h"
5362 +#include "fpm_events.h"
5363 +#include "fpm_sockets.h"
5364 +#include "fpm_stdio.h"
5367 +static int fd_stdout[2];
5368 +static int fd_stderr[2];
5370 +int fpm_stdio_init_main()
5372 + int fd = open("/dev/null", O_RDWR);
5375 + zlog(ZLOG_STUFF, ZLOG_SYSERROR, "open(\"/dev/null\") failed");
5379 + if (0 > dup2(fd, STDIN_FILENO) || 0 > dup2(fd, STDOUT_FILENO)) {
5380 + zlog(ZLOG_STUFF, ZLOG_SYSERROR, "dup2() failed");
5389 +int fpm_stdio_init_final()
5391 + if (fpm_global_config.daemonize) {
5393 + if (fpm_globals.error_log_fd != STDERR_FILENO) {
5394 + /* there might be messages to stderr from libevent, we need to log them all */
5395 + if (0 > dup2(fpm_globals.error_log_fd, STDERR_FILENO)) {
5396 + zlog(ZLOG_STUFF, ZLOG_SYSERROR, "dup2() failed");
5401 + zlog_set_level(fpm_globals.log_level);
5403 + zlog_set_fd(fpm_globals.error_log_fd);
5409 +int fpm_stdio_init_child(struct fpm_worker_pool_s *wp)
5411 + close(fpm_globals.error_log_fd);
5412 + fpm_globals.error_log_fd = -1;
5415 + if (wp->listening_socket != STDIN_FILENO) {
5416 + if (0 > dup2(wp->listening_socket, STDIN_FILENO)) {
5417 + zlog(ZLOG_STUFF, ZLOG_SYSERROR, "dup2() failed");
5425 +static void fpm_stdio_child_said(int fd, short which, void *arg)
5427 + static const int max_buf_size = 1024;
5428 + char buf[max_buf_size];
5429 + struct fpm_child_s *child = arg;
5430 + int is_stdout = fd == child->fd_stdout;
5431 + struct event *ev = is_stdout ? &child->ev_stdout : &child->ev_stderr;
5432 + int fifo_in = 1, fifo_out = 1;
5433 + int is_last_message = 0;
5438 + zlog(ZLOG_STUFF, ZLOG_DEBUG, "child %d said %s", (int) child->pid, is_stdout ? "stdout" : "stderr");
5441 + while (fifo_in || fifo_out) {
5445 + res = read(fd, buf + in_buf, max_buf_size - 1 - in_buf);
5447 + if (res <= 0) { /* no data */
5450 + if (res < 0 && (errno == EAGAIN || errno == EWOULDBLOCK)) {
5451 + /* just no more data ready */
5453 + else { /* error or pipe is closed */
5455 + if (res < 0) { /* error */
5456 + zlog(ZLOG_STUFF, ZLOG_SYSERROR, "read() failed");
5459 + fpm_event_del(ev);
5460 + is_last_message = 1;
5463 + close(child->fd_stdout);
5464 + child->fd_stdout = -1;
5467 + close(child->fd_stderr);
5468 + child->fd_stderr = -1;
5472 + if (in_buf == 0 && !fpm_globals.is_child) {
5473 + zlog(ZLOG_STUFF, ZLOG_DEBUG, "child %d (pool %s) %s pipe is closed", (int) child->pid,
5474 + child->wp->config->name, is_stdout ? "stdout" : "stderr");
5485 + if (in_buf == 0) {
5490 + int should_print = 0;
5491 + buf[in_buf] = '\0';
5493 + /* FIXME: there might be binary data */
5495 + /* we should print if no more space in the buffer */
5496 + if (in_buf == max_buf_size - 1) {
5500 + /* we should print if no more data to come */
5505 + nl = strchr(buf, '\n');
5507 + if (nl || should_print) {
5513 + zlog(ZLOG_STUFF, ZLOG_WARNING, "child %d (pool %s) said into %s: \"%s\"%s", (int) child->pid,
5514 + child->wp->config->name, is_stdout ? "stdout" : "stderr", buf, is_last_message ? ", pipe is closed" : "");
5517 + int out_buf = 1 + nl - buf;
5518 + memmove(buf, buf + out_buf, in_buf - out_buf);
5519 + in_buf -= out_buf;
5531 +int fpm_stdio_prepare_pipes(struct fpm_child_s *child)
5533 + if (0 == child->wp->config->catch_workers_output) { /* not required */
5537 + if (0 > pipe(fd_stdout)) {
5538 + zlog(ZLOG_STUFF, ZLOG_SYSERROR, "pipe() failed");
5542 + if (0 > pipe(fd_stderr)) {
5543 + zlog(ZLOG_STUFF, ZLOG_SYSERROR, "pipe() failed");
5544 + close(fd_stdout[0]); close(fd_stdout[1]);
5548 + if (0 > fd_set_blocked(fd_stdout[0], 0) || 0 > fd_set_blocked(fd_stderr[0], 0)) {
5549 + zlog(ZLOG_STUFF, ZLOG_SYSERROR, "fd_set_blocked() failed");
5550 + close(fd_stdout[0]); close(fd_stdout[1]);
5551 + close(fd_stderr[0]); close(fd_stderr[1]);
5558 +int fpm_stdio_parent_use_pipes(struct fpm_child_s *child)
5560 + if (0 == child->wp->config->catch_workers_output) { /* not required */
5564 + close(fd_stdout[1]);
5565 + close(fd_stderr[1]);
5567 + child->fd_stdout = fd_stdout[0];
5568 + child->fd_stderr = fd_stderr[0];
5570 + fpm_event_add(child->fd_stdout, &child->ev_stdout, fpm_stdio_child_said, child);
5571 + fpm_event_add(child->fd_stderr, &child->ev_stderr, fpm_stdio_child_said, child);
5576 +int fpm_stdio_discard_pipes(struct fpm_child_s *child)
5578 + if (0 == child->wp->config->catch_workers_output) { /* not required */
5582 + close(fd_stdout[1]);
5583 + close(fd_stderr[1]);
5585 + close(fd_stdout[0]);
5586 + close(fd_stderr[0]);
5591 +void fpm_stdio_child_use_pipes(struct fpm_child_s *child)
5593 + if (child->wp->config->catch_workers_output) {
5594 + dup2(fd_stdout[1], STDOUT_FILENO);
5595 + dup2(fd_stderr[1], STDERR_FILENO);
5596 + close(fd_stdout[0]); close(fd_stdout[1]);
5597 + close(fd_stderr[0]); close(fd_stderr[1]);
5600 + /* stdout of parent is always /dev/null */
5601 + dup2(STDOUT_FILENO, STDERR_FILENO);
5605 +int fpm_stdio_open_error_log(int reopen)
5609 + fd = open(fpm_global_config.error_log, O_WRONLY | O_APPEND | O_CREAT, S_IRUSR | S_IWUSR);
5612 + zlog(ZLOG_STUFF, ZLOG_SYSERROR, "open(\"%s\") failed", fpm_global_config.error_log);
5617 + if (fpm_global_config.daemonize) {
5618 + dup2(fd, STDERR_FILENO);
5621 + dup2(fd, fpm_globals.error_log_fd);
5623 + fd = fpm_globals.error_log_fd; /* for FD_CLOSEXEC to work */
5626 + fpm_globals.error_log_fd = fd;
5629 + fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
5633 --- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_stdio.h 1970-01-01 03:00:00.000000000 +0300
5634 +++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_stdio.h 2008-05-24 21:38:47.000000000 +0400
5638 + /* (c) 2007,2008 Andrei Nigmatulin */
5640 +#ifndef FPM_STDIO_H
5641 +#define FPM_STDIO_H 1
5643 +#include "fpm_worker_pool.h"
5645 +int fpm_stdio_init_main();
5646 +int fpm_stdio_init_final();
5647 +int fpm_stdio_init_child(struct fpm_worker_pool_s *wp);
5648 +int fpm_stdio_prepare_pipes(struct fpm_child_s *child);
5649 +void fpm_stdio_child_use_pipes(struct fpm_child_s *child);
5650 +int fpm_stdio_parent_use_pipes(struct fpm_child_s *child);
5651 +int fpm_stdio_discard_pipes(struct fpm_child_s *child);
5652 +int fpm_stdio_open_error_log(int reopen);
5656 --- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_str.h 1970-01-01 03:00:00.000000000 +0300
5657 +++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_str.h 2008-05-24 21:38:47.000000000 +0400
5661 + /* (c) 2007,2008 Andrei Nigmatulin */
5664 +#define FPM_STR_H 1
5666 +static inline char *cpystrn(char *dst, const char *src, size_t dst_size)
5670 + if (!dst_size) return dst;
5673 + end = dst + dst_size - 1;
5675 + for (; d < end; ++d, ++src) {
5676 + if (!(*d = *src)) {
5686 +static inline char *str_purify_filename(char *dst, char *src, size_t size)
5691 + end = dst + size - 1;
5693 + for (; d < end && *src; ++d, ++src) {
5694 + if (* (unsigned char *) src < ' ' || * (unsigned char *) src > '\x7f') {
5708 --- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_trace.c 1970-01-01 03:00:00.000000000 +0300
5709 +++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_trace.c 2008-07-21 00:59:00.000000000 +0400
5713 + /* (c) 2007,2008 Andrei Nigmatulin */
5715 +#include "fpm_config.h"
5717 +#include <sys/types.h>
5719 +#include "fpm_trace.h"
5721 +int fpm_trace_get_strz(char *buf, size_t sz, long addr)
5725 + char *lc = (char *) &l;
5727 + if (0 > fpm_trace_get_long(addr, &l)) {
5731 + i = l % SIZEOF_LONG;
5735 + for (addr = l; ; addr += SIZEOF_LONG) {
5737 + if (0 > fpm_trace_get_long(addr, &l)) {
5741 + for ( ; i < SIZEOF_LONG; i++) {
5744 + if (sz && lc[i]) {
5757 --- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_trace.h 1970-01-01 03:00:00.000000000 +0300
5758 +++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_trace.h 2008-07-21 02:43:39.000000000 +0400
5762 + /* (c) 2007,2008 Andrei Nigmatulin */
5764 +#ifndef FPM_TRACE_H
5765 +#define FPM_TRACE_H 1
5767 +#include <unistd.h>
5769 +int fpm_trace_signal(pid_t pid);
5770 +int fpm_trace_ready(pid_t pid);
5771 +int fpm_trace_close(pid_t pid);
5772 +int fpm_trace_get_long(long addr, long *data);
5773 +int fpm_trace_get_strz(char *buf, size_t sz, long addr);
5777 --- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_trace_mach.c 1970-01-01 03:00:00.000000000 +0300
5778 +++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_trace_mach.c 2008-08-26 19:09:15.000000000 +0400
5782 + /* (c) 2007,2008 Andrei Nigmatulin */
5784 +#include "fpm_config.h"
5786 +#include <mach/mach.h>
5787 +#include <mach/mach_vm.h>
5789 +#include <unistd.h>
5791 +#include "fpm_trace.h"
5792 +#include "fpm_process_ctl.h"
5793 +#include "fpm_unix.h"
5797 +static mach_port_name_t target;
5798 +static vm_offset_t target_page_base;
5799 +static vm_offset_t local_page;
5800 +static mach_msg_type_number_t local_size;
5802 +static void fpm_mach_vm_deallocate()
5805 + mach_vm_deallocate(mach_task_self(), local_page, local_size);
5806 + target_page_base = 0;
5812 +static int fpm_mach_vm_read_page(vm_offset_t page)
5816 + kr = mach_vm_read(target, page, fpm_pagesize, &local_page, &local_size);
5818 + if (kr != KERN_SUCCESS) {
5819 + zlog(ZLOG_STUFF, ZLOG_ERROR, "mach_vm_read() failed: %s (%d)", mach_error_string(kr), kr);
5826 +int fpm_trace_signal(pid_t pid)
5828 + if (0 > fpm_pctl_kill(pid, FPM_PCTL_STOP)) {
5829 + zlog(ZLOG_STUFF, ZLOG_SYSERROR, "kill(SIGSTOP) failed");
5836 +int fpm_trace_ready(pid_t pid)
5840 + kr = task_for_pid(mach_task_self(), pid, &target);
5842 + if (kr != KERN_SUCCESS) {
5845 + if (kr == KERN_FAILURE) {
5846 + msg = " It seems that master process does not have enough privileges to trace processes.";
5849 + zlog(ZLOG_STUFF, ZLOG_ERROR, "task_for_pid() failed: %s (%d)%s", mach_error_string(kr), kr, msg);
5856 +int fpm_trace_close(pid_t pid)
5858 + fpm_mach_vm_deallocate();
5865 +int fpm_trace_get_long(long addr, long *data)
5867 + size_t offset = ((uintptr_t) (addr) % fpm_pagesize);
5868 + vm_offset_t base = (uintptr_t) (addr) - offset;
5870 + if (base != target_page_base) {
5871 + fpm_mach_vm_deallocate();
5872 + if (0 > fpm_mach_vm_read_page(base)) {
5877 + *data = * (long *) (local_page + offset);
5882 --- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_trace_pread.c 1970-01-01 03:00:00.000000000 +0300
5883 +++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_trace_pread.c 2008-08-26 19:09:15.000000000 +0400
5887 + /* (c) 2007,2008 Andrei Nigmatulin */
5889 +#define _GNU_SOURCE
5890 +#define _FILE_OFFSET_BITS 64
5892 +#include "fpm_config.h"
5894 +#include <unistd.h>
5898 +#include <stdint.h>
5900 +#include "fpm_trace.h"
5901 +#include "fpm_process_ctl.h"
5905 +static int mem_file = -1;
5907 +int fpm_trace_signal(pid_t pid)
5909 + if (0 > fpm_pctl_kill(pid, FPM_PCTL_STOP)) {
5910 + zlog(ZLOG_STUFF, ZLOG_SYSERROR, "kill(SIGSTOP) failed");
5917 +int fpm_trace_ready(pid_t pid)
5921 + sprintf(buf, "/proc/%d/" PROC_MEM_FILE, (int) pid);
5923 + mem_file = open(buf, O_RDONLY);
5925 + if (0 > mem_file) {
5926 + zlog(ZLOG_STUFF, ZLOG_SYSERROR, "open(%s) failed", buf);
5933 +int fpm_trace_close(pid_t pid)
5942 +int fpm_trace_get_long(long addr, long *data)
5944 + if (sizeof(*data) != pread(mem_file, (void *) data, sizeof(*data), (uintptr_t) addr)) {
5945 + zlog(ZLOG_STUFF, ZLOG_SYSERROR, "pread() failed");
5952 --- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_trace_ptrace.c 1970-01-01 03:00:00.000000000 +0300
5953 +++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_trace_ptrace.c 2008-09-19 03:34:11.000000000 +0400
5957 + /* (c) 2007,2008 Andrei Nigmatulin */
5959 +#include "fpm_config.h"
5961 +#include <sys/wait.h>
5962 +#include <sys/ptrace.h>
5963 +#include <unistd.h>
5966 +#if defined(PT_ATTACH) && !defined(PTRACE_ATTACH)
5967 +#define PTRACE_ATTACH PT_ATTACH
5970 +#if defined(PT_DETACH) && !defined(PTRACE_DETACH)
5971 +#define PTRACE_DETACH PT_DETACH
5974 +#if defined(PT_READ_D) && !defined(PTRACE_PEEKDATA)
5975 +#define PTRACE_PEEKDATA PT_READ_D
5978 +#include "fpm_trace.h"
5981 +static pid_t traced_pid;
5983 +int fpm_trace_signal(pid_t pid)
5985 + if (0 > ptrace(PTRACE_ATTACH, pid, 0, 0)) {
5986 + zlog(ZLOG_STUFF, ZLOG_SYSERROR, "ptrace(ATTACH) failed");
5993 +int fpm_trace_ready(pid_t pid)
6000 +int fpm_trace_close(pid_t pid)
6002 + if (0 > ptrace(PTRACE_DETACH, pid, (void *) 1, 0)) {
6003 + zlog(ZLOG_STUFF, ZLOG_SYSERROR, "ptrace(DETACH) failed");
6012 +int fpm_trace_get_long(long addr, long *data)
6015 + struct ptrace_io_desc ptio = {
6016 + .piod_op = PIOD_READ_D,
6017 + .piod_offs = (void *) addr,
6018 + .piod_addr = (void *) data,
6019 + .piod_len = sizeof(long)
6022 + if (0 > ptrace(PT_IO, traced_pid, (void *) &ptio, 0)) {
6023 + zlog(ZLOG_STUFF, ZLOG_SYSERROR, "ptrace(PT_IO) failed");
6029 + *data = ptrace(PTRACE_PEEKDATA, traced_pid, (void *) addr, 0);
6032 + zlog(ZLOG_STUFF, ZLOG_SYSERROR, "ptrace(PEEKDATA) failed");
6040 --- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_unix.c 1970-01-01 03:00:00.000000000 +0300
6041 +++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_unix.c 2008-12-13 06:18:23.000000000 +0300
6045 + /* (c) 2007,2008 Andrei Nigmatulin */
6047 +#include "fpm_config.h"
6049 +#include <string.h>
6050 +#include <sys/time.h>
6051 +#include <sys/resource.h>
6052 +#include <stdlib.h>
6053 +#include <unistd.h>
6054 +#include <sys/types.h>
6059 +#include <sys/prctl.h>
6063 +#include "fpm_conf.h"
6064 +#include "fpm_cleanup.h"
6065 +#include "fpm_clock.h"
6066 +#include "fpm_stdio.h"
6067 +#include "fpm_unix.h"
6070 +size_t fpm_pagesize;
6072 +int fpm_unix_resolve_socket_premissions(struct fpm_worker_pool_s *wp)
6074 + struct fpm_listen_options_s *lo = wp->config->listen_options;
6076 + /* uninitialized */
6077 + wp->socket_uid = -1;
6078 + wp->socket_gid = -1;
6079 + wp->socket_mode = 0666;
6081 + if (!lo) return 0;
6083 + if (lo->owner && *lo->owner) {
6084 + struct passwd *pwd;
6086 + pwd = getpwnam(lo->owner);
6089 + zlog(ZLOG_STUFF, ZLOG_SYSERROR, "cannot get uid for user '%s', pool '%s'", lo->owner, wp->config->name);
6093 + wp->socket_uid = pwd->pw_uid;
6094 + wp->socket_gid = pwd->pw_gid;
6097 + if (lo->group && *lo->group) {
6098 + struct group *grp;
6100 + grp = getgrnam(lo->group);
6103 + zlog(ZLOG_STUFF, ZLOG_SYSERROR, "cannot get gid for group '%s', pool '%s'", lo->group, wp->config->name);
6107 + wp->socket_gid = grp->gr_gid;
6110 + if (lo->mode && *lo->mode) {
6111 + wp->socket_mode = strtoul(lo->mode, 0, 8);
6117 +static int fpm_unix_conf_wp(struct fpm_worker_pool_s *wp)
6119 + int is_root = !geteuid();
6122 + if (wp->config->user && *wp->config->user) {
6124 + if (strlen(wp->config->user) == strspn(wp->config->user, "0123456789")) {
6125 + wp->set_uid = strtoul(wp->config->user, 0, 10);
6128 + struct passwd *pwd;
6130 + pwd = getpwnam(wp->config->user);
6133 + zlog(ZLOG_STUFF, ZLOG_ERROR, "cannot get uid for user '%s', pool '%s'", wp->config->user, wp->config->name);
6137 + wp->set_uid = pwd->pw_uid;
6138 + wp->set_gid = pwd->pw_gid;
6140 + wp->user = strdup(pwd->pw_name);
6141 + wp->home = strdup(pwd->pw_dir);
6145 + if (wp->config->group && *wp->config->group) {
6147 + if (strlen(wp->config->group) == strspn(wp->config->group, "0123456789")) {
6148 + wp->set_gid = strtoul(wp->config->group, 0, 10);
6151 + struct group *grp;
6153 + grp = getgrnam(wp->config->group);
6156 + zlog(ZLOG_STUFF, ZLOG_ERROR, "cannot get gid for group '%s', pool '%s'", wp->config->group, wp->config->name);
6160 + wp->set_gid = grp->gr_gid;
6164 +#ifndef I_REALLY_WANT_ROOT_PHP
6165 + if (wp->set_uid == 0 || wp->set_gid == 0) {
6166 + zlog(ZLOG_STUFF, ZLOG_ERROR, "please specify user and group other than root, pool '%s'", wp->config->name);
6171 + else { /* not root */
6172 + if (wp->config->user && *wp->config->user) {
6173 + zlog(ZLOG_STUFF, ZLOG_WARNING, "'user' directive is ignored, pool '%s'", wp->config->name);
6175 + if (wp->config->group && *wp->config->group) {
6176 + zlog(ZLOG_STUFF, ZLOG_WARNING, "'group' directive is ignored, pool '%s'", wp->config->name);
6178 + if (wp->config->chroot && *wp->config->chroot) {
6179 + zlog(ZLOG_STUFF, ZLOG_WARNING, "'chroot' directive is ignored, pool '%s'", wp->config->name);
6182 + { /* set up HOME and USER anyway */
6183 + struct passwd *pwd;
6185 + pwd = getpwuid(getuid());
6188 + wp->user = strdup(pwd->pw_name);
6189 + wp->home = strdup(pwd->pw_dir);
6197 +int fpm_unix_init_child(struct fpm_worker_pool_s *wp)
6199 + int is_root = !geteuid();
6200 + int made_chroot = 0;
6202 + if (wp->config->rlimit_files) {
6205 + getrlimit(RLIMIT_NOFILE, &r);
6207 + r.rlim_cur = (rlim_t) wp->config->rlimit_files;
6209 + if (0 > setrlimit(RLIMIT_NOFILE, &r)) {
6210 + zlog(ZLOG_STUFF, ZLOG_SYSERROR, "setrlimit(RLIMIT_NOFILE) failed");
6214 + if (wp->config->rlimit_core) {
6217 + getrlimit(RLIMIT_CORE, &r);
6219 + r.rlim_cur = wp->config->rlimit_core == -1 ? (rlim_t) RLIM_INFINITY : (rlim_t) wp->config->rlimit_core;
6221 + if (0 > setrlimit(RLIMIT_CORE, &r)) {
6222 + zlog(ZLOG_STUFF, ZLOG_SYSERROR, "setrlimit(RLIMIT_CORE) failed");
6226 + if (is_root && wp->config->chroot && *wp->config->chroot) {
6227 + if (0 > chroot(wp->config->chroot)) {
6228 + zlog(ZLOG_STUFF, ZLOG_SYSERROR, "chroot(%s) failed", wp->config->chroot);
6234 + if (wp->config->chdir && *wp->config->chdir) {
6235 + if (0 > chdir(wp->config->chdir)) {
6236 + zlog(ZLOG_STUFF, ZLOG_SYSERROR, "chdir(%s) failed", wp->config->chdir);
6240 + else if (made_chroot) {
6245 + if (wp->set_gid) {
6246 + if (0 > setgid(wp->set_gid)) {
6247 + zlog(ZLOG_STUFF, ZLOG_SYSERROR, "setgid(%d) failed", wp->set_gid);
6251 + if (wp->set_uid) {
6252 + if (0 > initgroups(wp->config->user, wp->set_gid)) {
6253 + zlog(ZLOG_STUFF, ZLOG_SYSERROR, "initgroups(%s, %d) failed", wp->config->user, wp->set_gid);
6256 + if (0 > setuid(wp->set_uid)) {
6257 + zlog(ZLOG_STUFF, ZLOG_SYSERROR, "setuid(%d) failed", wp->set_uid);
6264 + if (0 > prctl(PR_SET_DUMPABLE, 1, 0, 0, 0)) {
6265 + zlog(ZLOG_STUFF, ZLOG_SYSERROR, "prctl(PR_SET_DUMPABLE) failed");
6269 + if (0 > fpm_clock_init()) {
6276 +int fpm_unix_init_main()
6278 + struct fpm_worker_pool_s *wp;
6280 + fpm_pagesize = getpagesize();
6282 + if (fpm_global_config.daemonize) {
6288 + zlog(ZLOG_STUFF, ZLOG_SYSERROR, "fork() failed");
6297 + fpm_cleanups_run(FPM_CLEANUP_PARENT_EXIT);
6306 + if (0 > fpm_clock_init()) {
6310 + fpm_globals.parent_pid = getpid();
6312 + for (wp = fpm_worker_all_pools; wp; wp = wp->next) {
6314 + if (0 > fpm_unix_conf_wp(wp)) {
6320 + fpm_stdio_init_final();
6324 + getrlimit(RLIMIT_NOFILE, &r);
6326 + zlog(ZLOG_STUFF, ZLOG_NOTICE, "getrlimit(nofile): max:%lld, cur:%lld",
6327 + (long long) r.rlim_max, (long long) r.rlim_cur);
6332 --- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_unix.h 1970-01-01 03:00:00.000000000 +0300
6333 +++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_unix.h 2008-05-25 17:21:13.000000000 +0400
6337 + /* (c) 2007,2008 Andrei Nigmatulin */
6340 +#define FPM_UNIX_H 1
6342 +#include "fpm_worker_pool.h"
6344 +int fpm_unix_resolve_socket_premissions(struct fpm_worker_pool_s *wp);
6345 +int fpm_unix_init_child(struct fpm_worker_pool_s *wp);
6346 +int fpm_unix_init_main();
6348 +extern size_t fpm_pagesize;
6352 --- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_worker_pool.c 1970-01-01 03:00:00.000000000 +0300
6353 +++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_worker_pool.c 2008-12-13 06:21:18.000000000 +0300
6357 + /* (c) 2007,2008 Andrei Nigmatulin */
6359 +#include "fpm_config.h"
6361 +#include <string.h>
6362 +#include <stdlib.h>
6363 +#include <unistd.h>
6365 +#include "fpm_worker_pool.h"
6366 +#include "fpm_cleanup.h"
6367 +#include "fpm_children.h"
6368 +#include "fpm_shm.h"
6369 +#include "fpm_shm_slots.h"
6370 +#include "fpm_conf.h"
6372 +struct fpm_worker_pool_s *fpm_worker_all_pools;
6374 +static void fpm_worker_pool_cleanup(int which, void *arg)
6376 + struct fpm_worker_pool_s *wp, *wp_next;
6378 + for (wp = fpm_worker_all_pools; wp; wp = wp_next) {
6379 + wp_next = wp->next;
6380 + fpm_worker_pool_config_free(wp->config);
6381 + fpm_children_free(wp->children);
6382 + fpm_array_free(&wp->slots_used);
6383 + fpm_array_free(&wp->slots_free);
6384 + fpm_shm_free_list(wp->shm_list, which == FPM_CLEANUP_CHILD ? fpm_shm_slots_mem() : 0);
6391 + fpm_worker_all_pools = 0;
6394 +struct fpm_worker_pool_s *fpm_worker_pool_alloc()
6396 + struct fpm_worker_pool_s *ret;
6398 + ret = malloc(sizeof(struct fpm_worker_pool_s));
6404 + memset(ret, 0, sizeof(struct fpm_worker_pool_s));
6406 + if (!fpm_worker_all_pools) {
6407 + fpm_worker_all_pools = ret;
6410 + fpm_array_init(&ret->slots_used, sizeof(struct fpm_shm_slot_ptr_s), 50);
6411 + fpm_array_init(&ret->slots_free, sizeof(struct fpm_shm_slot_ptr_s), 50);
6416 +int fpm_worker_pool_init_main()
6418 + if (0 > fpm_cleanup_add(FPM_CLEANUP_ALL, fpm_worker_pool_cleanup, 0)) {
6424 --- php-5.2.8.vanilla/sapi/cgi/fpm/fpm_worker_pool.h 1970-01-01 03:00:00.000000000 +0300
6425 +++ php-5.2.8.fpm/sapi/cgi/fpm/fpm_worker_pool.h 2008-08-26 19:09:15.000000000 +0400
6429 + /* (c) 2007,2008 Andrei Nigmatulin */
6431 +#ifndef FPM_WORKER_POOL_H
6432 +#define FPM_WORKER_POOL_H 1
6434 +#include "fpm_conf.h"
6435 +#include "fpm_arrays.h"
6437 +struct fpm_worker_pool_s;
6438 +struct fpm_child_s;
6439 +struct fpm_child_stat_s;
6442 +enum fpm_address_domain {
6447 +struct fpm_worker_pool_s {
6448 + struct fpm_worker_pool_s *next;
6449 + struct fpm_worker_pool_config_s *config;
6450 + char *user, *home; /* for setting env USER and HOME */
6451 + enum fpm_address_domain listen_address_domain;
6452 + int listening_socket;
6453 + int set_uid, set_gid; /* config uid and gid */
6454 + unsigned is_template:1; /* just config template, no processes will be created */
6455 + int socket_uid, socket_gid, socket_mode;
6457 + struct fpm_shm_s *shm_list;
6458 + struct fpm_array_s slots_used;
6459 + struct fpm_array_s slots_free;
6462 + struct fpm_child_s *children;
6463 + int running_children;
6466 +struct fpm_worker_pool_s *fpm_worker_pool_alloc();
6467 +int fpm_worker_pool_init_main();
6469 +extern struct fpm_worker_pool_s *fpm_worker_all_pools;
6473 --- php-5.2.8.vanilla/sapi/cgi/fpm/init.d/php-fpm.in 1970-01-01 03:00:00.000000000 +0300
6474 +++ php-5.2.8.fpm/sapi/cgi/fpm/init.d/php-fpm.in 2008-08-26 19:09:18.000000000 +0400
6478 +php_fpm_BIN=@prefix@/bin/php-cgi
6479 +php_fpm_CONF=@php_fpm_conf_path@
6480 +php_fpm_PID=@php_fpm_pid_path@
6483 +php_opts="--fpm-config $php_fpm_CONF"
6489 + while test $try -lt 35 ; do
6493 + if [ -f "$2" ] ; then
6500 + if [ ! -f "$2" ] ; then
6508 + try=`expr $try + 1`
6517 + echo -n "Starting php_fpm "
6519 + $php_fpm_BIN --fpm $php_opts
6521 + if [ "$?" != 0 ] ; then
6526 + wait_for_pid created $php_fpm_PID
6528 + if [ -n "$try" ] ; then
6537 + echo -n "Shutting down php_fpm "
6539 + if [ ! -r $php_fpm_PID ] ; then
6540 + echo "warning, no pid file found - php-fpm is not running ?"
6544 + kill -TERM `cat $php_fpm_PID`
6546 + wait_for_pid removed $php_fpm_PID
6548 + if [ -n "$try" ] ; then
6557 + echo -n "Gracefully shutting down php_fpm "
6559 + if [ ! -r $php_fpm_PID ] ; then
6560 + echo "warning, no pid file found - php-fpm is not running ?"
6564 + kill -QUIT `cat $php_fpm_PID`
6566 + wait_for_pid removed $php_fpm_PID
6568 + if [ -n "$try" ] ; then
6583 + echo -n "Reload service php-fpm "
6585 + if [ ! -r $php_fpm_PID ] ; then
6586 + echo "warning, no pid file found - php-fpm is not running ?"
6590 + kill -USR2 `cat $php_fpm_PID`
6597 + echo -n "Re-opening php-fpm log file "
6599 + if [ ! -r $php_fpm_PID ] ; then
6600 + echo "warning, no pid file found - php-fpm is not running ?"
6604 + kill -USR1 `cat $php_fpm_PID`
6610 + echo "Usage: $0 {start|stop|quit|restart|reload|logrotate}"
6615 --- php-5.2.8.vanilla/sapi/cgi/fpm/Makefile.frag 1970-01-01 03:00:00.000000000 +0300
6616 +++ php-5.2.8.fpm/sapi/cgi/fpm/Makefile.frag 2008-03-28 21:58:30.000000000 +0300
6619 +install-fpm: sapi/cgi/fpm/php-fpm.conf sapi/cgi/fpm/php-fpm
6620 + @echo "Installing FPM config: $(INSTALL_ROOT)$(php_fpm_conf_path)"
6621 + -@$(mkinstalldirs) \
6622 + $(INSTALL_ROOT)$(prefix)/sbin \
6623 + `dirname "$(INSTALL_ROOT)$(php_fpm_conf_path)"` \
6624 + `dirname "$(INSTALL_ROOT)$(php_fpm_log_path)"` \
6625 + `dirname "$(INSTALL_ROOT)$(php_fpm_pid_path)"`
6626 + -@if test -r "$(INSTALL_ROOT)$(php_fpm_conf_path)" ; then \
6627 + dest=`basename "$(php_fpm_conf_path)"`.default ; \
6628 + echo " (installing as $$dest)" ; \
6630 + dest=`basename "$(php_fpm_conf_path)"` ; \
6632 + $(INSTALL_DATA) $(top_builddir)/sapi/cgi/fpm/php-fpm.conf $(INSTALL_ROOT)`dirname "$(php_fpm_conf_path)"`/$$dest
6633 + @echo "Installing init.d script: $(INSTALL_ROOT)$(prefix)/sbin/php-fpm"
6634 + -@$(INSTALL) -m 0755 $(top_builddir)/sapi/cgi/fpm/php-fpm $(INSTALL_ROOT)$(prefix)/sbin/php-fpm
6636 +$(top_builddir)/libevent/libevent.a: $(top_builddir)/libevent/Makefile
6637 + cd $(top_builddir)/libevent && $(MAKE) libevent.a
6639 --- php-5.2.8.vanilla/sapi/cgi/fpm/xml_config.c 1970-01-01 03:00:00.000000000 +0300
6640 +++ php-5.2.8.fpm/sapi/cgi/fpm/xml_config.c 2008-08-26 19:09:15.000000000 +0400
6644 + /* (c) 2004-2007 Andrei Nigmatulin */
6646 +#include "fpm_config.h"
6648 +#ifdef HAVE_ALLOCA_H
6649 +#include <alloca.h>
6651 +#include <string.h>
6653 +#include <stddef.h>
6654 +#include <stdlib.h>
6656 +#include <libxml/parser.h>
6657 +#include <libxml/tree.h>
6659 +#include "xml_config.h"
6661 +static struct xml_conf_section **xml_conf_sections = 0;
6662 +static int xml_conf_sections_allocated = 0;
6663 +static int xml_conf_sections_used = 0;
6665 +char *xml_conf_set_slot_boolean(void **conf, char *name, void *vv, intptr_t offset)
6668 + long value_y = !strcasecmp(value, "yes") || !strcmp(value, "1") || !strcasecmp(value, "on");
6669 + long value_n = !strcasecmp(value, "no") || !strcmp(value, "0") || !strcasecmp(value, "off");
6671 + if (!value_y && !value_n) {
6672 + return "xml_conf_set_slot(): invalid boolean value";
6675 +#ifdef XML_CONF_DEBUG
6676 + fprintf(stderr, "setting boolean '%s' => %s\n", name, value_y ? "TRUE" : "FALSE");
6679 + * (int *) ((char *) *conf + offset) = value_y ? 1 : 0;
6684 +char *xml_conf_set_slot_string(void **conf, char *name, void *vv, intptr_t offset)
6687 + char *v = strdup(value);
6689 + if (!v) return "xml_conf_set_slot_string(): strdup() failed";
6691 +#ifdef XML_CONF_DEBUG
6692 + fprintf(stderr, "setting string '%s' => '%s'\n", name, v);
6695 + * (char **) ((char *) *conf + offset) = v;
6700 +char *xml_conf_set_slot_integer(void **conf, char *name, void *vv, intptr_t offset)
6703 + int v = atoi(value);
6705 + * (int *) ((char *) *conf + offset) = v;
6707 +#ifdef XML_CONF_DEBUG
6708 + fprintf(stderr, "setting integer '%s' => %d\n", name, v);
6714 +char *xml_conf_set_slot_time(void **conf, char *name, void *vv, intptr_t offset)
6717 + int len = strlen(value);
6721 + if (!len) return "xml_conf_set_slot_timeval(): invalid timeval value";
6723 + suffix = value[len-1];
6725 + value[len-1] = '\0';
6729 + seconds = atoi(value);
6732 + seconds = 60 * atoi(value);
6735 + seconds = 60 * 60 * atoi(value);
6738 + seconds = 24 * 60 * 60 * atoi(value);
6741 + return "xml_conf_set_slot_timeval(): unknown suffix used in timeval value";
6744 + * (int *) ((char *) *conf + offset) = seconds;
6746 +#ifdef XML_CONF_DEBUG
6747 + fprintf(stderr, "setting time '%s' => %d:%02d:%02d:%02d\n", name, expand_dhms(seconds));
6753 +char *xml_conf_parse_section(void **conf, struct xml_conf_section *section, void *xml_node)
6755 + xmlNode *element = xml_node;
6758 +#ifdef XML_CONF_DEBUG
6759 + fprintf(stderr, "processing a section %s\n", section->path);
6762 + for ( ; element; element = element->next) {
6763 + if (element->type == XML_ELEMENT_NODE && !strcmp((const char *) element->name, "value") && element->children) {
6764 + xmlChar *name = xmlGetProp(element, (unsigned char *) "name");
6769 +#ifdef XML_CONF_DEBUG
6770 + fprintf(stderr, "found a value: %s\n", name);
6772 + for (i = 0; section->parsers[i].parser; i++) {
6773 + if (!section->parsers[i].name || !strcmp(section->parsers[i].name, (char *) name)) {
6778 + if (section->parsers[i].parser) {
6779 + if (section->parsers[i].type == XML_CONF_SCALAR) {
6780 + if (element->children->type == XML_TEXT_NODE) {
6781 + ret = section->parsers[i].parser(conf, (char *) name, element->children->content, section->parsers[i].offset);
6784 + ret = "XML_TEXT_NODE is expected, something different is given";
6788 + ret = section->parsers[i].parser(conf, (char *) name, element->children, section->parsers[i].offset);
6792 + if (ret) return ret;
6796 + fprintf(stderr, "Warning, unknown setting '%s' in section '%s'\n", (char *) name, section->path);
6806 +static char *xml_conf_parse_file(xmlNode *element)
6810 + for ( ; element; element = element->next) {
6812 + if (element->parent && element->type == XML_ELEMENT_NODE && !strcmp((const char *) element->name, "section")) {
6813 + xmlChar *name = xmlGetProp(element, (unsigned char *) "name");
6816 + char *parent_name = (char *) xmlGetNodePath(element->parent);
6819 + struct xml_conf_section *section = NULL;
6821 +#ifdef XML_CONF_DEBUG
6822 + fprintf(stderr, "got a section: %s/%s\n", parent_name, name);
6824 + full_name = alloca(strlen(parent_name) + strlen((char *) name) + 1 + 1);
6826 + sprintf(full_name, "%s/%s", parent_name, (char *) name);
6828 + xmlFree(parent_name);
6831 + for (i = 0; i < xml_conf_sections_used; i++) {
6832 + if (!strcmp(xml_conf_sections[i]->path, full_name)) {
6833 + section = xml_conf_sections[i];
6837 + if (section) { /* found a registered section */
6838 + void *conf = section->conf();
6839 + ret = xml_conf_parse_section(&conf, section, element->children);
6846 + if (element->children) {
6847 + ret = xml_conf_parse_file(element->children);
6855 +char *xml_conf_load_file(char *file)
6860 + LIBXML_TEST_VERSION
6862 + doc = xmlParseFile(file);
6865 + ret = xml_conf_parse_file(doc->children);
6869 + ret = "failed to parse conf file";
6872 + xmlCleanupParser();
6876 +int xml_conf_init()
6881 +void xml_conf_clean()
6883 + if (xml_conf_sections) {
6884 + free(xml_conf_sections);
6888 +int xml_conf_section_register(struct xml_conf_section *section)
6890 + if (xml_conf_sections_allocated == xml_conf_sections_used) {
6891 + int new_size = xml_conf_sections_used + 10;
6892 + void *new_ptr = realloc(xml_conf_sections, sizeof(struct xml_conf_section *) * new_size);
6895 + xml_conf_sections = new_ptr;
6896 + xml_conf_sections_allocated = new_size;
6899 + fprintf(stderr, "xml_conf_section_register(): out of memory\n");
6904 + xml_conf_sections[xml_conf_sections_used++] = section;
6909 +int xml_conf_sections_register(struct xml_conf_section *sections[])
6911 + for ( ; sections && *sections; sections++) {
6912 + if (0 > xml_conf_section_register(*sections)) {
6920 --- php-5.2.8.vanilla/sapi/cgi/fpm/xml_config.h 1970-01-01 03:00:00.000000000 +0300
6921 +++ php-5.2.8.fpm/sapi/cgi/fpm/xml_config.h 2008-09-19 03:02:58.000000000 +0400
6925 + /* (c) 2004-2007 Andrei Nigmatulin */
6927 +#ifndef XML_CONFIG_H
6928 +#define XML_CONFIG_H 1
6930 +#include <stdint.h>
6932 +struct xml_value_parser;
6934 +struct xml_value_parser {
6937 + char *(*parser)(void **, char *, void *, intptr_t offset);
6941 +struct xml_conf_section {
6944 + struct xml_value_parser *parsers;
6947 +char *xml_conf_set_slot_boolean(void **conf, char *name, void *value, intptr_t offset);
6948 +char *xml_conf_set_slot_string(void **conf, char *name, void *value, intptr_t offset);
6949 +char *xml_conf_set_slot_integer(void **conf, char *name, void *value, intptr_t offset);
6950 +char *xml_conf_set_slot_time(void **conf, char *name, void *value, intptr_t offset);
6952 +int xml_conf_init();
6953 +void xml_conf_clean();
6954 +char *xml_conf_load_file(char *file);
6955 +char *xml_conf_parse_section(void **conf, struct xml_conf_section *section, void *ve);
6956 +int xml_conf_section_register(struct xml_conf_section *section);
6957 +int xml_conf_sections_register(struct xml_conf_section *sections[]);
6959 +#define expand_hms(value) (value) / 3600, ((value) % 3600) / 60, (value) % 60
6961 +#define expand_dhms(value) (value) / 86400, ((value) % 86400) / 3600, ((value) % 3600) / 60, (value) % 60
6963 +enum { XML_CONF_SCALAR = 1, XML_CONF_SUBSECTION = 2 };
6966 --- php-5.2.8.vanilla/sapi/cgi/fpm/zlog.c 1970-01-01 03:00:00.000000000 +0300
6967 +++ php-5.2.8.fpm/sapi/cgi/fpm/zlog.c 2008-05-23 01:08:32.000000000 +0400
6971 + /* (c) 2004-2007 Andrei Nigmatulin */
6973 +#include "fpm_config.h"
6976 +#include <unistd.h>
6978 +#include <string.h>
6979 +#include <stdarg.h>
6980 +#include <sys/time.h>
6985 +#define MAX_LINE_LENGTH 1024
6987 +static int zlog_fd = -1;
6988 +static int zlog_level = ZLOG_NOTICE;
6990 +static const char *level_names[] = {
6991 + [ZLOG_DEBUG] = "DEBUG",
6992 + [ZLOG_NOTICE] = "NOTICE",
6993 + [ZLOG_WARNING] = "WARNING",
6994 + [ZLOG_ERROR] = "ERROR",
6995 + [ZLOG_ALERT] = "ALERT",
6998 +size_t zlog_print_time(struct timeval *tv, char *timebuf, size_t timebuf_len)
7003 + len = strftime(timebuf, timebuf_len, "%b %d %H:%M:%S", localtime_r((const time_t *) &tv->tv_sec, &t));
7004 + len += snprintf(timebuf + len, timebuf_len - len, ".%06d", (int) tv->tv_usec);
7009 +int zlog_set_fd(int new_fd)
7011 + int old_fd = zlog_fd;
7017 +int zlog_set_level(int new_value)
7019 + int old_value = zlog_level;
7021 + zlog_level = new_value;
7026 +void zlog(const char *function, int line, int flags, const char *fmt, ...)
7028 + struct timeval tv;
7029 + char buf[MAX_LINE_LENGTH];
7030 + const size_t buf_size = MAX_LINE_LENGTH;
7033 + int truncated = 0;
7036 + if ((flags & ZLOG_LEVEL_MASK) < zlog_level) {
7040 + saved_errno = errno;
7042 + gettimeofday(&tv, 0);
7044 + len = zlog_print_time(&tv, buf, buf_size);
7046 + len += snprintf(buf + len, buf_size - len, " [%s] %s(), line %d: ", level_names[flags & ZLOG_LEVEL_MASK], function, line);
7048 + if (len > buf_size - 1) {
7053 + va_start(args, fmt);
7055 + len += vsnprintf(buf + len, buf_size - len, fmt, args);
7059 + if (len >= buf_size) {
7065 + if (flags & ZLOG_HAVE_ERRNO) {
7066 + len += snprintf(buf + len, buf_size - len, ": %s (%d)", strerror(saved_errno), saved_errno);
7067 + if (len >= buf_size) {
7074 + memcpy(buf + buf_size - sizeof("..."), "...", sizeof("...") - 1);
7075 + len = buf_size - 1;
7078 + buf[len++] = '\n';
7080 + write(zlog_fd > -1 ? zlog_fd : STDERR_FILENO, buf, len);
7082 --- php-5.2.8.vanilla/sapi/cgi/fpm/zlog.h 1970-01-01 03:00:00.000000000 +0300
7083 +++ php-5.2.8.fpm/sapi/cgi/fpm/zlog.h 2008-05-23 01:08:32.000000000 +0400
7087 + /* (c) 2004-2007 Andrei Nigmatulin */
7092 +#define ZLOG_STUFF __func__, __LINE__
7096 +int zlog_set_fd(int new_fd);
7097 +int zlog_set_level(int new_value);
7099 +size_t zlog_print_time(struct timeval *tv, char *timebuf, size_t timebuf_len);
7101 +void zlog(const char *function, int line, int flags, const char *fmt, ...)
7102 + __attribute__ ((format(printf,4,5)));
7112 +#define ZLOG_LEVEL_MASK 7
7114 +#define ZLOG_HAVE_ERRNO 0x100
7116 +#define ZLOG_SYSERROR (ZLOG_ERROR | ZLOG_HAVE_ERRNO)
7119 --- php-5.2.8.vanilla/sapi/cgi/Makefile.frag 2003-07-02 05:08:26.000000000 +0400
7120 +++ php-5.2.8.fpm/sapi/cgi/Makefile.frag 2008-05-01 20:42:06.000000000 +0400
7122 -$(SAPI_CGI_PATH): libphp_common.la $(PHP_SAPI_OBJS)
7123 +$(SAPI_CGI_PATH): libphp_common.la $(PHP_SAPI_OBJS) $(SAPI_EXTRA_DEPS)