Anatol Belski
e3abcf7826
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #67033 Remove reference to Windows 95
2014-04-14 09:33:49 +02:00
Anatol Belski
57d657987d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #67033 Remove reference to Windows 95
2014-04-14 09:33:31 +02:00
Anatol Belski
95c57bb646
Fixed bug #67033 Remove reference to Windows 95
2014-04-14 09:32:31 +02:00
Stanislav Malyshev
cfe24a7be2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix NEWS
2014-04-13 20:17:14 -07:00
Stanislav Malyshev
6e81f80a1e
MErge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix NEWS
2014-04-13 20:16:54 -07:00
Stanislav Malyshev
b80243aece
fix NEWS
2014-04-13 20:16:27 -07:00
Stanislav Malyshev
7c9209a0d1
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix #66021 (Blank line inside empty array/object)
2014-04-13 18:56:16 -07:00
Stanislav Malyshev
9bba219c75
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix #66021 (Blank line inside empty array/object)
2014-04-13 18:55:28 -07:00
Stanislav Malyshev
5e66ce9293
Merge branch 'pull-request/518' into PHP-5.4
...
* pull-request/518:
Fix #66021 (Blank line inside empty array/object)
2014-04-13 18:50:39 -07:00
Stanislav Malyshev
0d4c28f2e1
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #64604
2014-04-13 18:39:17 -07:00
Stanislav Malyshev
30ec1c0051
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #64604
2014-04-13 18:38:36 -07:00
Ingo Walz
b05c088a3a
Fixed bug #64604
2014-04-13 18:37:40 -07:00
Stanislav Malyshev
1ef0bd2633
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix #66562 : Consistency bug where curl_multi_getcontent behaves different from curl_exec
2014-04-13 18:13:52 -07:00
Stanislav Malyshev
f1206aef70
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix #66562 : Consistency bug where curl_multi_getcontent behaves different from curl_exec
2014-04-13 18:13:09 -07:00
Freek
5558d0db9b
Fix #66562 : Consistency bug where curl_multi_getcontent behaves different from curl_exec
...
curl_exec returns an empty string when data is received from a domain that returns zero content. curl_multi_getcontent
returned null. Now it returns an empty string fixing the incosistency
2014-04-13 18:12:17 -07:00
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
04a11b850a
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix windows build
2014-04-13 17:04:00 -07:00
Stanislav Malyshev
df8e34bcc1
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix windows build
2014-04-13 17:03:28 -07:00
Stanislav Malyshev
3a2660b302
Fix windows build
2014-04-13 17:02:21 -07:00
Stanislav Malyshev
d3c4292db7
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #66721
2014-04-13 15:55:45 -07:00
Stanislav Malyshev
733b09442d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #66721
2014-04-13 15:55:07 -07:00
Boro Sitnikovski
8c88b6e81c
Fix bug #66721
...
Add NULL check to php_date_parse_tzfile's retval
2014-04-13 15:51:55 -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
Stanislav Malyshev
3aab84c100
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #67024 - getimagesize should recognize BMP files with negative height
2014-04-13 15:25:58 -07:00
Stanislav Malyshev
fe72caa6e5
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #67024 - getimagesize should recognize BMP files with negative height
2014-04-13 15:23:32 -07:00
Gabor Buella
1010200da5
Fixed bug #67024 - getimagesize should recognize BMP files with negative height
2014-04-13 15:17:04 -07:00
Bob Weinand
a93e734f81
Merge branch 'PHP-5.5' into PHP-5.6
2014-04-14 00:08:36 +02:00
Daniel Lowrey
0e023e9784
Bug #66840 : Fix broken build when extension built separately
2014-04-13 15:17:50 -06:00
Bob Weinand
bf3edbada6
Merge branch 'PHP-5.4' into PHP-5.5
2014-04-13 23:03:53 +02:00
Bob Weinand
beda5093b4
Reverted to 5a0da281e5
...
Discussion: http://news.php.net/php.cvs/76836
2014-04-13 23:01:31 +02:00
Bob Weinand
3636a91adc
Merge branch 'PHP-5.5' into PHP-5.6
2014-04-13 19:40:39 +02:00
Bob Weinand
191d9fc227
Merge branch 'PHP-5.4' into PHP-5.5
2014-04-13 19:37:06 +02:00
Bob Weinand
f07e37c96d
Forgot title in phpt for bug #67064
2014-04-13 19:34:17 +02:00
Bob Weinand
2f3056fecc
Updated NEWS
2014-04-13 19:32:51 +02:00
Bob Weinand
fb99409f89
Merge branch 'PHP-5.5' into PHP-5.6
2014-04-13 19:27:43 +02:00
Bob Weinand
eca0644e0a
Merge branch 'PHP-5.4' into PHP-5.5
2014-04-13 19:25:07 +02:00
Bob Weinand
1a4a9eede5
Fix bug #67064 in a BC safe way
...
You can use an optional parameter now when implementing the Countable interface
to get the $mode passed to count().
2014-04-13 19:24:12 +02:00
Bob Weinand
a3eafe535f
Added UPGRAING notice for bug #66015 in BC break section
2014-04-13 11:38:52 +02:00
Nikita Popov
fb5d5d9700
Add new zend_hash_* APIs to UPGRADING.INTERNALS
2014-04-13 10:49:14 +02:00
Nikita Popov
57b88ba6ea
Add str_* macros to UPGRADING.INTERNALS
2014-04-13 10:49:14 +02:00
Ferenc Kovacs
20036525e2
Fix bug #66660 : use str_efree instead of efree to handle interned empty strings correctly
2014-04-13 10:45:46 +02:00
Matteo Beccati
7fd9898a2d
Fixed bug #66604 'pdo/php_pdo_error.h' not copied to the include dir
2014-04-13 08:53:21 +02:00
Ferenc Kovacs
aefc8f22b3
Fix bug #66568 : the second arg for unserialize is optional.
2014-04-13 02:49:35 +02:00
Ferenc Kovacs
51cbb85ea9
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix typo
2014-04-13 01:57:15 +02:00
Ferenc Kovacs
2876bde634
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix typo
2014-04-13 01:56:47 +02:00
Ferenc Kovacs
5a0da281e5
fix typo
2014-04-13 01:55:55 +02:00