granicus.if.org Git

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

projects / php / log

commit | commitdiff | tree

Tjerk Meesters [Fri, 18 Apr 2014 00:29:32 +0000 (08:29 +0800)]

Fixed test case for 5328d42

commit | commitdiff | tree

Bob Weinand [Thu, 17 Apr 2014 15:21:21 +0000 (17:21 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Levi Morrison [Thu, 17 Apr 2014 14:46:38 +0000 (08:46 -0600)]

These links to ~helly don't work anymore.

commit | commitdiff | tree

Anatol Belski [Thu, 17 Apr 2014 09:06:55 +0000 (11:06 +0200)]

updated NEWS

commit | commitdiff | tree

Anatol Belski [Thu, 17 Apr 2014 09:05:21 +0000 (11:05 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed bug #67072 Echoing unserialized "SplFileObject" crash

Conflicts:
ext/standard/var_unserializer.c

commit | commitdiff | tree

Anatol Belski [Thu, 17 Apr 2014 08:48:14 +0000 (10:48 +0200)]

Fixed bug #67072 Echoing unserialized "SplFileObject" crash

The actual issue lays in the unserializer code which doesn't honor
the unserialize callback. By contrast, the serialize callback is
respected. This leads to the situation that even if a class has
disabled the serialization explicitly, user could still construct
a vulnerable string which would result bad things when trying
to unserialize.

This conserns also the classes implementing Serializable as well
as some core classes disabling serialize/unserialize callbacks
explicitly (PDO, SimpleXML, SplFileInfo and co). As of now, the
flow is first to call the unserialize callback (if available),
then call __wakeup. If the unserialize callback returns with no
success, no object is instantiated. This makes the scheme used
by internal classes effective, to disable unserialize just assign
zend_class_unserialize_deny as callback.

commit | commitdiff | tree

Anatol Belski [Wed, 16 Apr 2014 18:47:17 +0000 (20:47 +0200)]

updated UPGRADING

commit | commitdiff | tree

Anatol Belski [Wed, 16 Apr 2014 13:08:08 +0000 (15:08 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
correct the bug #67081 fix

commit | commitdiff | tree

Anatol Belski [Wed, 16 Apr 2014 13:06:57 +0000 (15:06 +0200)]

correct the bug #67081 fix

commit | commitdiff | tree

Anatol Belski [Wed, 16 Apr 2014 12:15:26 +0000 (14:15 +0200)]

updated NEWS

commit | commitdiff | tree

Anatol Belski [Wed, 16 Apr 2014 12:14:52 +0000 (14:14 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed bug #67081 DOMDocumentType->internalSubset returns entire DOCTYPE tag, not only the subset

commit | commitdiff | tree

Anatol Belski [Wed, 16 Apr 2014 12:13:45 +0000 (14:13 +0200)]

Fixed bug #67081 DOMDocumentType->internalSubset returns entire DOCTYPE tag, not only the subset

commit | commitdiff | tree

Anatol Belski [Wed, 16 Apr 2014 07:47:49 +0000 (09:47 +0200)]

Fixed bug #67079 Missing MIME types for XML/XSL files

commit | commitdiff | tree

Stanislav Malyshev [Wed, 16 Apr 2014 00:15:21 +0000 (17:15 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
5.4.29 is next

Conflicts:
configure.in
main/php_version.h

commit | commitdiff | tree

Stanislav Malyshev [Tue, 15 Apr 2014 23:51:38 +0000 (16:51 -0700)]

5.4.29 is next

commit | commitdiff | tree

Julien Pauli [Tue, 15 Apr 2014 15:57:27 +0000 (17:57 +0200)]

5.5.12RC1 setup

commit | commitdiff | tree

Stanislav Malyshev [Mon, 14 Apr 2014 22:45:53 +0000 (15:45 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix test - on CI somebody could create a process in the meantime

commit | commitdiff | tree

Stanislav Malyshev [Mon, 14 Apr 2014 22:43:32 +0000 (15:43 -0700)]

Fix test - on CI somebody could create a process in the meantime

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

commit | commitdiff | tree

Anatol Belski [Mon, 14 Apr 2014 21:29:38 +0000 (23:29 +0200)]

fix windows build

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

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

commit | commitdiff | tree

Stanislav Malyshev [Mon, 14 Apr 2014 20:16:53 +0000 (13:16 -0700)]

ws fix

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

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

commit | commitdiff | tree

Stanislav Malyshev [Mon, 14 Apr 2014 03:43:46 +0000 (20:43 -0700)]

Fix null byte in LDAP bindings

commit | commitdiff | tree

Stanislav Malyshev [Mon, 14 Apr 2014 03:31:20 +0000 (20:31 -0700)]

Fix bug #66171: better handling of symlinks

commit | commitdiff | tree

Stanislav Malyshev [Mon, 14 Apr 2014 03:43:46 +0000 (20:43 -0700)]

Fix null byte in LDAP bindings

commit | commitdiff | tree

Stanislav Malyshev [Mon, 14 Apr 2014 03:31:20 +0000 (20:31 -0700)]

Fix bug #66171: better handling of symlinks

commit | commitdiff | tree

Andrey Hristov [Mon, 14 Apr 2014 14:35:01 +0000 (17:35 +0300)]

Add test

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

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

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

commit | commitdiff | tree

Anatol Belski [Mon, 14 Apr 2014 07:32:31 +0000 (09:32 +0200)]

Fixed bug #67033 Remove reference to Windows 95

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

commit | commitdiff | tree

Stanislav Malyshev [Mon, 14 Apr 2014 03:16:27 +0000 (20:16 -0700)]

fix NEWS

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)

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)

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

commit | commitdiff | tree

Ingo Walz [Sat, 23 Nov 2013 01:31:23 +0000 (02:31 +0100)]

Fixed bug #64604

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

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

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

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

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

commit | commitdiff | tree

Stanislav Malyshev [Mon, 14 Apr 2014 00:02:21 +0000 (17:02 -0700)]

Fix windows build

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

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

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

commit | commitdiff | tree

Jeff Trawick [Sun, 13 Apr 2014 20:37:16 +0000 (16:37 -0400)]

fix apr_psprintf format string from e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cce

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

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

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

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

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

commit | commitdiff | tree

Bob Weinand [Sun, 13 Apr 2014 17:34:17 +0000 (19:34 +0200)]

Forgot title in phpt for bug #67064

commit | commitdiff | tree

Bob Weinand [Sun, 13 Apr 2014 17:32:51 +0000 (19:32 +0200)]

Updated NEWS

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

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

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

commit | commitdiff | tree

Ferenc Kovacs [Sat, 12 Apr 2014 23:55:55 +0000 (01:55 +0200)]

fix typo

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

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

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

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

commit | commitdiff | tree

Popa Adrian Marius [Thu, 10 Apr 2014 14:42:32 +0000 (17:42 +0300)]

Cleanup $ is not needed for git

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

commit | commitdiff | tree

Ferenc Kovacs [Thu, 10 Apr 2014 05:05:55 +0000 (07:05 +0200)]

fix typo

commit | commitdiff | tree

Ferenc Kovacs [Thu, 10 Apr 2014 05:05:07 +0000 (07:05 +0200)]

fix typo

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

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

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

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:33:55 +0000 (07:33 +0800)]

Fixed bug 67043

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:42:58 +0000 (11:42 +0200)]

updated libs versions

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

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

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: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: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: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: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:13:21 +0000 (11:13 +0200)]

NEWS

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:12:56 +0000 (10:12 +0200)]

updated NEWS

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

RSS Atom