Stanislav Malyshev
c1d5937f7f
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #66482 , replace wrong item name 'priority' with 'process.priority' in php-fpm.conf
2014-04-13 17:32:42 -07:00
Stanislav Malyshev
5811610d71
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #66482 , replace wrong item name 'priority' with 'process.priority' in php-fpm.conf
2014-04-13 17:31:44 -07:00
itxx00
636adf251c
Fix bug #66482 , replace wrong item name 'priority' with 'process.priority' in php-fpm.conf
2014-04-13 17:30:50 -07:00
Stanislav Malyshev
1be29a404a
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix apr_psprintf format string from e0df4e3dba
2014-04-13 15:39:32 -07:00
Stanislav Malyshev
c5275b4a92
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix apr_psprintf format string from e0df4e3dba
2014-04-13 15:37:55 -07:00
Jeff Trawick
442264ffd6
fix apr_psprintf format string from e0df4e3dba
2014-04-13 15:36:43 -07:00
Bob Weinand
99d1a1bb3f
Shut up, my lovely compiler; I do not like your warnings
2014-04-11 19:33:56 +02:00
Ferenc Kovacs
7446766dab
add missing skip to the output, so we actually skip this test
2014-04-07 16:57:52 +02:00
Michael Wallner
caba0203e8
fix some warnings
2014-03-24 17:51:50 +01:00
Michael Wallner
275b2c420d
PHP-5.6 compatibility for apache2 filter SAPI
2014-03-24 17:48:28 +01:00
Anatol Belski
13e8486550
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
updated NEWS
Fixed bug #65715 php5embed.lib isn't provided anymore
2014-03-24 10:30:05 +01:00
Anatol Belski
76066b304c
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated NEWS
Fixed bug #65715 php5embed.lib isn't provided anymore
2014-03-24 10:28:48 +01:00
Anatol Belski
17a57ad980
Fixed bug #65715 php5embed.lib isn't provided anymore
2014-03-24 10:24:37 +01:00
Mateusz Kocielski
6c259625c4
Fixed wrong indentation
2014-03-18 10:49:28 +01:00
Mateusz Kocielski
ccae70b765
Fix phpdbg build on FreeBSD
...
Added missing netinet/in.h header.
2014-03-18 09:51:39 +01:00
Remi Collet
06feb15a16
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
man page: long option name is --strip, not --stripped
--global have be removed in 5.2
2014-02-28 08:12:26 +01:00
Remi Collet
5fc7382a57
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
man page: long option name is --strip, not --stripped
--global have be removed in 5.2
2014-02-28 08:12:16 +01:00
Remi Collet
b1df743b7a
man page: long option name is --strip, not --stripped
2014-02-28 08:12:03 +01:00
Remi Collet
c73b0543f1
--global have be removed in 5.2
2014-02-28 08:10:01 +01:00
Paul Annesley
eb6941e902
add clear_env option to FPM config
...
This makes it possible to leave the envoronment as is on startup and
pass all the variables to the workers.
The default value of clear_env is "yes", preserving previous behaviour.
Patch by Paul Annesley.
2014-02-25 12:12:09 +04:00
Paul Annesley
6e15afd1be
add clear_env option to FPM config
...
This makes it possible to leave the envoronment as is on startup and
pass all the variables to the workers.
The default value of clear_env is "yes", preserving previous behaviour.
Patch by Paul Annesley.
2014-02-25 12:06:32 +04:00
Paul Annesley
a97ae8bc06
add clear_env option to FPM config
...
This makes it possible to leave the envoronment as is on startup and
pass all the variables to the workers.
The default value of clear_env is "yes", preserving previous behaviour.
Patch by Paul Annesley.
2014-02-24 11:53:40 +04:00
Veres Lajos
a7ec000f35
a few typofixes
2014-02-14 17:16:17 +02:00
Yasuo Ohgaki
cbd108abf1
Implement RFC https://wiki.php.net/rfc/default_encoding
2014-02-13 11:54:52 +09:00
krakjoe
148d7cc103
windows
2014-02-02 15:14:25 +00:00
krakjoe
407d761d09
clean symbols
2014-02-02 15:10:17 +00:00
krakjoe
e8519bc207
another patch from upstream
2014-02-02 14:58:39 +00:00
krakjoe
6a6bec44ad
woops
2014-02-02 14:50:32 +00:00
krakjoe
9e84124e2d
better use of tmpnam/mkstemp
2014-02-02 14:42:31 +00:00
krakjoe
4a96a75c7d
update version
2014-02-02 14:04:47 +00:00
krakjoe
a58c74f1c7
remove use of zend directly, avoid leaks/bugs in modules etc
2014-02-02 13:43:43 +00:00
Anatol Belski
12c1cfbf8f
fix C89 compat
2014-01-19 02:05:10 +01:00
Johannes Schlüter
8ff4d61f08
Merge branch 'phpdbg' into PHP-5.6
2014-01-18 13:52:27 +01:00
Antony Dovgal
98e6c8ca2d
fix indentation
2014-01-17 12:49:21 +04:00
Gernot Vormayr
dff0d51243
Add some basic and apparmor tests to fpm
2014-01-17 12:49:07 +04:00
Gernot Vormayr
e3d3283405
Add --force-stderr to fpm
2014-01-17 12:49:00 +04:00
Gernot Vormayr
f6d137a716
Add apparmor change hat functionality to fpm
2014-01-17 12:48:33 +04:00
Xinchen Hui
c081ce628f
Bump year
2014-01-03 11:08:10 +08:00
Xinchen Hui
47c9027772
Bump year
2014-01-03 11:06:16 +08:00
Xinchen Hui
c0d060f5c0
Bump year
2014-01-03 11:04:26 +08:00
krakjoe
c8dedaf2dc
update version output
2013-12-27 18:03:11 +00:00
Xinchen Hui
a8cd9b417c
Fixed bug #66358 (fpm starts segfault)
2013-12-27 20:45:43 +08:00
Anatol Belski
1e411ebdf5
fix c89 compat
2013-12-25 23:43:20 +01:00
Anatol Belski
00c7b973bb
fixed incompatible pointer in phpdbg on win64
2013-12-24 21:08:33 +01:00
Bob Weinand
ddf733fa69
Fixed #18
...
Errors not displaying in some configurations
2013-12-24 13:19:18 +01:00
Bob Weinand
ca882858f4
Fixed credits in phpdbg.* files
2013-12-24 00:34:23 +01:00
Bob Weinand
0577ccad28
Added breaking upon fatal-ish error
2013-12-24 00:30:37 +01:00
Joe Watkins
617aefbcda
credits file for phpdbg
2013-12-24 00:16:47 +01:00
Bob Weinand
cee72c13d7
Merge branch 'master' of sapi/phpdbg into PHP-5.6
...
Including phpdbg.
2013-12-20 14:27:51 +01:00
Ard Biesheuvel
f33265d572
cli: don't cast away const in select() timeout argument
...
The timeout argument to select() is modified to reflect the time
remaining when the function returns on a non-timeout condition.
Passing a pointer to const data and casting away the const-ness is
asking for trouble, but for some reason, this trouble manifests
itself only on non-x86 architectures [whose implementation of select()
in glibc is different from the one supplied for x86]
Fix this by passing a stack copy of the timeout argument to select()
2013-12-09 16:54:42 +01:00
