clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 03:17:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
61,499 Commits 491 Branches 1,363 Tags 846 MiB
8590f2587a
Commit Graph

2306 Commits

Author SHA1 Message Date
Pierre Joye
cb8d9f9c19 - missing files 2011-02-22 12:59:50 +00:00
Johannes Schlüter
960e265b6c Declare vars first. Fix Windows build. 2011-02-22 12:51:43 +00:00
Felipe Pena
b98ceb5e40 - Fixed build 2011-02-19 16:32:00 +00:00
Johannes Schlüter
6c734a6b4c - Implement FR#53878 Interactive shell should work with shared readline extension 
# This is useful w/ distributors who like to build all things shared or don't
# provide the readline extension. Or if a user pefers readline's behavior over
# libedit which might be used by the  distributor.
 2011-02-19 16:04:30 +00:00
Antony Dovgal
09ee5944ab fix compile warning 2011-02-08 08:40:39 +00:00
Jérôme Loyet
d7e9fdc199 - remove cpystrn from FPM and use strlcpy instead. 2011-01-30 13:51:20 +00:00
Jérôme Loyet
147382033a - Fixed bug #53434 (php-fpm slowlog now also logs the original request). 
- Fixed the missing peace of code on revision 307842
 2011-01-29 11:41:45 +00:00
Jérôme Loyet
4aa36e8914 - Fixed bug #53434 (php-fpm slowlog now also logs the original request). 2011-01-29 11:38:19 +00:00
Jérôme Loyet
ca3126f1cc - Fixed bug #53777 (php-fpm log format now match php_error log format). 2011-01-29 10:13:24 +00:00
Felipe Pena
bc049ccb62 - Fix missing mkdir for bindir (patch by David Tajchreber) 2011-01-23 22:40:35 +00:00
Dmitry Stogov
10cfbb814f Added checks for malformated FastCGI requests (Edgar Frank) 2011-01-19 08:38:25 +00:00
Jérôme Loyet
970fe5b71e - Enforce security in the fastcgi protocol parsing. 2011-01-17 22:22:39 +00:00
Antony Dovgal
a89c446488 add missing dl() function to FPM SAPI 2011-01-14 13:53:59 +00:00
Felipe Pena
0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Jérôme Loyet
e1dee992ee - Fixed bug #53527 (php-fpm --test doesn't set a valuable return value). 2010-12-18 11:22:11 +00:00
Pierre Joye
a7ffa09e18 - add PHP_INSTALL_HEADERS to all parts (core&exts) exposing headers, generate the install-headers cmd 2010-12-11 22:18:10 +00:00
Jérôme Loyet
8e65f50698 - Fixed bug #53412 (segfault when using -y) 2010-11-30 19:37:10 +00:00
Jérôme Loyet
f7cd7afd33 - Fixed bug #52501 (libevent made FPM crashed when forking -- libevent has been removed) 2010-11-26 13:46:15 +00:00
Jérôme Loyet
ac08cb6492 - fix (log with level < WARNING before daemonizing were not written to /dev/stderr) 2010-11-16 22:53:47 +00:00
Jérôme Loyet
cb2bb12de5 - Fixed #53310 (sparc < v9 won't is not supported) 2010-11-16 22:02:36 +00:00
Jérôme Loyet
69ba9c82af - extend the 'i-t' fpm argument to dump configuration file when called twice (-tt) 2010-11-14 22:22:07 +00:00
Jérôme Loyet
ae01a576b3 - Fixed #52691 (allow multiple instance of FPM using a custom prefix) 2010-11-14 22:01:34 +00:00
Jani Taskinen
25aee9cad9 - Implemented FR #53271, FR #52410 (Building multiple PHP binary SAPIs and one SAPI module the same time) 
# Bug #53271, Bug #52410
 2010-11-13 23:13:07 +00:00
Jérôme Loyet
e3b4bf5685 - Fixed #52660 (custom process title for FPM) 2010-11-12 00:30:35 +00:00
Jérôme Loyet
b772fae900 - Fixed #52692 (Added '-t/--test' to php-fpm to check and validate FPM conf file) 2010-11-11 23:27:15 +00:00
Jérôme Loyet
b72460a42f - Fixed bug #52693 (configuration file errors are not logged to stderr) 2010-11-11 22:48:46 +00:00
Jérôme Loyet
306d08a0f5 - get rid of ZLOG_STUFF code redundancy 2010-11-11 21:38:18 +00:00
Jérôme Loyet
7eb3062619 - comment out fpm_php_set_fcgi_mgmt_vars to remove compilation warning 2010-11-11 21:30:55 +00:00
Jérôme Loyet
e1b87cce1f - Fixed #52045 (FPM tries to open php.ini from the current dir) 
- Add php_ini_ignore_cwd to _sapi_module_struct
 2010-11-11 17:24:27 +00:00
Jérôme Loyet
b896c87bb5 - remove useless check 2010-11-11 12:56:44 +00:00
Jérôme Loyet
9f1ad0a2e2 - add missing timer* macros (for solaris) 
- ws
 2010-11-11 12:55:05 +00:00
Jérôme Loyet
b38d57249e - add "listen queue len" stat (thx to Andrei Nigmatulin) 2010-11-11 02:34:47 +00:00
Jérôme Loyet
469746fa03 - syntax and minor optimizations 2010-11-11 01:01:56 +00:00
Jérôme Loyet
a2c55a138d - don't call shutdown functions after child ends softly, let the master process call them 2010-11-10 23:54:14 +00:00
Jérôme Loyet
f0621d39cd - correct time comparison for determining the last idle child 2010-11-07 21:47:14 +00:00
Jérôme Loyet
b41d13ba98 - change signal from SIGTERM to SIGQUIT for killing a child process by the dynamic process manager 2010-11-07 19:45:51 +00:00
Ilia Alshanetsky
f89effd2a8 Updated _SERVER['REQUEST_TIME'] to include microsecond precision. 2010-11-06 17:14:21 +00:00
Dmitry Stogov
bd8f3908c4 Reverted wrong patch 2010-09-20 10:45:22 +00:00
Kalle Sommer Nielsen
210fe80bd5 Fix incompatible types, we need to use a char here for recv() 2010-09-19 19:18:30 +00:00
Pierre Joye
14e77486e0 - unused, double declared 2010-09-15 22:25:44 +00:00
Jérôme Loyet
8b9ed0d369 - remove a memory leak (missing efree()) 2010-09-14 15:33:43 +00:00
Pierre Joye
b6d8462ab2 - fix #48831 php -i has different output to php --ini 2010-09-14 10:36:21 +00:00
Jérôme Loyet
a7e18ea855 - remove FPM specific version which is irrelevant since FPM integration into core. 2010-09-07 22:03:43 +00:00
Jérôme Loyet
75891691ed - Fixed bug #52498 (libevent was not only linked to php-fpm) 2010-09-07 21:12:28 +00:00
Dmitry Stogov
c290767ed7 Fixed bug #46723 (FastCGI persistent connection is incredibly slow due to TCP ack delay). 2010-09-06 11:11:40 +00:00
Felipe Pena
7396657fc1 - Fixed compiler warning (missing return statement) 2010-09-01 23:21:03 +00:00
Dmitry Stogov
6bc16cce8f Reduced overhead of FastCGI using near-perfect hash function and predcalculated hash values. 2010-09-01 15:34:48 +00:00
Dmitry Stogov
001d83dc47 invalid length 2010-09-01 14:42:43 +00:00
Jérôme Loyet
70d7d86505 - Fixed bug #52725 (gcc builtin atomic functions were sometimes used when they were not available). 2010-09-01 08:17:18 +00:00
Jérôme Loyet
4d62c8c501 - add 'max children reached' to the FPM status page. It shows how many times 
a pool has reached the max_children parameter.
 2010-08-31 14:49:16 +00:00
Jérôme Loyet
b212312a93 - Add libevent version to the startup debug log in FPM. 2010-08-31 09:41:04 +00:00
Jérôme Loyet
bf28d740e3 - Changed listen.backlog in the FPM configuration file to default to 128 
instead of -1 (except on FreeBSD and OpenBSD). This is the same value 
  as the one used in the cgi sapi. This patch completes revision 302725.
 2010-08-31 09:33:53 +00:00
Jérôme Loyet
d5a12aef12 - only one process (for all pools) could be killed by the 'dynamic' process manager. Now it's one process per pool which can be killed by the 'dynamic' process manager. 
- rename nonsense variable (i)
 2010-08-30 15:21:31 +00:00
Dmitry Stogov
d4c2c6c6ba Don't check FCGI_WEB_SERVER_ADDRS for UNIX sockets 2010-08-27 08:50:32 +00:00
Dmitry Stogov
a95dd97752 Added apache compatible functions (apache_child_terminate, getallheaders, apache_request_headers, apache_response_headers) to FastCGI SAPI 2010-08-27 08:34:44 +00:00
Dmitry Stogov
d663b9cc77 Don't try to read the rest of malformed FCGI requests, close immediately. It saves one recv() call for proper FCGI request. 2010-08-25 13:48:16 +00:00
Dmitry Stogov
7fc86e5cb4 ws 2010-08-25 11:44:15 +00:00
Jérôme Loyet
266e369184 - Changed listen.backlog in the FPM configuration file to default to 128 
instead of -1. This is the same value as the one used in the cgi sapi.
 2010-08-23 23:22:36 +00:00
Jérôme Loyet
f5e38e30b6 - Fixed bug #52674 (FPM Status page returns inconsistent Content-Type headers). 2010-08-23 20:40:44 +00:00
Jérôme Loyet
6b8f3c0c59 - Fix #52407 (use __sync_bool_compare_and_swap in fpm_atomic.h if gcc >= 4.1 is used - credit to geissert) 2010-08-21 06:46:18 +00:00
Jérôme Loyet
06228b2cab - typo (thx to sixd) 2010-08-20 17:00:57 +00:00
Jérôme Loyet
99a4506787 Fix #52609 (INI scanner did not use ZEND_INI_SCANNER_NORMAL) 2010-08-20 08:33:57 +00:00
Kalle Sommer Nielsen
250fcf9317 Nuke compiler warning, wrong fix that shouldn't have been in the previously commit 2010-08-18 18:00:33 +00:00
Kalle Sommer Nielsen
34b631f679 Pass the TSRMS pointers to sapi_module_struct.log_message, this saves some TSRMLS_FETCH() calls in a few of our SAPI's 2010-08-18 13:34:40 +00:00
Kalle Sommer Nielsen
65d031d3da Use the TSRMLS_DC/TSRMLS_CC macros instead of TSRMLS_FETCH() 2010-08-18 12:59:52 +00:00
Dmitry Stogov
d6e772a1d0 Fixed ZTS build 2010-08-18 11:59:30 +00:00
Dmitry Stogov
bfbfd15a2a improved performance of FastCGI request parsing 2010-08-18 08:22:41 +00:00
Kalle Sommer Nielsen
aae13b29a9 Fixed bug #50804 (Document configure.js --enable-crt-debug) 2010-08-11 22:38:15 +00:00
Jérôme Loyet
eb2266197f BUG: all value comparaisons were not case insensitive in the conf file parser 2010-08-02 21:46:52 +00:00
Jérôme Loyet
71eee6b1d4 typo 2010-08-02 09:28:54 +00:00
Jérôme Loyet
5181210a7a correct php-fpm.conf: slowlog has no default value 2010-08-02 09:02:48 +00:00
Jérôme Loyet
51dd4c2feb - Fixed bug #52476 (move php-fpm man page from section 1 to section 8) 2010-07-29 22:07:00 +00:00
Raphael Geissert
197ab331eb Fix required facilities for php-fpm's init script 
$all should only be used in rare, and very specific, cases.
 2010-07-29 19:13:42 +00:00
Dmitry Stogov
f20f516129 typo 2010-07-20 11:28:53 +00:00
Dmitry Stogov
b4216e0a82 Use zend_stream API to open main PHP script in CGI/FastCGI. This allows to override the open function by opcode caches and eliminate the actual open syscall. 2010-07-07 16:54:55 +00:00
Antony Dovgal
388a9ccaf0 fix typos and use correct directive names in error messages 2010-07-06 11:37:19 +00:00
Dmitry Stogov
d22dff0903 reduced request processing overhead 2010-07-05 15:40:54 +00:00
Felipe Pena
f2419953d9 - MF5.3: Reverted fix for bug #48930 (due binary compatibility breakage) 
# To commit a new common fix
 2010-06-30 02:30:14 +00:00
Felipe Pena
22e2302e78 - Improved initialization 2010-06-27 22:13:41 +00:00
Felipe Pena
3396a6d185 - Fixed bug #48930 (__COMPILER_HALT_OFFSET__ incorrect in PHP >= 5.3) 2010-06-27 21:46:16 +00:00
Felipe Pena
80926568f1 - Fixed bug #52183 (Reflectionfunction reports invalid number of arguments for function aliases) 2010-06-26 16:03:39 +00:00
Sriram Natarajan
4278f56f60 - Fixed bug #52162 (custom request header variables with numbers are removed) 2010-06-23 19:06:33 +00:00
Jérôme Loyet
84d268f63b - Fixed bug #52086 (No new line at the end of a included file crahes the PHP FPM daemon) 2010-06-19 16:31:19 +00:00
Antony Dovgal
b95170580c improve ptrace() test 
change error to warning - there can be no trace method available at all
 2010-06-16 08:58:42 +00:00
Jérôme Loyet
12e8eef760 Fix #52067, chroot and chdir path were not checked at startup. If configured with unexistant directories, FPM entered in an error loop. 2010-06-13 10:30:35 +00:00
Antony Dovgal
61344366ae support both 'warn' and 'warning' as error levels 2010-06-08 18:59:11 +00:00
Antony Dovgal
04d673472f fix micro-memleaks (happened once per process) 2010-06-08 12:02:55 +00:00
Michael Wallner
0ed3973331 fix fpm build 2010-06-01 13:51:05 +00:00
Michael Wallner
11d24c1593 * implement new output API, fixing some bugs and implementing some feature 
requests--let's see what I can dig out of the bugtracker for NEWS--
  and while crossing the road:
   * implemented new zlib API
   * fixed up ext/tidy (what was "s&" in zend_parse_parameters() supposed to do?)

Thanks to Jani and Felipe for pioneering.
 2010-05-31 10:29:43 +00:00
Jérôme Loyet
27c2c35953 fix commit 299383 2010-05-29 22:00:43 +00:00
Jérôme Loyet
bc4c3fdd83 typo (thx to Brian P. Mercer) 2010-05-29 10:39:35 +00:00
Jérôme Loyet
8cf687608e bug: include paths were not evaluated to to full path 2010-05-27 22:31:28 +00:00
Jérôme Loyet
167f758aca typo 2010-05-27 20:59:21 +00:00
Johannes Schlüter
61db5cf98a - Improved CLI Interactive readline shell (Johannes) 
. Added cli.pager ini setting to set a pager for output.
  . Added cli.prompt ini settingto configure the shell prompt.
  . Added shortcut #inisetting=value to change ini settings at run-time.
  . Don't terminate shell on fatal errors.

A pager can be a an shell command which will receive the command output on its
STDIN channel

php > #cli.pager=less
php > phpinfo();
(output will appear in the pager)
php > #cli.pager=grep -i readline
php > phpcredits();
Readline => Thies C. Arntzen
php > #cli.pager=
(output appears again direct on the terminal)

A prompt can contain a few escape sequences like

php > #cli.prompt=\e[032m\v \e[031m\b \e[34m\> \e[0m
5.3.99-dev php > //Colorful prompt with version number

A prompt can also contaian PHP code in backticks

php > #cli.prompt=`echo gethostname();` \b \> 
guybrush php >
 2010-05-20 20:55:33 +00:00
Jérôme Loyet
c350a3f761 change the startup libevent info log from notice to debug 2010-05-19 20:12:56 +00:00
Jérôme Loyet
257a8dac20 fix undefined value for log_level when not set in the conf file 2010-05-19 20:11:56 +00:00
Jérôme Loyet
962e95df52 - set hard and soft limit (instead of only the soft limit) when setting rlimit_core or rlimit_files 
- remove the debug log about getrlimit on the main process wich is meaningless when rlmit_* settings are set
 2010-05-19 18:37:25 +00:00
Jérôme Loyet
d3e1b1dbc3 - #51821, fix --with-libevent-dir (patch by tony2001) 2010-05-19 11:29:31 +00:00
Antony Dovgal
b9bec41ce1 fix external build 2010-05-14 15:22:38 +00:00
Jérôme Loyet
3e51f4a966 Fix #51799, when glob returns nothing, it was handle as an error instead of a warning. 2010-05-12 18:29:09 +00:00
Raphael Geissert
bce8aae080 Document CGI options in the manpage (bug #51718) 
Patch by Daniel Egeberg
 2010-05-11 15:07:31 +00:00
Jérôme Loyet
ef9ea5f967 Fix #51736, wrong checks on dynamic parameters 2010-05-08 08:52:32 +00:00
Rob Richards
60f62fc563 fix non-windows builds 2010-05-04 12:12:28 +00:00
Pierre Joye
56e327ba27 - revert fix for #51723 in 5.2, vc6 does not support strtoi64, use builtin functioon in 5.3 (trunk is vc9+ only) 2010-05-03 19:51:59 +00:00
Pierre Joye
d90f8560aa - #51273, Content-length header is limited to 32bit integer with apache2/windows 2010-05-03 17:47:58 +00:00
Pierre Joye
9720dea2c7 - WS 2010-05-03 14:30:14 +00:00
Antony Dovgal
47aa194a10 merge the fix for #51688 2010-04-30 08:20:57 +00:00
Pierre Joye
8a197878c8 - Fix #51688, ini per dir crashes when invalid document root are given 2010-04-30 08:15:09 +00:00
Rob Richards
0a34d10783 revert change #298288: Remove old dsp/dsw/makefile files 2010-04-28 14:41:51 +00:00
Kalle Sommer Nielsen
dd8e59da8f Removed safe_mode 
* Removed ini options, safe_mode*
 * Removed --enable-safe-mode --with-exec-dir configure options on Unix
 * Updated extensions, SAPI's and core
 * php_get_current_user() is now declared in main.c, thrus no need to include safe_mode.h anymore
 2010-04-26 23:53:30 +00:00
Jérôme Loyet
34ba9e39fa Add PHP_VALUE and PHP_ADMIN_VALUE interpretation from fastcgi headers. 
It works as php_value and php_admin_value from the main conf file or apache sapi.

See bug (request) #51595
 2010-04-23 16:05:52 +00:00
Jérôme Loyet
acf5fba0fb Remove unused functions / variables / #if 0 blocks 2010-04-23 15:09:28 +00:00
Jérôme Loyet
757d7ace9a typo 2010-04-23 13:56:14 +00:00
Jérôme Loyet
0b2a196431 typo and errors in php-fpm.conf 2010-04-23 08:06:49 +00:00
Jérôme Loyet
7ac145d9f3 correct wrong comparison (thx to felipe) 2010-04-22 07:14:06 +00:00
Kalle Sommer Nielsen
518a17e7bf Remove old dsp/dsw/makefile files, these arent used by the build system anymore and are barely updated nor available for all extensions 2010-04-21 23:36:49 +00:00
Felipe Pena
696f6c7c93 - Fix ZTS build 2010-04-21 23:22:20 +00:00
Jérôme Loyet
3defa292f2 switch the configuration syntax from xml to ini 
It's been describe in the RFC: http://wiki.php.net/rfc/fpm/ini_syntax
 2010-04-21 22:56:33 +00:00
Kalle Sommer Nielsen
febee11285 Removed register_globals 2010-04-21 01:27:22 +00:00
Jérôme Loyet
bae9248602 typo 2010-04-20 23:31:13 +00:00
Jérôme Loyet
5556956899 Add a check request_method. If fcgi protocol is not followed, a segfault can occur. 2010-04-20 23:28:20 +00:00
Jérôme Loyet
ca8756478a Change php_defines in configuration file to php_value,php_admin_value,php_flag,php_admin_flag (as in the apache sapi). 
php_admin* sets values as ZEND_INI_SYSTEM mode while php_* sets values as ZEND_INI_USER
 2010-04-20 21:13:40 +00:00
Jérôme Loyet
213436c3fb true/false was not a valid value for boolean directives 2010-04-19 20:45:03 +00:00
Jérôme Loyet
5a211da7af correct path in the man page 2010-04-19 18:02:36 +00:00
Antony Dovgal
b299e90b79 use new type + const static 2010-04-13 12:16:26 +00:00
Antony Dovgal
d77d6153ec re-add updated FPM 2010-04-13 12:13:46 +00:00
Antony Dovgal
3ebdadf8f6 prepare to re-add newer FPM version 2010-04-13 12:13:24 +00:00
Kalle Sommer Nielsen
7ef4cdf471 Remove a couple TSRMLS_FETCH() calls around ext/main/sapi 2010-04-13 11:02:15 +00:00
Antony Dovgal
06b9943842 add FPM sapi to trunk 2010-04-12 11:22:24 +00:00
Johannes Schlüter
26af575926 Add ReflectionZendExtension class and --rz option to CLI 2010-03-30 22:35:23 +00:00
Jani Taskinen
af49e58f51 - Reverted r296062 and r296065 2010-03-12 10:28:59 +00:00
Jani Taskinen
06f072cb5e MFH: Improved / fixed output buffering (Michael Wallner) 2010-03-11 10:24:29 +00:00
Felipe Pena
68f805a6d0 - Fixed bug #51237 (milter SAPI crash on startup) 
patch by: igmar at palsenberg dot com
 2010-03-08 23:29:46 +00:00
Felipe Pena
9186e478fa - Fix php-milter sample usage (-r option doesn't exists here) 2010-03-08 22:58:31 +00:00
Kalle Sommer Nielsen
bf7de28e46 Fixed bug #50795 (man pages have bad whatis entries) 
- Patch by Debian
 2010-02-17 05:32:52 +00:00
Rasmus Lerdorf
1947334023 Fix bug #50940 2010-02-05 18:59:05 +00:00
Ilia Alshanetsky
8543914732 Update copyright year in the man file 2010-01-04 12:38:07 +00:00
Sebastian Bergmann
9ba1e81665 sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php 2010-01-03 09:23:27 +00:00
Antony Dovgal
6a9d78f102 fix minor leak in CGI sapi (happened once per child) 2009-12-23 09:40:28 +00:00
Felipe Pena
4411621217 - Fixed bug #50209 (Compiling with libedit cannot find readline.h) 
(patch by tcallawa at redhat dot com)
 2009-12-13 17:06:47 +00:00
Jani Taskinen
c4819e9ff3 MFH: static before const 2009-12-08 17:30:22 +00:00
Jani Taskinen
4944354eec - Sync files 2009-12-02 08:22:05 +00:00
Dmitry Stogov
b26c9d400d Fixed bug #50168 (FastCGI fails with wrong error on HEAD request to non-existant file) 2009-11-30 14:43:22 +00:00
Jani Taskinen
bf7ed5eff5 - Fixed bug #49677 (ini parser crashes with apache2 and using ${something} ini variables) 2009-11-25 12:35:42 +00:00
Jani Taskinen
afc44b981e ws 2009-11-25 12:26:10 +00:00
Uwe Schindler
bdef3ee350 Fix bug #50140: With default compilation option, php symbols are unresolved for nsapi 2009-11-17 21:17:49 +00:00
Uwe Schindler
d80507b7d9 As I am working on it, further improvement for bug #50087 2009-11-12 17:13:05 +00:00
Uwe Schindler
47189cac7b Fix bug #50087: NSAPI performance improvements 2009-11-12 15:19:35 +00:00
Antony Dovgal
f298e6ce6e fix crash on empty doc_root 2009-10-20 12:57:44 +00:00
Stanislav Malyshev
a226082475 improve fix for #49767 and #47627 - make PHP report 
"no script" on 404 again
 2009-10-16 23:34:31 +00:00