php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-25 16:52:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
79,436 Commits 547 Branches 1,481 Tags
11bdb85d305743c0a6ba767da00b044391b5be48
Commit Graph

3130 Commits

Author SHA1 Message Date
Stanislav Malyshev
9fb92eed83 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix apr_psprintf format string from e0df4e3dba
  Fixed bug #67024 - getimagesize should recognize BMP files with negative height
 2014-04-13 15:40:21 -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
ccf863c8ce Merge branch 'PHP-5.6' 2014-04-11 19:35:11 +02: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
a6e56586c6 Merge branch 'PHP-5.6' 
* PHP-5.6:
  add missing skip to the output, so we actually skip this test
 2014-04-07 16:59:27 +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
8b9d12dd47 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix some warnings
  PHP-5.6 compatibility for apache2 filter SAPI

Fixes bug #66595
 2014-03-24 17:53:08 +01: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
12bc572008 Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  updated NEWS
  updated NEWS
  Fixed bug #65715 php5embed.lib isn't provided anymore
 2014-03-24 10:32:07 +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
582032b659 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed wrong indentation
 2014-03-18 10:50:16 +01:00
Mateusz Kocielski
6c259625c4 Fixed wrong indentation 2014-03-18 10:49:28 +01:00
Mateusz Kocielski
1a5c51829a Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix phpdbg build on FreeBSD
  Fixed off-by-one in php_url_parse_ex
 2014-03-18 10:03:06 +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
0821d3942e Merge branch 'PHP-5.6' 
* PHP-5.6:
  man page: long option name is --strip, not --stripped
  --global have be removed in 5.2
 2014-02-28 08:12:38 +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
Paul Annesley
a16304f836 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:47:44 +04:00
Lior Kaplan
464b1bc4fb Merge branch 'PHP-5.6' 2014-02-14 17:19:33 +02:00
Veres Lajos
a7ec000f35 a few typofixes 2014-02-14 17:16:17 +02:00
Yasuo Ohgaki
9a5cb51ebc Merge branch 'PHP-5.6' 
* PHP-5.6:
  Implement RFC https://wiki.php.net/rfc/default_encoding
 2014-02-13 11:56:54 +09: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
krakjoe
6597d86389 Merge branch 'PHP-5.6' 
* PHP-5.6:
  windows
 2014-02-02 15:14:53 +00:00
krakjoe
eacab735e0 Merge branch 'PHP-5.6' 
* PHP-5.6:
  clean symbols
 2014-02-02 15:10:28 +00:00
krakjoe
8aaec7d1c3 Merge branch 'PHP-5.6' 
* PHP-5.6:
  another patch from upstream
 2014-02-02 14:59:30 +00:00
krakjoe
202dcc0f6a Merge branch 'PHP-5.6' 
* PHP-5.6:
  woops
 2014-02-02 14:50:43 +00:00
krakjoe
ee42849f8f Merge branch 'PHP-5.6' 
* PHP-5.6:
  better use of tmpnam/mkstemp
 2014-02-02 14:42:54 +00:00
krakjoe
37f4f132fc Merge branch 'PHP-5.6' 
* PHP-5.6:
  update version
 2014-02-02 14:05:03 +00:00
krakjoe
4c6816ddf2 Merge branch 'PHP-5.6' 
* PHP-5.6:
  remove use of zend directly, avoid leaks/bugs in modules etc
 2014-02-02 13:51:05 +00:00
Anatol Belski
d788a85736 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix C89 compat
 2014-01-19 02:05:38 +01:00
Anatol Belski
12c1cfbf8f fix C89 compat 2014-01-19 02:05:10 +01:00
Johannes Schlüter
84efb8fc71 Merge branch 'PHP-5.6' 2014-01-18 13:53:15 +01:00
Johannes Schlüter
8ff4d61f08 Merge branch 'phpdbg' into PHP-5.6 2014-01-18 13:52:27 +01:00