Permalink
Browse files

merge FPM SAPI from trunk (as agreed with Johannes)

  • Loading branch information...
1 parent ce136a8 commit 4d005a8e65c2753565493f761fc3302d97f0e408 @tony2001 tony2001 committed May 26, 2010
Showing with 10,470 additions and 0 deletions.
  1. +1 −0 NEWS
  2. +2 −0 sapi/fpm/CREDITS
  3. +23 −0 sapi/fpm/LICENSE
  4. +28 −0 sapi/fpm/Makefile.frag
  5. +610 −0 sapi/fpm/config.m4
  6. +1,058 −0 sapi/fpm/fpm/fastcgi.c
  7. +145 −0 sapi/fpm/fpm/fastcgi.h
  8. +84 −0 sapi/fpm/fpm/fpm.c
  9. +30 −0 sapi/fpm/fpm/fpm.h
  10. +116 −0 sapi/fpm/fpm/fpm_arrays.h
  11. +148 −0 sapi/fpm/fpm/fpm_atomic.h
  12. +439 −0 sapi/fpm/fpm/fpm_children.c
  13. +35 −0 sapi/fpm/fpm/fpm_children.h
  14. +53 −0 sapi/fpm/fpm/fpm_cleanup.c
  15. +21 −0 sapi/fpm/fpm/fpm_cleanup.h
  16. +121 −0 sapi/fpm/fpm/fpm_clock.c
  17. +13 −0 sapi/fpm/fpm/fpm_clock.h
  18. +967 −0 sapi/fpm/fpm/fpm_conf.c
  19. +78 −0 sapi/fpm/fpm/fpm_conf.h
  20. +44 −0 sapi/fpm/fpm/fpm_config.h
  21. +181 −0 sapi/fpm/fpm/fpm_env.c
  22. +24 −0 sapi/fpm/fpm/fpm_env.h
  23. +142 −0 sapi/fpm/fpm/fpm_events.c
  24. +16 −0 sapi/fpm/fpm/fpm_events.h
  25. +1,940 −0 sapi/fpm/fpm/fpm_main.c
  26. +205 −0 sapi/fpm/fpm/fpm_php.c
  27. +25 −0 sapi/fpm/fpm/fpm_php.h
  28. +175 −0 sapi/fpm/fpm/fpm_php_trace.c
  29. +13 −0 sapi/fpm/fpm/fpm_php_trace.h
  30. +463 −0 sapi/fpm/fpm/fpm_process_ctl.c
  31. +45 −0 sapi/fpm/fpm/fpm_process_ctl.h
  32. +169 −0 sapi/fpm/fpm/fpm_request.c
  33. +28 −0 sapi/fpm/fpm/fpm_request.h
  34. +101 −0 sapi/fpm/fpm/fpm_shm.c
  35. +23 −0 sapi/fpm/fpm/fpm_shm.h
  36. +119 −0 sapi/fpm/fpm/fpm_shm_slots.c
  37. +43 −0 sapi/fpm/fpm/fpm_shm_slots.h
  38. +251 −0 sapi/fpm/fpm/fpm_signals.c
  39. +16 −0 sapi/fpm/fpm/fpm_signals.h
  40. +371 −0 sapi/fpm/fpm/fpm_sockets.c
  41. +40 −0 sapi/fpm/fpm/fpm_sockets.h
  42. +251 −0 sapi/fpm/fpm/fpm_status.c
  43. +31 −0 sapi/fpm/fpm/fpm_status.h
  44. +259 −0 sapi/fpm/fpm/fpm_stdio.c
  45. +20 −0 sapi/fpm/fpm/fpm_stdio.h
  46. +52 −0 sapi/fpm/fpm/fpm_str.h
  47. +41 −0 sapi/fpm/fpm/fpm_trace.c
  48. +17 −0 sapi/fpm/fpm/fpm_trace.h
  49. +99 −0 sapi/fpm/fpm/fpm_trace_mach.c
  50. +67 −0 sapi/fpm/fpm/fpm_trace_pread.c
  51. +82 −0 sapi/fpm/fpm/fpm_trace_ptrace.c
  52. +253 −0 sapi/fpm/fpm/fpm_unix.c
  53. +17 −0 sapi/fpm/fpm/fpm_unix.h
  54. +69 −0 sapi/fpm/fpm/fpm_worker_pool.c
  55. +49 −0 sapi/fpm/fpm/fpm_worker_pool.h
  56. +115 −0 sapi/fpm/fpm/zlog.c
  57. +34 −0 sapi/fpm/fpm/zlog.h
  58. +138 −0 sapi/fpm/init.d.php-fpm.in
  59. +186 −0 sapi/fpm/php-fpm.1.in
  60. +284 −0 sapi/fpm/php-fpm.conf.in
View
1 NEWS
@@ -16,6 +16,7 @@ PHP NEWS
(string $iv) to use non-NULL IV.
Made implicit use of NULL IV a warning. (Sara)
- Added openssl_cipher_iv_length(). (Sara)
+- Merged FPM SAPI from trunk. (Tony)
- Changed namespaced classes so that the ctor can only be named
__construct now. (Stas)
View
@@ -0,0 +1,2 @@
+FastCGI Process Manager
+Andrei Nigmatulin, dreamcat4, Antony Dovgal, Jerome Loyet
View
@@ -0,0 +1,23 @@
+Copyright (c) 2007-2009, Andrei Nigmatulin
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
View
@@ -0,0 +1,28 @@
+fpm: $(SAPI_FPM_PATH)
+
+fpm-subdir:
+ @mkdir -p $(builddir)/fpm
+
+$(SAPI_FPM_PATH): fpm-subdir $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(SAPI_EXTRA_DEPS)
+ $(BUILD_FPM)
+
+$(builddir)/fpm/fpm_conf.lo: $(builddir)/../../main/build-defs.h
+
+install-build: install-fpm
+
+install-fpm: install-sapi
+ @echo "Installing PHP FPM binary: $(INSTALL_ROOT)$(sbindir)/"
+ @$(mkinstalldirs) $(INSTALL_ROOT)$(sbindir)
+ @$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/log
+ @$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/run
+ @$(INSTALL) -m 0755 $(SAPI_FPM_PATH) $(INSTALL_ROOT)$(sbindir)/$(program_prefix)php-fpm$(program_suffix)$(EXEEXT)
+
+ @echo "Installing PHP FPM config: $(INSTALL_ROOT)$(sysconfdir)/" && \
+ $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir) || :
+
+ @$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default || :
+
+ @echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man1/"
+ @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
+ @$(INSTALL_DATA) sapi/fpm/php-fpm.1 $(INSTALL_ROOT)$(mandir)/man1/php-fpm$(program_suffix).1
+
Oops, something went wrong.

0 comments on commit 4d005a8

Please sign in to comment.