c0d26bb138
Merge branch 'PHP-5.5' into PHP-5.6
2014-02-20 11:19:52 +08:00
3fa164c24b
Update pgsql document
2014-02-20 10:44:18 +09:00
47204c6341
some missing pieces for __debugInfo
2014-02-20 02:07:34 +01:00
143bb29c1a
Fixes #66714 : imageconvolution breakage in 5.5.9
...
5.5.9 included some GD fixes related to #66356 . One of those fixes changed the
above section of imageconvolution, but the variable was mistyped.
2014-02-19 15:24:15 -06:00
e272225e2a
Merge branch 'bug-65538' of https://github.com/rdlowrey/php-src into PHP-5.6
...
* 'bug-65538' of https://github.com/rdlowrey/php-src :
Add tests for Bug #65538
Fix Bug #65538 (cafile now supports stream wrappers)
2014-02-19 04:17:33 -07:00
d9036d14f7
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Skip failing tests when EC unavailable (RHEL)
2014-02-19 04:01:57 -07:00
a7d3606650
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Skip failing tests when EC unavailable (RHEL)
Conflicts:
ext/openssl/openssl.c
2014-02-19 04:01:08 -07:00
633f898f15
Skip failing tests when EC unavailable (RHEL)
2014-02-19 03:57:37 -07:00
3e82ff615f
updated NEWS
2014-02-19 11:28:55 +01:00
6b5c9f6c5a
updated libmagic.patch
2014-02-19 11:20:24 +01:00
fdaf3996af
remove PHP_API_VERSION < 20100412 check
2014-02-19 11:01:42 +01:00
6d2cf0f2a4
expose correct libmagic version
2014-02-19 10:48:52 +01:00
4019531748
fixed tests in ext/fileinfo
2014-02-19 10:04:29 +01:00
967a6771d3
updated to libmagic-5.17
2014-02-19 10:02:36 +01:00
e95a2925fc
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated libmagic.patch
2014-02-18 19:09:04 +01:00
8dd99dd2dc
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated libmagic.patch
2014-02-18 19:08:45 +01:00
a289b37f48
updated libmagic.patch
2014-02-18 19:08:16 +01:00
54b1829f75
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
update news with CVE
5.5.11-dev next
5.5.11 next for NEWS
Conflicts:
configure.in
main/php_version.h
2014-02-18 08:48:52 -08:00
1cc5d1009f
MErge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
update news with CVE
2014-02-18 08:47:43 -08:00
ee4b3892f8
update news with CVE
2014-02-18 08:36:51 -08:00
0afcbb0ba9
5.5.11-dev next
2014-02-18 16:45:48 +01:00
be354936b7
5.5.11 next for NEWS
2014-02-18 16:40:19 +01:00
aa84d906d8
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Set fileinfo version to 1.0.5 (as in php 5.4, no diff)
NEWS
NEWS
Fixed Bug #66731 file: infinite recursion
2014-02-18 13:58:36 +01:00
bd8cd98d6d
Set fileinfo version to 1.0.5 (as in php 5.4, no diff)
2014-02-18 13:57:53 +01:00
a6ad3a558a
NEWS
2014-02-18 13:57:28 +01:00
bdd65b578c
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS
Fixed Bug #66731 file: infinite recursion
2014-02-18 13:57:10 +01:00
9f449df1e4
NEWS
2014-02-18 13:56:58 +01:00
89f864c547
Fixed Bug #66731 file: infinite recursion
...
Upstream commit (available in file-5.17)
https://github.com/glensc/file/commit/3c081560c23f20b2985c285338b52c7aae9fdb0f
https://github.com/glensc/file/commit/cc9e74dfeca5265ad725acc926ef0b8d2a18ee70
2014-02-18 13:54:33 +01:00
140769a9d9
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
5.4.27 now
update NEWS
2014-02-17 21:22:24 -08:00
58b7f21c3f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
5.4.27 now
update NEWS
Conflicts:
configure.in
main/php_version.h
2014-02-17 21:22:03 -08:00
c612440e0f
5.4.27 now
2014-02-17 21:19:25 -08:00
b79d2285df
update NEWS
2014-02-17 21:16:48 -08:00
1e752ce9c5
Add __debugInfo() magic method
...
class Foo {
private $val = 'Random, meaningless data';
public function count() { return 42; }
public function __debugInfo() {
return ['count' => $this->count()];
}
}
$f = new Foo;
var_dump($f);
2014-02-17 19:33:56 -08:00
4e4d319e62
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed broken build when EC unavailable
2014-02-17 19:38:49 -05:00
bd9aa181dc
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed broken build when EC unavailable
2014-02-17 19:38:30 -05:00
a80cec1190
Fixed broken build when EC unavailable
2014-02-17 18:55:39 -05:00
3e59f041da
remove dead code
2014-02-17 19:04:01 +02:00
b2cd56c3cb
Move code out, that handles the actual structure to be used for the decoded
...
data. Will make it easier to add different structures
2014-02-17 18:37:08 +02:00
0bc96ef3cc
Updated NEWS for #65753
2014-02-17 11:16:32 +01:00
e19e266ae1
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Updated NEWS for #65753
Updated NEWS for #65753
Export JsonSerializable Interface (bug #65753 )
2014-02-17 11:13:54 +01:00
66f76ec1f9
Updated NEWS for #65753
2014-02-17 11:13:38 +01:00
641a0c86d9
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Updated NEWS for #65753
2014-02-17 11:09:31 +01:00
b04159eed4
Updated NEWS for #65753
2014-02-17 11:05:34 +01:00
8a1d248d4e
Export JsonSerializable Interface (bug #65753 )
2014-02-17 10:38:51 +01:00
baafdad150
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Export JsonSerializable Interface (bug #65753 )
2014-02-17 10:36:13 +01:00
786234d351
Export JsonSerializable Interface (bug #65753 )
2014-02-17 10:25:40 +01:00
6877af3f71
simplify the metadata part
2014-02-17 10:20:36 +01:00
796bfb0bd0
imagettftext() uses the last charactermap it found and not the one you want
...
Summary:
This caused issues when you picked a font with multiple maps, it wouldn't
pick the unicode version but instead pick the last one it saw. Change so
we cache on a per encoding level. There was even a todo list item in the code.
In an ideal world we can probably iterate through at font write time.
Test Plan:
See said unit test, it's Apache Licensed font included
2014-02-16 22:49:31 -08:00
1f3af9cd21
[libxml] Unit test for libxml_disable_entity_loader()
...
Summary:
Test to make sure libxml_disable_entity_loader() is behaving.
2014-02-16 22:34:52 -08:00
e5ec5fc9cc
Add pgsql related change information to NEWS and UPGRADING
2014-02-17 10:13:44 +09:00
Xinchen Hui