Fixed bug #66946 extensive backtracking in awk rule regular expression
CVE-2013-7345

Applied upstream patch:
https://github.com/file/file/commit/ef2329cf71acb59204dd981e2c6cce6c81fe467c

Add the magicdata.patch to track patches applied to upstream data file.
Fixed bug #66946 extensive backtracking in awk rule regular expression
CVE-2013-7345

Applied upstream patch:
https://github.com/file/file/commit/ef2329cf71acb59204dd981e2c6cce6c81fe467c

Add the magicdata.patch to track patches applied to upstream data file.
NEWS
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  NEWS
  Fixed bug #66946 extensive backtracking in awk rule regular expression CVE-2013-7345
  Fixed bug #66946 extensive backtracking in awk rule regular expression CVE-2013-7345
NEWS
Fix merge (5.6 already have file 5.17)
NEWS
Merge branch 'PHP-5.6'

* PHP-5.6:
  NEWS
  NEWS
  NEWS
  Fixed bug #66946 extensive backtracking in awk rule regular expression CVE-2013-7345
  Fixed bug #66946 extensive backtracking in awk rule regular expression CVE-2013-7345
Call offsetGet() when called with isset() on ArrayObject derivatives
Updated NEWS for #66834
Merge branch 'PHP-5.6'
Added TSRMLS_CC to zend_is_true() calls
fix merge issue
fix merge issue
- Updated to version 2014.2 (2014b)
Merge branch 'PHP-5.4' into PHP-5.5
Merge branch 'PHP-5.5' into PHP-5.6
Merge branch 'PHP-5.6'
Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport

* origin/PHP-5.6:
  - Updated to version 2014.2 (2014b)
  fix merge issue
  Updated NEWS for #66834
  Call offsetGet() when called with isset() on ArrayObject derivatives
  NEWS
  NEWS
  NEWS
  Fixed bug #66946 extensive backtracking in awk rule regular expression CVE-2013-7345
  Fixed bug #66946 extensive backtracking in awk rule regular expression CVE-2013-7345

Conflicts:
	ext/spl/spl_array.c
Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64

* origin/str_size_and_int64_56_backport:
  - Updated to version 2014.2 (2014b)
  fix merge issue
  Updated NEWS for #66834
  Call offsetGet() when called with isset() on ArrayObject derivatives
  NEWS
  NEWS
  NEWS
  Fixed bug #66946 extensive backtracking in awk rule regular expression CVE-2013-7345
  Fixed bug #66946 extensive backtracking in awk rule regular expression CVE-2013-7345

Conflicts:
	ext/spl/spl_array.c