848df6fcbe
Merge sapi/phpdbg into PHP-5.6
2014-06-04 02:18:39 +02:00
466cd2aa7d
Merge sapi/phpdbg into PHP-5.6
2014-06-03 21:15:02 +00:00
003ba74d99
Merge sapi/phpdbg into PHP-5.6
2014-05-03 11:40:25 +02:00
3ad8616aff
Added stdion/stdout/stderr constsnts and their php:// wrappers
...
Fixes issue #85
2014-05-01 11:43:46 +02:00
c397fcc35f
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #67060 : use default mode of 660
2014-04-29 09:16:24 -07:00
770fcdab90
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #67060 : use default mode of 660
2014-04-29 09:15:23 -07:00
35ceea928b
Fix bug #67060 : use default mode of 660
2014-04-29 09:14:11 -07:00
3b6bf6eec8
Merge remote-tracking branch 'phpdbg/master' into PHP-5.6
...
* phpdbg/master:
C89 compat
2014-04-27 18:01:26 +02:00
a10dc3aa4f
Merge remote-tracking branch 'phpdbg/master' into PHP-5.6
...
* phpdbg/master:
removed /EHa as __try/__catch syntax is used anyway
fix ZEND_DEBUG usage
fix CFLAGS_PHPDBGS and some formatting
2014-04-26 00:15:32 +02:00
cd2641973c
Merge remote-tracking branch 'phpdbg/master' into PHP-5.6
2014-04-24 11:05:52 +02:00
742f4704a9
sapi/litespeed/lsapi_main.c: Fix bug #63228
...
Fix compiling error at line 606 (error: format not a string
literal and no format arguments [-Werror=format-security]
2014-04-22 10:48:14 -03:00
708af5fd8e
Merge sapi/phpdbg into PHP-5.6
2014-04-21 23:30:08 +02:00
0df431482f
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix #66908 : php-fpm reload leaks epoll_create() file descriptor
2014-04-20 16:25:03 -07:00
6bad228b4e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix #66908 : php-fpm reload leaks epoll_create() file descriptor
2014-04-20 16:23:43 -07:00
49341e992a
Fix #66908 : php-fpm reload leaks epoll_create() file descriptor
...
This patch fixes descriptor leak which could lead to DoS once Max open files is reached
2014-04-20 16:21:49 -07:00
b4c238c8cf
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #67079 Missing MIME types for XML/XSL files
2014-04-16 09:48:31 +02:00
9eb726b3ab
Fixed bug #67079 Missing MIME types for XML/XSL files
2014-04-16 09:47:49 +02:00
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
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
636adf251c
Fix bug #66482 , replace wrong item name 'priority' with 'process.priority' in php-fpm.conf
2014-04-13 17:30:50 -07:00
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
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
442264ffd6
fix apr_psprintf format string from e0df4e3dba
2014-04-13 15:36:43 -07:00
99d1a1bb3f
Shut up, my lovely compiler; I do not like your warnings
2014-04-11 19:33:56 +02:00
7446766dab
add missing skip to the output, so we actually skip this test
2014-04-07 16:57:52 +02:00
caba0203e8
fix some warnings
2014-03-24 17:51:50 +01:00
275b2c420d
PHP-5.6 compatibility for apache2 filter SAPI
2014-03-24 17:48:28 +01:00
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
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
17a57ad980
Fixed bug #65715 php5embed.lib isn't provided anymore
2014-03-24 10:24:37 +01:00
6c259625c4
Fixed wrong indentation
2014-03-18 10:49:28 +01:00
ccae70b765
Fix phpdbg build on FreeBSD
...
Added missing netinet/in.h header.
2014-03-18 09:51:39 +01:00
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
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
b1df743b7a
man page: long option name is --strip, not --stripped
2014-02-28 08:12:03 +01:00
c73b0543f1
--global have be removed in 5.2
2014-02-28 08:10:01 +01:00
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
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
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
a7ec000f35
a few typofixes
2014-02-14 17:16:17 +02:00
cbd108abf1
Implement RFC https://wiki.php.net/rfc/default_encoding
2014-02-13 11:54:52 +09:00
148d7cc103
windows
2014-02-02 15:14:25 +00:00
407d761d09
clean symbols
2014-02-02 15:10:17 +00:00
e8519bc207
another patch from upstream
2014-02-02 14:58:39 +00:00
6a6bec44ad
woops
2014-02-02 14:50:32 +00:00
9e84124e2d
better use of tmpnam/mkstemp
2014-02-02 14:42:31 +00:00
4a96a75c7d
update version
2014-02-02 14:04:47 +00:00
a58c74f1c7
remove use of zend directly, avoid leaks/bugs in modules etc
2014-02-02 13:43:43 +00:00
12c1cfbf8f
fix C89 compat
2014-01-19 02:05:10 +01:00
8ff4d61f08
Merge branch 'phpdbg' into PHP-5.6
2014-01-18 13:52:27 +01:00
Bob Weinand