]> granicus.if.org Git - php/log
projects / php / log
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
php
10 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Anatol Belski [Mon, 14 Apr 2014 21:30:14 +0000 (23:30 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix windows build

10 years agofix windows build
commit | commitdiff | tree
Anatol Belski [Mon, 14 Apr 2014 21:29:38 +0000 (23:29 +0200)]
fix windows build

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 20:35:00 +0000 (13:35 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix #66942: openssl_seal() memory leak
  ws fix

Conflicts:
ext/openssl/openssl.c

10 years agoFix #66942: openssl_seal() memory leak
commit | commitdiff | tree
Chuan Ma [Tue, 25 Mar 2014 03:24:41 +0000 (23:24 -0400)]
Fix #66942: openssl_seal() memory leak

Fix #66952: memory leak in openssl_open()

10 years agows fix
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 20:16:53 +0000 (13:16 -0700)]
ws fix

10 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
commit | commitdiff | tree
Andrey Hristov [Mon, 14 Apr 2014 20:11:29 +0000 (23:11 +0300)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 17:46:52 +0000 (10:46 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix null byte in LDAP bindings
  Fix bug #66171: better handling of symlinks

10 years agoFix null byte in LDAP bindings
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 03:43:46 +0000 (20:43 -0700)]
Fix null byte in LDAP bindings

10 years agoFix bug #66171: better handling of symlinks
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 03:31:20 +0000 (20:31 -0700)]
Fix bug #66171: better handling of symlinks

10 years agoFix null byte in LDAP bindings
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 03:43:46 +0000 (20:43 -0700)]
Fix null byte in LDAP bindings

10 years agoFix bug #66171: better handling of symlinks
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 03:31:20 +0000 (20:31 -0700)]
Fix bug #66171: better handling of symlinks

10 years agoAdd test
commit | commitdiff | tree
Andrey Hristov [Mon, 14 Apr 2014 14:35:01 +0000 (17:35 +0300)]
Add test

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Anatol Belski [Mon, 14 Apr 2014 14:34:08 +0000 (16:34 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  backported some ext/intl tests from 5.6 into 5.4

Conflicts:
ext/intl/tests/collator_get_sort_key_variant2.phpt
ext/intl/tests/locale_get_display_name3.phpt

10 years agobackported some ext/intl tests from 5.6 into 5.4
commit | commitdiff | tree
Anatol Belski [Mon, 14 Apr 2014 14:31:18 +0000 (16:31 +0200)]
backported some ext/intl tests from 5.6 into 5.4

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Anatol Belski [Mon, 14 Apr 2014 07:33:31 +0000 (09:33 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #67033 Remove reference to Windows 95

10 years agoFixed bug #67033 Remove reference to Windows 95
commit | commitdiff | tree
Anatol Belski [Mon, 14 Apr 2014 07:32:31 +0000 (09:32 +0200)]
Fixed bug #67033 Remove reference to Windows 95

10 years agoMErge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 03:16:54 +0000 (20:16 -0700)]
MErge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix NEWS

10 years agofix NEWS
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 03:16:27 +0000 (20:16 -0700)]
fix NEWS

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 01:54:54 +0000 (18:54 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix #66021 (Blank line inside empty array/object)

10 years agoMerge branch 'pull-request/518' into PHP-5.4
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 01:50:39 +0000 (18:50 -0700)]
Merge branch 'pull-request/518' into PHP-5.4

* pull-request/518:
  Fix #66021 (Blank line inside empty array/object)

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 01:38:12 +0000 (18:38 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #64604

10 years agoFixed bug #64604
commit | commitdiff | tree
Ingo Walz [Sat, 23 Nov 2013 01:31:23 +0000 (02:31 +0100)]
Fixed bug #64604

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 01:12:40 +0000 (18:12 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix #66562: Consistency bug where curl_multi_getcontent behaves different from curl_exec

10 years agoFix #66562: Consistency bug where curl_multi_getcontent behaves different from curl_exec
commit | commitdiff | tree
Freek [Tue, 28 Jan 2014 10:47:14 +0000 (11:47 +0100)]
Fix #66562: Consistency bug where curl_multi_getcontent behaves different from curl_exec

curl_exec returns an empty string when data is received from a domain that returns zero content. curl_multi_getcontent
returned null. Now it returns an empty string fixing the incosistency

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 00:31:14 +0000 (17:31 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #66482, replace wrong item name 'priority' with 'process.priority' in php-fpm.conf

10 years agoFix bug #66482, replace wrong item name 'priority' with 'process.priority' in php...
commit | commitdiff | tree
itxx00 [Thu, 16 Jan 2014 08:34:39 +0000 (16:34 +0800)]
Fix bug #66482, replace wrong item name 'priority' with 'process.priority' in php-fpm.conf

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 00:03:28 +0000 (17:03 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix windows build

10 years agoFix windows build
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 00:02:21 +0000 (17:02 -0700)]
Fix windows build

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Sun, 13 Apr 2014 22:54:26 +0000 (15:54 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #66721

10 years agoFix bug #66721
commit | commitdiff | tree
Boro Sitnikovski [Mon, 17 Feb 2014 00:07:52 +0000 (01:07 +0100)]
Fix bug #66721

Add NULL check to php_date_parse_tzfile's retval

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Sun, 13 Apr 2014 22:37:19 +0000 (15:37 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix apr_psprintf format string from e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cce

10 years agofix apr_psprintf format string from e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cce
commit | commitdiff | tree
Jeff Trawick [Sun, 13 Apr 2014 20:37:16 +0000 (16:37 -0400)]
fix apr_psprintf format string from e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cce

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Sun, 13 Apr 2014 22:22:21 +0000 (15:22 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #67024 - getimagesize should recognize BMP files with negative height

10 years agoFixed bug #67024 - getimagesize should recognize BMP files with negative height
commit | commitdiff | tree
Gabor Buella [Fri, 4 Apr 2014 22:17:25 +0000 (00:17 +0200)]
Fixed bug #67024 - getimagesize should recognize BMP files with negative height

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Bob Weinand [Sun, 13 Apr 2014 21:03:53 +0000 (23:03 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

10 years agoReverted to 5a0da281e5a9fa02db18b4822d8b103c65849fa9
commit | commitdiff | tree
Bob Weinand [Sun, 13 Apr 2014 21:01:31 +0000 (23:01 +0200)]
Reverted to 5a0da281e5a9fa02db18b4822d8b103c65849fa9
Discussion: http://news.php.net/php.cvs/76836

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Bob Weinand [Sun, 13 Apr 2014 17:37:06 +0000 (19:37 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

10 years agoForgot title in phpt for bug #67064
commit | commitdiff | tree
Bob Weinand [Sun, 13 Apr 2014 17:34:17 +0000 (19:34 +0200)]
Forgot title in phpt for bug #67064

10 years agoUpdated NEWS
commit | commitdiff | tree
Bob Weinand [Sun, 13 Apr 2014 17:32:51 +0000 (19:32 +0200)]
Updated NEWS

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Bob Weinand [Sun, 13 Apr 2014 17:25:07 +0000 (19:25 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

10 years agoFix bug #67064 in a BC safe way
commit | commitdiff | tree
Bob Weinand [Sun, 13 Apr 2014 17:19:24 +0000 (19:19 +0200)]
Fix bug #67064 in a BC safe way
You can use an optional parameter now when implementing the Countable interface
to get the $mode passed to count().

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Ferenc Kovacs [Sat, 12 Apr 2014 23:56:47 +0000 (01:56 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix typo

10 years agofix typo
commit | commitdiff | tree
Ferenc Kovacs [Sat, 12 Apr 2014 23:55:55 +0000 (01:55 +0200)]
fix typo

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Bob Weinand [Sat, 12 Apr 2014 21:54:29 +0000 (23:54 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

10 years agoMade usage of php_hash_environment useful by updating instead of just adding argc
commit | commitdiff | tree
Bob Weinand [Sat, 12 Apr 2014 21:50:47 +0000 (23:50 +0200)]
Made usage of php_hash_environment useful by updating instead of just adding argc

10 years agoFixed bug #66967 Updated the bundled libsqlite to 3.8.4.3
commit | commitdiff | tree
Anatol Belski [Fri, 11 Apr 2014 09:00:10 +0000 (11:00 +0200)]
Fixed bug #66967 Updated the bundled libsqlite to 3.8.4.3

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Popa Adrian Marius [Thu, 10 Apr 2014 14:43:09 +0000 (17:43 +0300)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Cleanup $ is not needed for git

10 years agoCleanup $ is not needed for git
commit | commitdiff | tree
Popa Adrian Marius [Thu, 10 Apr 2014 14:42:32 +0000 (17:42 +0300)]
Cleanup $ is not needed for git

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Ferenc Kovacs [Thu, 10 Apr 2014 05:06:14 +0000 (07:06 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix typo

10 years agofix typo
commit | commitdiff | tree
Ferenc Kovacs [Thu, 10 Apr 2014 05:05:55 +0000 (07:05 +0200)]
fix typo

10 years agofix typo
commit | commitdiff | tree
Ferenc Kovacs [Thu, 10 Apr 2014 05:05:07 +0000 (07:05 +0200)]
fix typo

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Ferenc Kovacs [Wed, 9 Apr 2014 17:02:25 +0000 (19:02 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  abstract namespace for unix sockets is a linux only feature

10 years agoabstract namespace for unix sockets is a linux only feature
commit | commitdiff | tree
Ferenc Kovacs [Wed, 9 Apr 2014 17:01:01 +0000 (19:01 +0200)]
abstract namespace for unix sockets is a linux only feature

10 years agoDon't test for specific non-zero substr_compare() return value
commit | commitdiff | tree
Tjerk Meesters [Wed, 9 Apr 2014 12:10:34 +0000 (20:10 +0800)]
Don't test for specific non-zero substr_compare() return value

10 years agoUpdated NEWS
commit | commitdiff | tree
Etienne Kneuss [Wed, 9 Apr 2014 09:28:49 +0000 (11:28 +0200)]
Updated NEWS

10 years agofixed bug66702 : regexiterator's invert flag doesn't work as expected
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

10 years agoFixed bug 67043
commit | commitdiff | tree
Tjerk Meesters [Tue, 8 Apr 2014 23:33:55 +0000 (07:33 +0800)]
Fixed bug 67043

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

10 years agocleanup
commit | commitdiff | tree
Popa Adrian Marius [Tue, 8 Apr 2014 12:29:32 +0000 (15:29 +0300)]
cleanup

10 years agoFixes bug #66071: isc_interprete is unsafe and deprecated , it is replaced with fb_it...
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

10 years agoupdated libs versions
commit | commitdiff | tree
Anatol Belski [Tue, 8 Apr 2014 09:42:58 +0000 (11:42 +0200)]
updated libs versions

10 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

10 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

10 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

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

10 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

10 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

10 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

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

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

10 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

10 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

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

10 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

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

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

10 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)

10 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)

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

10 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

10 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

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

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

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

10 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

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

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

10 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)

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

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

10 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

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

10 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

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

10 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

10 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)

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

10 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

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

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

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