com php-src: Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport: ext/filei nfo/libmagic/softmagic.c ext/standard/info.c
| From: | Anatol Belski | Date: | Mon, 04 Aug 2014 08:04:02 +0000 |
| Subject: | com php-src: Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport: ext/filei nfo/libmagic/softmagic.c ext/standard/info.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79715@lists.php.net to get a copy of this message | ||
Commit: 38a4b934cac843146843e226470c2ed37033a985
Author: Anatol Belski <ab@php.net> Mon, 4 Aug 2014 10:04:02 +0200
Parents: dccbb794451c506e0ec645347096c27ac8fefc63 d730675be5395899906fad74a7d06c8d75e7d9c9
Branches: str_size_and_int64_56_backport
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=38a4b934cac843146843e226470c2ed37033a985
Log:
Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
backport the fix for bug #67739
Fix bug #67705 (extensive backtracking in rule regular expression)
add test
Fix bug #67705 (extensive backtracking in rule regular expression)
Bugs:
https://bugs.php.net/67739
https://bugs.php.net/67705
Changed paths:
MM ext/fileinfo/libmagic/softmagic.c
MM ext/standard/info.c
Diff: