Anatol Belski
23e8956386
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated NEWS
updated NEWS
Fix #69781 : phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business"
Revert "Fix #69781 : phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business""
Fix #69781 : phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business"
2015-06-10 11:26:49 +02:00
Anatol Belski
2c55ae5261
updated NEWS
2015-06-10 11:26:00 +02:00
Anatol Belski
64df05d5b1
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
Fix #69781 : phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business"
Revert "Fix #69781 : phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business""
Fix #69781 : phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business"
2015-06-10 11:25:21 +02:00
Anatol Belski
60e181c20a
updated NEWS
2015-06-10 11:24:45 +02:00
Christian Wenz
0c8136654d
Fix #69781 : phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business"
2015-06-10 11:22:30 +02:00
Christian Wenz
82e5260104
Revert "Fix #69781 : phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business""
...
This reverts commit 4a05c81b85
2015-06-10 11:22:29 +02:00
Christian Wenz
741b949a6f
Fix #69781 : phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business"
2015-06-10 11:22:28 +02:00
Anatol Belski
dbef99ba6e
updated NEWS
2015-06-10 10:47:06 +02:00
Anatol Belski
a96345d12b
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated NEWS
updated NEWS
fixed bug, where a linebreak immediately after an opening quote of a value caused a segfault
made failing test more meaningful
added failing test
2015-06-10 10:44:44 +02:00
Anatol Belski
f4707ed256
updated NEWS
2015-06-10 10:44:02 +02:00
Anatol Belski
ca467d5117
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
fixed bug, where a linebreak immediately after an opening quote of a value caused a segfault
made failing test more meaningful
added failing test
2015-06-10 10:43:23 +02:00
Anatol Belski
aef5a02ebb
updated NEWS
2015-06-10 10:42:31 +02:00
Christoph M. Becker
36222eb4cc
fixed bug, where a linebreak immediately after an opening quote of a value caused a segfault
2015-06-10 10:39:37 +02:00
Christoph M. Becker
2ba9681e8e
made failing test more meaningful
2015-06-10 10:39:36 +02:00
Christoph M. Becker
616b932ab0
added failing test
2015-06-10 10:39:35 +02:00
Ferenc Kovacs
5ff259ebb7
Merge branch 'PHP-5.6'
...
* PHP-5.6:
add missing NEWS entries
add missing NEWS entries
2015-06-10 09:39:38 +02:00
Ferenc Kovacs
b5d5baa882
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
add missing NEWS entries
2015-06-10 09:37:00 +02:00
Ferenc Kovacs
0d7f22c157
add missing NEWS entries
2015-06-10 09:36:53 +02:00
Ferenc Kovacs
2b8ba3e9f8
add missing NEWS entries
2015-06-10 09:35:38 +02:00
Stanislav Malyshev
d4407e1cb9
Merge branch 'PHP-5.6'
...
* PHP-5.6:
add NEWS
Fixed bug #68776
fix test
update NEWS
Fix bug #69646 OS command injection vulnerability in escapeshellarg
Fix #69719 - more checks for nulls in paths
fix test description
Fixed Buf #68812 Unchecked return value.
Conflicts:
ext/dom/document.c
ext/gd/gd.c
ext/standard/exec.c
2015-06-09 21:39:59 -07:00
Stanislav Malyshev
563462fbf8
Fixed bug #69646 (OS command injection vulnerability in escapeshellarg)
2015-06-09 21:37:17 -07:00
Stanislav Malyshev
60a2742fd2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
add NEWS
2015-06-09 21:35:41 -07:00
Stanislav Malyshev
c2d4704744
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add NEWS
2015-06-09 21:35:31 -07:00
Stanislav Malyshev
f1ffb4b1ad
add NEWS
2015-06-09 21:35:18 -07:00
Stanislav Malyshev
c095af584c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #68776
2015-06-09 21:34:06 -07:00
Stanislav Malyshev
e10af61862
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #68776
2015-06-09 21:33:38 -07:00
Yasuo Ohgaki
9d168b863e
Fixed bug #68776
2015-06-09 21:32:54 -07:00
Stanislav Malyshev
1346c3df42
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix test
update NEWS
2015-06-09 17:12:25 -07:00
Stanislav Malyshev
6b53b7cd84
Merge branch 'PHp-5.4' into PHP-5.5
...
* PHp-5.4:
fix test
update NEWS
2015-06-09 17:12:11 -07:00
Stanislav Malyshev
eee8b6c33f
fix test
2015-06-09 17:11:33 -07:00
Stanislav Malyshev
539738c438
update NEWS
2015-06-09 16:23:05 -07:00
Stanislav Malyshev
8b1919ed73
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #69646 OS command injection vulnerability in escapeshellarg
Fix #69719 - more checks for nulls in paths
fix test description
Fixed Buf #68812 Unchecked return value.
2015-06-09 15:32:27 -07:00
Stanislav Malyshev
4e2fb47092
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #69646 OS command injection vulnerability in escapeshellarg
Fix #69719 - more checks for nulls in paths
fix test description
Fixed Buf #68812 Unchecked return value.
Conflicts:
ext/dom/document.c
ext/gd/gd.c
2015-06-09 15:31:27 -07:00
Ferenc Kovacs
e4aa5c0510
fix typo
2015-06-09 23:14:11 +02:00
Stanislav Malyshev
8036758491
Fix bug #69646 OS command injection vulnerability in escapeshellarg
2015-06-09 10:52:38 -07:00
Stanislav Malyshev
f7d7befae8
Fix #69719 - more checks for nulls in paths
2015-06-09 10:52:38 -07:00
Ferenc Kovacs
7ec3016e29
fix hard-coded path in test
2015-06-09 16:42:02 +02:00
Ferenc Kovacs
2d962af4c0
prepare for 7.0.0alpha1
2015-06-09 14:20:55 +02:00
Ferenc Kovacs
b6005f72fc
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix NEWS
2015-06-09 13:57:41 +02:00
Ferenc Kovacs
8574290d9b
fix NEWS
2015-06-09 13:57:28 +02:00
Ferenc Kovacs
901ff81196
Merge branch 'PHP-5.6'
...
* PHP-5.6:
these will be part of 5.6.11
2015-06-09 13:41:25 +02:00
Ferenc Kovacs
72d0796d66
these will be part of 5.6.11
2015-06-09 13:41:00 +02:00
Ferenc Kovacs
7a9facd8c6
Merge branch 'PHP-5.6'
...
* PHP-5.6:
add missing NEWS entry
2015-06-09 13:32:11 +02:00
Ferenc Kovacs
632c5d6250
add missing NEWS entry
2015-06-09 13:31:45 +02:00
Julien Pauli
3601b61f3d
Merge branch 'PHP-5.6'
...
* PHP-5.6:
5.5.27 now
2015-06-09 10:36:20 +02:00
Julien Pauli
0bfb454acb
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
5.5.27 now
Conflicts:
configure.in
main/php_version.h
2015-06-09 10:35:42 +02:00
Julien Pauli
5f7c1917e3
5.5.27 now
2015-06-09 10:33:29 +02:00
Remi Collet
531c306fe6
fix test description
2015-06-09 09:18:54 +02:00
Remi Collet
1ad58ce12e
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix test description
Fixed Buf #68812 Unchecked return value.
Fixed Buf #68812 Unchecked return value.
2015-06-09 09:14:05 +02:00
Remi Collet
5eecc6bcde
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix test description
Fixed Buf #68812 Unchecked return value.
2015-06-09 09:13:19 +02:00
