diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2016-08-27 01:13:32 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2016-08-27 01:18:10 +0200 |
| commit | 8fcfacf7465f7bdfa2f88f520af8ba35e77afd91 (patch) | |
| tree | 27c8da4364be35feec74c568e1c8de0cb052dadc | |
| parent | c4c3eb55a75f59fd73d0ee034ccaaf81ae46d8ec (diff) | |
| parent | 2139918ea6f5088e9ed5daa734568b4a50217f52 (diff) | |
| download | php-git-8fcfacf7465f7bdfa2f88f520af8ba35e77afd91.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/standard/browscap.c | 4 | ||||
| -rw-r--r-- | ext/standard/tests/misc/bug65550.phpt | 19 |
3 files changed, 25 insertions, 0 deletions
@@ -72,6 +72,8 @@ PHP NEWS . Fixed bug #55451 (substr_compare NULL length interpreted as 0). (Lauri Kenttä) . Fixed bug #72278 (getimagesize returning FALSE on valid jpg). (cmb) + . Fixed bug #65550 (get_browser() incorrectly parses entries with "+" sign). + (cmb) - Streams: . Fixed bug #72853 (stream_set_blocking doesn't work). (Laruence) diff --git a/ext/standard/browscap.c b/ext/standard/browscap.c index f47478a241..8ad55829c8 100644 --- a/ext/standard/browscap.c +++ b/ext/standard/browscap.c @@ -115,6 +115,10 @@ static void convert_browscap_pattern(zval *pattern, int persistent) /* {{{ */ t[j++] = '\\'; t[j] = '~'; break; + case '+': + t[j++] = '\\'; + t[j] = '+'; + break; default: t[j] = lc_pattern[i]; break; diff --git a/ext/standard/tests/misc/bug65550.phpt b/ext/standard/tests/misc/bug65550.phpt new file mode 100644 index 0000000000..41967426fa --- /dev/null +++ b/ext/standard/tests/misc/bug65550.phpt @@ -0,0 +1,19 @@ +--TEST-- +Bug #65550 (get_browser() incorrectly parses entries with "+" sign) +--INI-- +browscap={PWD}/browscap.ini +--SKIPIF-- +<?php +if (!is_readable(ini_get('browscap'))) die('skip browscap.ini file ' . ini_get('browscap') . ' not readable'); +?> +--FILE-- +<?php +$user_agent = 'Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en-US) AppleWebKit/522+ (KHTML, like Gecko, Safari/522) OmniWeb/v613'; +$caps = get_browser($user_agent, true); +var_dump($caps['browser'], $caps['version']); +?> +==DONE== +--EXPECT-- +string(7) "OmniWeb" +string(3) "5.6" +==DONE== |