]> granicus.if.org Git - php/log
projects / php / log
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
php
11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Anatol Belski [Mon, 7 Apr 2014 15:41:47 +0000 (17:41 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  fixed the test for ICI >= 52.1

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Anatol Belski [Mon, 7 Apr 2014 15:41:32 +0000 (17:41 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fixed the test for ICI >= 52.1

11 years agofixed the test for ICI >= 52.1
commit | commitdiff | tree
Anatol Belski [Mon, 7 Apr 2014 15:40:56 +0000 (17:40 +0200)]
fixed the test for ICI >= 52.1

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Bob Weinand [Mon, 7 Apr 2014 15:16:48 +0000 (17:16 +0200)]
Merge branch 'PHP-5.6'

11 years agoFix Linux specific fail in error traces
commit | commitdiff | tree
Bob Weinand [Mon, 7 Apr 2014 15:14:38 +0000 (17:14 +0200)]
Fix Linux specific fail in error traces
Linux apparently does not like memcpy in overlapping regions...

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Ferenc Kovacs [Mon, 7 Apr 2014 14:59:27 +0000 (16:59 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  add missing skip to the output, so we actually skip this test

11 years agoadd missing skip to the output, so we actually skip this test
commit | commitdiff | tree
Ferenc Kovacs [Mon, 7 Apr 2014 14:57:52 +0000 (16:57 +0200)]
add missing skip to the output, so we actually skip this test

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Stanislav Malyshev [Sun, 6 Apr 2014 03:13:48 +0000 (20:13 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix the test according to how new date code does it
  fix to work on different ICU versions

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Stanislav Malyshev [Sun, 6 Apr 2014 03:13:24 +0000 (20:13 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix the test according to how new date code does it
  fix to work on different ICU versions

11 years agofix the test according to how new date code does it
commit | commitdiff | tree
Stanislav Malyshev [Sun, 6 Apr 2014 03:09:53 +0000 (20:09 -0700)]
fix the test according to how new date code does it

11 years agofix to work on different ICU versions
commit | commitdiff | tree
Stanislav Malyshev [Sun, 6 Apr 2014 02:30:13 +0000 (19:30 -0700)]
fix to work on different ICU versions

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Stanislav Malyshev [Sun, 6 Apr 2014 01:35:18 +0000 (18:35 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  multibytes tests still fail, put them in XFAIL

11 years agomultibytes tests still fail, put them in XFAIL
commit | commitdiff | tree
Stanislav Malyshev [Sun, 6 Apr 2014 01:34:39 +0000 (18:34 -0700)]
multibytes tests still fail, put them in XFAIL

clean up XFAIL from tests no longer failing

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Anatol Belski [Sat, 5 Apr 2014 07:50:13 +0000 (09:50 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  updated NEWS
  updated NEWS
  Fixed bug #66084 simplexml_load_string() mangles empty node name

11 years agoupdated NEWS
commit | commitdiff | tree
Anatol Belski [Sat, 5 Apr 2014 07:49:51 +0000 (09:49 +0200)]
updated NEWS

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Anatol Belski [Sat, 5 Apr 2014 07:48:54 +0000 (09:48 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  updated NEWS
  Fixed bug #66084 simplexml_load_string() mangles empty node name

11 years agoupdated NEWS
commit | commitdiff | tree
Anatol Belski [Sat, 5 Apr 2014 07:48:20 +0000 (09:48 +0200)]
updated NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Anatol Belski [Sat, 5 Apr 2014 07:47:14 +0000 (09:47 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #66084 simplexml_load_string() mangles empty node name

11 years agoFixed bug #66084 simplexml_load_string() mangles empty node name
commit | commitdiff | tree
Anatol Belski [Sat, 5 Apr 2014 07:46:24 +0000 (09:46 +0200)]
Fixed bug #66084 simplexml_load_string() mangles empty node name

11 years agoMerge branch 'master' of https://git.php.net/push/php-src
commit | commitdiff | tree
Kalle Sommer Nielsen [Sat, 5 Apr 2014 04:45:02 +0000 (06:45 +0200)]
Merge branch 'master' of https://git.php.net/push/php-src

11 years agoRemove call_user_method() and call_user_method_array() from master, long time depreca...
commit | commitdiff | tree
Kalle Sommer Nielsen [Sat, 5 Apr 2014 04:43:41 +0000 (06:43 +0200)]
Remove call_user_method() and call_user_method_array() from master, long time deprecated in favour of call_user_func*().

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Stanislav Malyshev [Thu, 3 Apr 2014 22:57:26 +0000 (15:57 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  cleanup NEWS

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Stanislav Malyshev [Thu, 3 Apr 2014 22:57:08 +0000 (15:57 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  cleanup NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Thu, 3 Apr 2014 22:56:46 +0000 (15:56 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  cleanup NEWS

11 years agocleanup NEWS
commit | commitdiff | tree
Stanislav Malyshev [Thu, 3 Apr 2014 22:53:43 +0000 (15:53 -0700)]
cleanup NEWS

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Michael Wallner [Thu, 3 Apr 2014 08:41:53 +0000 (10:41 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  NEWS
  NEWS
  Fix Bug #66736  fpassthru broken

11 years agoNEWS
commit | commitdiff | tree
Michael Wallner [Thu, 3 Apr 2014 08:41:45 +0000 (10:41 +0200)]
NEWS

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Michael Wallner [Thu, 3 Apr 2014 08:41:24 +0000 (10:41 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS
  Fix Bug #66736  fpassthru broken

11 years agoNEWS
commit | commitdiff | tree
Michael Wallner [Thu, 3 Apr 2014 08:40:42 +0000 (10:40 +0200)]
NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Michael Wallner [Thu, 3 Apr 2014 08:40:20 +0000 (10:40 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix Bug #66736  fpassthru broken

11 years agoFix Bug #66736 fpassthru broken
commit | commitdiff | tree
Michael Wallner [Thu, 3 Apr 2014 08:40:06 +0000 (10:40 +0200)]
Fix Bug #66736  fpassthru broken

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Michael Wallner [Thu, 3 Apr 2014 07:10:02 +0000 (09:10 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  NEWS
  NEWS
  Fix bug #66182  exit in stream filter produces segfault

11 years agoNEWS
commit | commitdiff | tree
Michael Wallner [Thu, 3 Apr 2014 07:09:51 +0000 (09:09 +0200)]
NEWS

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Michael Wallner [Thu, 3 Apr 2014 07:09:24 +0000 (09:09 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS
  Fix bug #66182  exit in stream filter produces segfault

11 years agoNEWS
commit | commitdiff | tree
Michael Wallner [Thu, 3 Apr 2014 07:09:15 +0000 (09:09 +0200)]
NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Michael Wallner [Thu, 3 Apr 2014 07:08:35 +0000 (09:08 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #66182  exit in stream filter produces segfault

11 years agoFix bug #66182 exit in stream filter produces segfault
commit | commitdiff | tree
Michael Wallner [Thu, 3 Apr 2014 07:07:35 +0000 (09:07 +0200)]
Fix bug #66182  exit in stream filter produces segfault

Unfortunately, a segv caused by exit cannot be tested reliably.

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Michael Wallner [Wed, 2 Apr 2014 13:39:16 +0000 (15:39 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  NEWS
  NEWS
  Fixed bug #61019 (Out of memory on command stream_get_contents)

11 years agoNEWS
commit | commitdiff | tree
Michael Wallner [Wed, 2 Apr 2014 13:39:07 +0000 (15:39 +0200)]
NEWS

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Michael Wallner [Wed, 2 Apr 2014 13:38:35 +0000 (15:38 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS
  Fixed bug #61019 (Out of memory on command stream_get_contents)

11 years agoNEWS
commit | commitdiff | tree
Michael Wallner [Wed, 2 Apr 2014 13:38:22 +0000 (15:38 +0200)]
NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Michael Wallner [Wed, 2 Apr 2014 13:37:50 +0000 (15:37 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #61019 (Out of memory on command stream_get_contents)

11 years agoFixed bug #61019 (Out of memory on command stream_get_contents)
commit | commitdiff | tree
Michael Wallner [Wed, 2 Apr 2014 13:36:39 +0000 (15:36 +0200)]
Fixed bug #61019 (Out of memory on command stream_get_contents)

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Michael Wallner [Wed, 2 Apr 2014 09:15:11 +0000 (11:15 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  NEWS
  NEWS

11 years agoNEWS
commit | commitdiff | tree
Michael Wallner [Wed, 2 Apr 2014 09:14:34 +0000 (11:14 +0200)]
NEWS

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Michael Wallner [Wed, 2 Apr 2014 09:13:42 +0000 (11:13 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS

11 years agoNEWS
commit | commitdiff | tree
Michael Wallner [Wed, 2 Apr 2014 09:13:21 +0000 (11:13 +0200)]
NEWS

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Michael Wallner [Wed, 2 Apr 2014 09:11:39 +0000 (11:11 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix bug #64330

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Michael Wallner [Wed, 2 Apr 2014 09:11:23 +0000 (11:11 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix bug #64330

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Michael Wallner [Wed, 2 Apr 2014 09:10:59 +0000 (11:10 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #64330

11 years agoFix bug #64330
commit | commitdiff | tree
Michael Wallner [Wed, 2 Apr 2014 09:09:26 +0000 (11:09 +0200)]
Fix bug #64330

stream_socket_server() creates wrong Abstract Namespace UNIX sockets

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Anatol Belski [Tue, 1 Apr 2014 08:15:05 +0000 (10:15 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  update NEWS
  updated NEWS
  updated NEWS
  added test for bug #53965
  Fixed bug #53965 <xsl:include> cannot find files w/ relative paths when loaded w/ "file://"

11 years agoupdate NEWS
commit | commitdiff | tree
Anatol Belski [Tue, 1 Apr 2014 08:14:38 +0000 (10:14 +0200)]
update NEWS

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Anatol Belski [Tue, 1 Apr 2014 08:13:38 +0000 (10:13 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  updated NEWS
  updated NEWS
  added test for bug #53965
  Fixed bug #53965 <xsl:include> cannot find files w/ relative paths when loaded w/ "file://"

11 years agoupdated NEWS
commit | commitdiff | tree
Anatol Belski [Tue, 1 Apr 2014 08:12:56 +0000 (10:12 +0200)]
updated NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Anatol Belski [Tue, 1 Apr 2014 08:12:06 +0000 (10:12 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  updated NEWS
  added test for bug #53965
  Fixed bug #53965 <xsl:include> cannot find files w/ relative paths when loaded w/ "file://"

11 years agoupdated NEWS
commit | commitdiff | tree
Anatol Belski [Tue, 1 Apr 2014 08:11:40 +0000 (10:11 +0200)]
updated NEWS

11 years agoadded test for bug #53965
commit | commitdiff | tree
Anatol Belski [Tue, 1 Apr 2014 08:08:08 +0000 (10:08 +0200)]
added test for bug #53965

11 years agoFixed bug #53965 <xsl:include> cannot find files w/ relative paths when loaded w...
commit | commitdiff | tree
Anatol Belski [Tue, 1 Apr 2014 08:07:18 +0000 (10:07 +0200)]
Fixed bug #53965 <xsl:include> cannot find files w/ relative paths when loaded w/ "file://"

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Anatol Belski [Mon, 31 Mar 2014 15:24:53 +0000 (17:24 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  updated libmagic.patch

11 years agoupdated libmagic.patch
commit | commitdiff | tree
Anatol Belski [Mon, 31 Mar 2014 15:24:15 +0000 (17:24 +0200)]
updated libmagic.patch

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Remi Collet [Mon, 31 Mar 2014 14:58:21 +0000 (16:58 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  NEWS
  NEWS
  NEWS
  Fixed Bug #66987 Memory corruption in fileinfo ext (bigendian)

11 years agoNEWS
commit | commitdiff | tree
Remi Collet [Mon, 31 Mar 2014 14:58:10 +0000 (16:58 +0200)]
NEWS

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Remi Collet [Mon, 31 Mar 2014 14:57:39 +0000 (16:57 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS
  NEWS
  Fixed Bug #66987 Memory corruption in fileinfo ext (bigendian)

11 years agoNEWS
commit | commitdiff | tree
Remi Collet [Mon, 31 Mar 2014 14:57:29 +0000 (16:57 +0200)]
NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Remi Collet [Mon, 31 Mar 2014 14:57:12 +0000 (16:57 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  NEWS
  Fixed Bug #66987 Memory corruption in fileinfo ext (bigendian)

11 years agoNEWS
commit | commitdiff | tree
Remi Collet [Mon, 31 Mar 2014 14:57:02 +0000 (16:57 +0200)]
NEWS

11 years agoFixed Bug #66987 Memory corruption in fileinfo ext (bigendian)
commit | commitdiff | tree
Remi Collet [Mon, 31 Mar 2014 14:50:47 +0000 (16:50 +0200)]
Fixed Bug #66987 Memory corruption in fileinfo ext (bigendian)

On little endian:
map->p == php_magic_database
map->magic[i] = pointer into the map

map->p == NULL
map->magic[i] = pointer to allocated memory

On big endian (ppc64, s390x, ...):
map->p != php_magic_database and map->p != NULL
        map->magic[i] = pointer into a copy of the map

Trying to efree pointer in the later cause memory corruption
Thanks to dkatulek / Red Hat for the report.

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Anatol Belski [Thu, 27 Mar 2014 17:20:17 +0000 (18:20 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  update lib versions

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Anatol Belski [Thu, 27 Mar 2014 17:19:43 +0000 (18:19 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update lib versions

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Anatol Belski [Thu, 27 Mar 2014 17:19:24 +0000 (18:19 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  update lib versions

Conflicts:
win32/build/libs_version.txt

11 years agoupdate lib versions
commit | commitdiff | tree
Anatol Belski [Thu, 27 Mar 2014 17:18:06 +0000 (18:18 +0100)]
update lib versions

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Yasuo Ohgaki [Thu, 27 Mar 2014 08:21:23 +0000 (17:21 +0900)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Remove unneeded string copy. Allow to set ''(empty string values) internal/input/output_encoding for better compatibility. i.e. Runtime INI value changes. More compliance to the RFC. Improve/add encoding handling tests. i.e. Rather than set encoding automagic way, detect it.

11 years agoRemove unneeded string copy.
commit | commitdiff | tree
Yasuo Ohgaki [Mon, 24 Mar 2014 02:04:35 +0000 (11:04 +0900)]
Remove unneeded string copy.
Allow to set ''(empty string values) internal/input/output_encoding for better compatibility. i.e. Runtime INI value changes.
More compliance to the RFC. Improve/add encoding handling tests. i.e. Rather than set encoding automagic way, detect it.

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Andrey Hristov [Wed, 26 Mar 2014 13:40:54 +0000 (15:40 +0200)]
Merge branch 'PHP-5.6'

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Andrey Hristov [Wed, 26 Mar 2014 12:27:25 +0000 (14:27 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
commit | commitdiff | tree
Andrey Hristov [Wed, 26 Mar 2014 11:57:13 +0000 (13:57 +0200)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

11 years agoFix test
commit | commitdiff | tree
Andrey Hristov [Wed, 26 Mar 2014 11:56:58 +0000 (13:56 +0200)]
Fix test

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Derick Rethans [Tue, 25 Mar 2014 12:17:22 +0000 (12:17 +0000)]
Merge branch 'PHP-5.6'

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Derick Rethans [Tue, 25 Mar 2014 12:17:19 +0000 (12:17 +0000)]
Merge branch 'PHP-5.5' into PHP-5.6

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Derick Rethans [Tue, 25 Mar 2014 12:17:15 +0000 (12:17 +0000)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years ago- Updated to version 2014.2 (2014b)
commit | commitdiff | tree
Derick Rethans [Tue, 25 Mar 2014 12:17:14 +0000 (12:17 +0000)]
- Updated to version 2014.2 (2014b)

11 years agofix merge issue
commit | commitdiff | tree
Remi Collet [Tue, 25 Mar 2014 11:06:18 +0000 (12:06 +0100)]
fix merge issue

11 years agofix merge issue
commit | commitdiff | tree
Remi Collet [Tue, 25 Mar 2014 11:06:18 +0000 (12:06 +0100)]
fix merge issue

11 years agoAdded TSRMLS_CC to zend_is_true() calls
commit | commitdiff | tree
Tjerk Meesters [Tue, 25 Mar 2014 11:05:43 +0000 (19:05 +0800)]
Added TSRMLS_CC to zend_is_true() calls

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Tjerk Meesters [Tue, 25 Mar 2014 10:19:42 +0000 (18:19 +0800)]
Merge branch 'PHP-5.6'

11 years agoUpdated NEWS for #66834
commit | commitdiff | tree
Tjerk Meesters [Tue, 25 Mar 2014 10:16:30 +0000 (18:16 +0800)]
Updated NEWS for #66834

11 years agoCall offsetGet() when called with isset() on ArrayObject derivatives
commit | commitdiff | tree
Tjerk Meesters [Tue, 25 Mar 2014 10:15:18 +0000 (18:15 +0800)]
Call offsetGet() when called with isset() on ArrayObject derivatives

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Remi Collet [Tue, 25 Mar 2014 10:05:11 +0000 (11:05 +0100)]
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

11 years agoNEWS
commit | commitdiff | tree
Remi Collet [Tue, 25 Mar 2014 10:04:49 +0000 (11:04 +0100)]
NEWS

11 years agoFix merge (5.6 already have file 5.17)
commit | commitdiff | tree
Remi Collet [Tue, 25 Mar 2014 10:03:59 +0000 (11:03 +0100)]
Fix merge (5.6 already have file 5.17)

11 years agoNEWS
commit | commitdiff | tree
Remi Collet [Tue, 25 Mar 2014 10:01:56 +0000 (11:01 +0100)]
NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Remi Collet [Tue, 25 Mar 2014 10:01:20 +0000 (11:01 +0100)]
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

11 years agoNEWS
commit | commitdiff | tree
Remi Collet [Tue, 25 Mar 2014 10:00:47 +0000 (11:00 +0100)]
NEWS

11 years agoFixed bug #66946 extensive backtracking in awk rule regular expression
commit | commitdiff | tree
Remi Collet [Tue, 25 Mar 2014 10:00:33 +0000 (11:00 +0100)]
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.

11 years agoFixed bug #66946 extensive backtracking in awk rule regular expression
commit | commitdiff | tree
Remi Collet [Tue, 25 Mar 2014 09:58:50 +0000 (10:58 +0100)]
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.

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Anatol Belski [Tue, 25 Mar 2014 05:46:25 +0000 (06:46 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix disabling PGO for extensions, rel bug #65715

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Anatol Belski [Tue, 25 Mar 2014 05:46:06 +0000 (06:46 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix disabling PGO for extensions, rel bug #65715

11 years agofix disabling PGO for extensions, rel bug #65715
commit | commitdiff | tree
Anatol Belski [Tue, 25 Mar 2014 05:44:54 +0000 (06:44 +0100)]
fix disabling PGO for extensions, rel bug #65715

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Anatol Belski [Mon, 24 Mar 2014 18:19:24 +0000 (19:19 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  more fixes related to bug #65715

next
Unnamed repository; edit this file 'description' to name the repository.