granicus.if.org Git

]> granicus.if.org Git - php/log

Nikita Popov [Wed, 9 Apr 2014 09:20:55 +0000 (11:20 +0200)]

Add only_integer_keys option to zend_hash_reindex

This allows to either do a full reindex, or only reindex the integer
keys.

commit | commitdiff | tree

Nikita Popov [Wed, 9 Apr 2014 08:39:22 +0000 (10:39 +0200)]

Don't always separate splice replacement array

Only perform separation when a typecast is done. Avoids doing a
full hash copy in many cases.

commit | commitdiff | tree

Nikita Popov [Tue, 8 Apr 2014 21:24:52 +0000 (23:24 +0200)]

Add zend_hash_splice

This implements the original functionality of php_splice, but
as an in-place operation, thus avoiding copying the HT.

This is much faster (~10x) if the splice removes a small portion
of the array and doesn't insert many elements.

commit | commitdiff | tree

Nikita Popov [Tue, 8 Apr 2014 09:17:17 +0000 (11:17 +0200)]

Add zend_hash_reindex

The implementation differs from the original in array.c in that it
rehashes the hashtable in the same loop. This is approximately two
times faster (not counting the rare case of a purely associative
array).

commit | commitdiff | tree

Nikita Popov [Mon, 7 Apr 2014 18:46:45 +0000 (20:46 +0200)]

Remove some usages of hashtable internals

commit | commitdiff | tree

Etienne Kneuss [Wed, 9 Apr 2014 09:36:36 +0000 (11:36 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Etienne Kneuss [Wed, 9 Apr 2014 09:28:49 +0000 (11:28 +0200)]

Updated NEWS

commit | commitdiff | tree

Joshua Thijssen [Wed, 12 Feb 2014 20:28:20 +0000 (21:28 +0100)]

fixed bug66702 : regexiterator's invert flag doesn't work as expected

commit | commitdiff | tree

Tjerk Meesters [Tue, 8 Apr 2014 23:36:34 +0000 (07:36 +0800)]

Updated NEWS for #67043

commit | commitdiff | tree

Tjerk Meesters [Tue, 8 Apr 2014 23:34:49 +0000 (07:34 +0800)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Tjerk Meesters [Tue, 8 Apr 2014 23:33:55 +0000 (07:33 +0800)]

Fixed bug 67043

commit | commitdiff | tree

Popa Adrian Marius [Tue, 8 Apr 2014 14:52:22 +0000 (17:52 +0300)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
cleanup
Fixes bug #66071: isc_interprete is unsafe and deprecated , it is replaced with fb_iterpret

commit | commitdiff | tree

Popa Adrian Marius [Tue, 8 Apr 2014 14:51:54 +0000 (17:51 +0300)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
cleanup
Fixes bug #66071: isc_interprete is unsafe and deprecated , it is replaced with fb_iterpret

commit | commitdiff | tree

Popa Adrian Marius [Tue, 8 Apr 2014 12:29:32 +0000 (15:29 +0300)]

cleanup

commit | commitdiff | tree

Popa Adrian Marius [Tue, 8 Apr 2014 11:11:58 +0000 (14:11 +0300)]

Fixes bug #66071: isc_interprete is unsafe and deprecated , it is replaced with fb_iterpret

commit | commitdiff | tree

Anatol Belski [Tue, 8 Apr 2014 09:43:32 +0000 (11:43 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
updated libs versions

commit | commitdiff | tree

Anatol Belski [Tue, 8 Apr 2014 09:42:58 +0000 (11:42 +0200)]

updated libs versions

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

commit | commitdiff | tree

Anatol Belski [Mon, 7 Apr 2014 15:40:56 +0000 (17:40 +0200)]

fixed the test for ICI >= 52.1

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...

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

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

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

commit | commitdiff | tree

Stanislav Malyshev [Sun, 6 Apr 2014 02:30:13 +0000 (19:30 -0700)]

fix to work on different ICU versions

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

commit | commitdiff | tree

Anatol Belski [Sat, 5 Apr 2014 07:49:51 +0000 (09:49 +0200)]

updated NEWS

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

commit | commitdiff | tree

Anatol Belski [Sat, 5 Apr 2014 07:48:20 +0000 (09:48 +0200)]

updated NEWS

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

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

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

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

commit | commitdiff | tree

Stanislav Malyshev [Thu, 3 Apr 2014 22:53:43 +0000 (15:53 -0700)]

cleanup NEWS

commit | commitdiff | tree

Michael Wallner [Thu, 3 Apr 2014 08:41:45 +0000 (10:41 +0200)]

NEWS

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

commit | commitdiff | tree

Michael Wallner [Thu, 3 Apr 2014 08:40:42 +0000 (10:40 +0200)]

NEWS

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

commit | commitdiff | tree

Michael Wallner [Thu, 3 Apr 2014 08:40:06 +0000 (10:40 +0200)]

Fix Bug #66736 fpassthru broken

commit | commitdiff | tree

Michael Wallner [Thu, 3 Apr 2014 07:09:51 +0000 (09:09 +0200)]

NEWS

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

commit | commitdiff | tree

Michael Wallner [Thu, 3 Apr 2014 07:09:15 +0000 (09:09 +0200)]

NEWS

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

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.

commit | commitdiff | tree

Michael Wallner [Wed, 2 Apr 2014 13:39:07 +0000 (15:39 +0200)]

NEWS

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)

commit | commitdiff | tree

Michael Wallner [Wed, 2 Apr 2014 13:38:22 +0000 (15:38 +0200)]

NEWS

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)

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)

commit | commitdiff | tree

Michael Wallner [Wed, 2 Apr 2014 09:14:34 +0000 (11:14 +0200)]

NEWS

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

commit | commitdiff | tree

Michael Wallner [Wed, 2 Apr 2014 09:13:21 +0000 (11:13 +0200)]

NEWS

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

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

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

commit | commitdiff | tree

Anatol Belski [Tue, 1 Apr 2014 08:14:38 +0000 (10:14 +0200)]

update NEWS

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://"

commit | commitdiff | tree

Anatol Belski [Tue, 1 Apr 2014 08:12:56 +0000 (10:12 +0200)]

updated NEWS

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://"

commit | commitdiff | tree

Anatol Belski [Tue, 1 Apr 2014 08:11:40 +0000 (10:11 +0200)]

updated NEWS

commit | commitdiff | tree

Anatol Belski [Tue, 1 Apr 2014 08:08:08 +0000 (10:08 +0200)]

added test for bug #53965

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://"

commit | commitdiff | tree

Anatol Belski [Mon, 31 Mar 2014 15:24:15 +0000 (17:24 +0200)]

updated libmagic.patch

commit | commitdiff | tree

Remi Collet [Mon, 31 Mar 2014 14:58:10 +0000 (16:58 +0200)]

NEWS

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)

commit | commitdiff | tree

Remi Collet [Mon, 31 Mar 2014 14:57:29 +0000 (16:57 +0200)]

NEWS

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)

commit | commitdiff | tree

Remi Collet [Mon, 31 Mar 2014 14:57:02 +0000 (16:57 +0200)]

NEWS

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.

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

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

commit | commitdiff | tree

Anatol Belski [Thu, 27 Mar 2014 17:18:06 +0000 (18:18 +0100)]

update lib versions

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.

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

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

commit | commitdiff | tree

Andrey Hristov [Wed, 26 Mar 2014 11:56:58 +0000 (13:56 +0200)]

Fix test

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

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

commit | commitdiff | tree

Derick Rethans [Tue, 25 Mar 2014 12:17:14 +0000 (12:17 +0000)]

- Updated to version 2014.2 (2014b)

commit | commitdiff | tree

Remi Collet [Tue, 25 Mar 2014 11:06:18 +0000 (12:06 +0100)]

fix merge issue

commit | commitdiff | tree

Tjerk Meesters [Tue, 25 Mar 2014 10:16:30 +0000 (18:16 +0800)]

Updated NEWS for #66834

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

commit | commitdiff | tree

Remi Collet [Tue, 25 Mar 2014 10:04:49 +0000 (11:04 +0100)]

NEWS

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)

commit | commitdiff | tree

Remi Collet [Tue, 25 Mar 2014 10:01:56 +0000 (11:01 +0100)]

NEWS

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

commit | commitdiff | tree

Remi Collet [Tue, 25 Mar 2014 10:00:47 +0000 (11:00 +0100)]

NEWS

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.

commit | commitdiff | tree

Remi Collet [Tue, 25 Mar 2014 09:58:50 +0000 (10:58 +0100)]