]> granicus.if.org Git - php/log
php
11 years agoBFN
Michael Wallner [Mon, 2 Dec 2013 11:14:26 +0000 (12:14 +0100)]
BFN

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Michael Wallner [Mon, 2 Dec 2013 11:10:59 +0000 (12:10 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix bug #49634x

11 years agofix bug #49634x
Michael Wallner [Mon, 2 Dec 2013 11:08:22 +0000 (12:08 +0100)]
fix bug #49634x

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Dmitry Stogov [Mon, 2 Dec 2013 08:04:07 +0000 (12:04 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed tests

11 years agoFixed tests
Dmitry Stogov [Mon, 2 Dec 2013 07:53:35 +0000 (11:53 +0400)]
Fixed tests

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Dmitry Stogov [Mon, 2 Dec 2013 07:02:40 +0000 (11:02 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed ability to build non-specialized GOTO VM

Conflicts:
Zend/zend_vm_gen.php

11 years agoFixed ability to build non-specialized GOTO VM
Dmitry Stogov [Mon, 2 Dec 2013 06:59:32 +0000 (10:59 +0400)]
Fixed ability to build non-specialized GOTO VM

11 years agoFix bug #65764
Nikita Popov [Sun, 1 Dec 2013 12:37:56 +0000 (13:37 +0100)]
Fix bug #65764

I'm not exactly sure whether this is the right way to fix it. The
question is whether Generator::throw() on a newborn generator (i.e.
a generator that is not yet at yield expression) should first advance to
the first yield and throw the exception there or whether it should
instead throw the exception in the caller's context.

The old behavior was to throw it at the start of the function (i.e.
the very first opcode), which causes issues like the one in #65764.
Effectively it's impossible to properly handle the exceptions in this
case.

For now I choose the variant where the generator advances to the
first yield before throwing, as that's consistent with how all other
methods on the Generator object currently behave. This does not
necessarily match the behavior in other languages, e.g. Python would throw
the exception in the caller's context. But then our send() method already
has this kind of deviation, so it stays internally consistent at least.

11 years ago- BFN
Felipe Pena [Sat, 30 Nov 2013 14:05:51 +0000 (12:05 -0200)]
- BFN

11 years agoMerge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5
Felipe Pena [Sat, 30 Nov 2013 13:44:08 +0000 (11:44 -0200)]
Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5

11 years ago- Fixed bug #65923 (ext/socket assumes AI_V4MAPPED is defined)
Felipe Pena [Sat, 30 Nov 2013 13:39:57 +0000 (11:39 -0200)]
- Fixed bug #65923 (ext/socket assumes AI_V4MAPPED is defined)

11 years agoCleanup generator closing code a bit
Nikita Popov [Sat, 30 Nov 2013 12:35:33 +0000 (13:35 +0100)]
Cleanup generator closing code a bit

All code dealing with unfinished execution cleanup is now in a separate
function (previously most of it was run even when execution was properly
finished.

Furthermore some code dealing with unclean shutdowns has been removed,
which is no longer necessary, because we no longer try to clean up in
this case.

11 years agoFixed bug #66041: list() fails to unpack yielded ArrayAccess object
Nikita Popov [Sat, 30 Nov 2013 12:05:40 +0000 (13:05 +0100)]
Fixed bug #66041: list() fails to unpack yielded ArrayAccess object

Yield return values now use IS_VAR rather than IS_TMP_VAR. This
fixes the issue with list() and should also be faster as it avoids
doing a zval copy.

11 years agoFixed bug #65768: DateTimeImmutable::diff does not work
nikita2206 [Tue, 29 Oct 2013 15:40:17 +0000 (19:40 +0400)]
Fixed bug #65768: DateTimeImmutable::diff does not work

This commit also prevents user classes from directly implementing
DateTimeInterface, because ext/date relies on classes implementing
it to support certain internal structures.

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Dmitry Stogov [Fri, 29 Nov 2013 08:54:22 +0000 (12:54 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Added validation of class names in the autoload process

11 years agoAdded validation of class names in the autoload process
Dmitry Stogov [Fri, 29 Nov 2013 08:53:02 +0000 (12:53 +0400)]
Added validation of class names in the autoload process

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Derick Rethans [Thu, 28 Nov 2013 16:33:08 +0000 (16:33 +0000)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoFixed bug #65199 (Wrong Day of Week) and fixed bug #63391 (Incorrect/inconsistent...
Derick Rethans [Thu, 28 Nov 2013 16:32:11 +0000 (16:32 +0000)]
Fixed bug #65199 (Wrong Day of Week) and fixed bug #63391 (Incorrect/inconsistent day of week prior to the year 1600)

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Derick Rethans [Thu, 28 Nov 2013 14:30:08 +0000 (14:30 +0000)]
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
ext/date/php_date.c

11 years agoMerge branch 'date-time-dst-rfc' into PHP-5.4
Derick Rethans [Thu, 28 Nov 2013 14:26:01 +0000 (14:26 +0000)]
Merge branch 'date-time-dst-rfc' into PHP-5.4

This is a partial resolve of some DST issues, plenty of things to do, but as
this *does* fix a few issues it's worth merging it already.

11 years agoMarking those two as XFAIL for now.
Derick Rethans [Thu, 28 Nov 2013 14:24:39 +0000 (14:24 +0000)]
Marking those two as XFAIL for now.

11 years agoFixed a few DST changeover issues.
Derick Rethans [Thu, 20 Jun 2013 08:28:23 +0000 (09:28 +0100)]
Fixed a few DST changeover issues.

11 years agoMove add/sub to timelib.
Derick Rethans [Tue, 16 Apr 2013 15:31:10 +0000 (16:31 +0100)]
Move add/sub to timelib.

11 years agoFix backwards transition diffs.
Derick Rethans [Sat, 13 Apr 2013 22:47:23 +0000 (23:47 +0100)]
Fix backwards transition diffs.

11 years agoSplit up tests into their different categories.
Derick Rethans [Sat, 13 Apr 2013 22:28:59 +0000 (23:28 +0100)]
Split up tests into their different categories.

11 years agoGroup those tests a bit better, as some of the bd ones wanted a "ST" feature that...
Derick Rethans [Sat, 13 Apr 2013 17:45:51 +0000 (18:45 +0100)]
Group those tests a bit better, as some of the bd ones wanted a "ST" feature that doesn't exist yet.

11 years agoFixed forward transitions in diffs.
Derick Rethans [Fri, 12 Apr 2013 10:24:14 +0000 (11:24 +0100)]
Fixed forward transitions in diffs.

11 years agoAlways reset those parameters.
Derick Rethans [Fri, 12 Apr 2013 10:23:49 +0000 (11:23 +0100)]
Always reset those parameters.

11 years agoFixed "Forward Transition" construction of DateTime objects.
Derick Rethans [Sun, 31 Mar 2013 17:11:35 +0000 (18:11 +0100)]
Fixed "Forward Transition" construction of DateTime objects.

This fixes the issue in
https://wiki.php.net/rfc/datetime_and_daylight_saving_time#forward_transitions
There is a period during transition to DST where a time (such as 02:30) does
not exist. PHP already calculated the correct timestamp for this, but failed to
"rounded forward" to the existing correct hour value.

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Derick Rethans [Wed, 27 Nov 2013 22:01:03 +0000 (22:01 +0000)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoMerge branch 'bug53879' into PHP-5.4
Derick Rethans [Wed, 27 Nov 2013 22:00:53 +0000 (22:00 +0000)]
Merge branch 'bug53879' into PHP-5.4

11 years agoFixed bug #53879 (DateTime::createFromFormat() fails to parse cookie expiration date)
Derick Rethans [Wed, 27 Nov 2013 21:59:46 +0000 (21:59 +0000)]
Fixed bug #53879 (DateTime::createFromFormat() fails to parse cookie expiration date)

11 years agoMerge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
Dmitry Stogov [Wed, 27 Nov 2013 10:58:54 +0000 (14:58 +0400)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

* 'PHP-5.4' of git.php.net:php-src:
  Fixed bug #66060 (Heap buffer over-read in DateInterval)

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Dmitry Stogov [Wed, 27 Nov 2013 10:58:35 +0000 (14:58 +0400)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src:
  NEWS
  Fixed bug #66060 (Heap buffer over-read in DateInterval)

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Dmitry Stogov [Wed, 27 Nov 2013 10:39:40 +0000 (14:39 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #65969 (Chain assignment with T_LIST failure)

Conflicts:
NEWS
Zend/zend_vm_def.h
Zend/zend_vm_execute.h

11 years agoFixed bug #65969 (Chain assignment with T_LIST failure)
Dmitry Stogov [Wed, 27 Nov 2013 10:26:34 +0000 (14:26 +0400)]
Fixed bug #65969 (Chain assignment with T_LIST failure)

11 years agoNEWS
Remi Collet [Wed, 27 Nov 2013 10:15:34 +0000 (11:15 +0100)]
NEWS

11 years agoFixed bug #66060 (Heap buffer over-read in DateInterval)
Remi Collet [Wed, 27 Nov 2013 10:15:08 +0000 (11:15 +0100)]
Fixed bug #66060 (Heap buffer over-read in DateInterval)

11 years agoFixed bug #66060 (Heap buffer over-read in DateInterval)
Remi Collet [Wed, 27 Nov 2013 10:13:16 +0000 (11:13 +0100)]
Fixed bug #66060 (Heap buffer over-read in DateInterval)

11 years ago5.5.8-dev now
Julien Pauli [Wed, 27 Nov 2013 08:34:40 +0000 (09:34 +0100)]
5.5.8-dev now

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Wed, 27 Nov 2013 08:14:42 +0000 (00:14 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  5.4.24-dev now

Conflicts:
configure.in
main/php_version.h

11 years ago5.4.24-dev now
Stanislav Malyshev [Wed, 27 Nov 2013 08:13:45 +0000 (00:13 -0800)]
5.4.24-dev now

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Andrey Hristov [Tue, 26 Nov 2013 18:10:30 +0000 (20:10 +0200)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

11 years agoFixed opcahce_reset() crash when opcache.protect_memory is set
Dmitry Stogov [Tue, 26 Nov 2013 17:57:32 +0000 (21:57 +0400)]
Fixed opcahce_reset() crash when opcache.protect_memory is set

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Dmitry Stogov [Tue, 26 Nov 2013 17:44:54 +0000 (21:44 +0400)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src:
  Fixed a wrong test

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Andrey Hristov [Tue, 26 Nov 2013 17:15:43 +0000 (19:15 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agomerge fix
Andrey Hristov [Tue, 26 Nov 2013 17:15:30 +0000 (19:15 +0200)]
merge fix

11 years agoadd test
Andrey Hristov [Tue, 26 Nov 2013 17:15:12 +0000 (19:15 +0200)]
add test

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Andrey Hristov [Tue, 26 Nov 2013 17:02:45 +0000 (19:02 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
NEWS
ext/mysqlnd/mysqlnd.c

11 years agoFix for Bug #66141 (mysqlnd quote function is wrong with NO_BACKSLASH_ESCAPES after...
Andrey Hristov [Tue, 26 Nov 2013 17:01:49 +0000 (19:01 +0200)]
Fix for Bug #66141 (mysqlnd quote function is wrong with NO_BACKSLASH_ESCAPES after failed query)

11 years agoFixed bug #66176 (Invalid constant substitution)
Dmitry Stogov [Tue, 26 Nov 2013 17:00:00 +0000 (21:00 +0400)]
Fixed bug #66176 (Invalid constant substitution)

11 years agoFixed a wrong test
Julien Pauli [Tue, 26 Nov 2013 16:43:31 +0000 (17:43 +0100)]
Fixed a wrong test

11 years agoFixed bug #66176 (Invalid constant substitution)
Dmitry Stogov [Tue, 26 Nov 2013 15:55:49 +0000 (19:55 +0400)]
Fixed bug #66176 (Invalid constant substitution)

11 years agoFixed bug #66176 (Invalid constant substitution)
Dmitry Stogov [Tue, 26 Nov 2013 13:47:02 +0000 (17:47 +0400)]
Fixed bug #66176 (Invalid constant substitution)

11 years agoAdded test
Dmitry Stogov [Tue, 26 Nov 2013 08:13:42 +0000 (12:13 +0400)]
Added test

11 years agoFixed bug #65559 (Opcache: cache not cleared if changes occur while running)
Dmitry Stogov [Tue, 26 Nov 2013 07:34:41 +0000 (11:34 +0400)]
Fixed bug #65559 (Opcache: cache not cleared if changes occur while running)

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Andrey Hristov [Mon, 25 Nov 2013 19:33:04 +0000 (21:33 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
NEWS

11 years agobring the news
Andrey Hristov [Mon, 25 Nov 2013 19:31:51 +0000 (21:31 +0200)]
bring the news

11 years agoFixed compatibility with old PHP versions
Dmitry Stogov [Mon, 25 Nov 2013 10:09:57 +0000 (14:09 +0400)]
Fixed compatibility with old PHP versions

11 years agoFixed bug #65915 (Inconsistent results with require return value)
Dmitry Stogov [Mon, 25 Nov 2013 10:07:24 +0000 (14:07 +0400)]
Fixed bug #65915 (Inconsistent results with require return value)

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Anatol Belski [Thu, 21 Nov 2013 20:29:02 +0000 (21:29 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fixed test

11 years agofixed test
Anatol Belski [Thu, 21 Nov 2013 20:24:47 +0000 (21:24 +0100)]
fixed test

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Andrey Hristov [Thu, 21 Nov 2013 19:29:37 +0000 (21:29 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoAnd here is the real fix for #66124
Andrey Hristov [Thu, 21 Nov 2013 19:29:21 +0000 (21:29 +0200)]
And here is the real fix for #66124

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Andrey Hristov [Thu, 21 Nov 2013 19:15:22 +0000 (21:15 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoFix for Bug #66124 (mysqli under mysqlnd loses precision when bind_param with 'i')
Andrey Hristov [Thu, 21 Nov 2013 19:14:42 +0000 (21:14 +0200)]
Fix for Bug #66124 (mysqli under mysqlnd loses precision when bind_param with 'i')

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Anatol Belski [Wed, 20 Nov 2013 09:11:39 +0000 (10:11 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  permanently deactivate that place, not on runtime only

11 years agopermanently deactivate that place, not on runtime only
Anatol Belski [Wed, 20 Nov 2013 09:09:11 +0000 (10:09 +0100)]
permanently deactivate that place, not on runtime only

besides the two "if" checks, this fixes static analyze which is sometimes
broken because of this

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Yasuo Ohgaki [Tue, 19 Nov 2013 22:23:54 +0000 (07:23 +0900)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  added a test to cover distinction between boolean return value of unserialize function and deserializing serialized boolean

11 years agoFix WS in serialization_error_002.phpt
Yasuo Ohgaki [Tue, 19 Nov 2013 22:17:53 +0000 (07:17 +0900)]
Fix WS in serialization_error_002.phpt

11 years agoadded a test to cover distinction between boolean return value of unserialize functio...
Aaron Hamid [Mon, 18 Nov 2013 03:59:42 +0000 (22:59 -0500)]
added a test to cover distinction between boolean return value of unserialize function and deserializing serialized boolean

11 years agoFixed tests that fail with non-default `serialize_precision` configurations.
Jeff Welch [Fri, 8 Nov 2013 18:07:22 +0000 (13:07 -0500)]
Fixed tests that fail with non-default `serialize_precision` configurations.

See:

 * https://bugs.php.net/bug.php?id=64760
 * 4dc4302

11 years agoFixed tests that fail with non-default `serialize_precision` configurations.
Jeff Welch [Fri, 8 Nov 2013 18:07:22 +0000 (13:07 -0500)]
Fixed tests that fail with non-default `serialize_precision` configurations.

See:

 * https://bugs.php.net/bug.php?id=64760
 * 4dc4302

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Remi Collet [Tue, 19 Nov 2013 11:42:25 +0000 (12:42 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  avoid doing a stream_select on a closed stream

11 years agoavoid doing a stream_select on a closed stream
Remi Collet [Tue, 19 Nov 2013 11:41:58 +0000 (12:41 +0100)]
avoid doing a stream_select on a closed stream

11 years agoUpdated NEWS
Andrea Faulds [Mon, 18 Nov 2013 21:23:45 +0000 (21:23 +0000)]
Updated NEWS

11 years agoMerge branch 'CLIGetAllHeadersBackport' into PHP-5.5
Andrea Faulds [Mon, 18 Nov 2013 21:19:07 +0000 (21:19 +0000)]
Merge branch 'CLIGetAllHeadersBackport' into PHP-5.5

* CLIGetAllHeadersBackport:
  Removed UPGRADING note
  Rewrote test using tcp instead of http:// stream
  Implemented FR #65917 (getallheaders() is not supported by the built-in...)

11 years agoUpdate NEWS
Xinchen Hui [Sun, 17 Nov 2013 09:06:27 +0000 (17:06 +0800)]
Update NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Sun, 17 Nov 2013 09:05:04 +0000 (17:05 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoFixed Bug #66094 (unregister_tick_function tries to cast a Closure to a string)
Xinchen Hui [Sun, 17 Nov 2013 09:04:37 +0000 (17:04 +0800)]
Fixed Bug #66094 (unregister_tick_function tries to cast a Closure to a string)

11 years agoThis is CLI web server change. Added some common MIME types to the
Christopher Jones [Fri, 15 Nov 2013 20:36:25 +0000 (12:36 -0800)]
This is CLI web server change.  Added some common MIME types to the
existing lookup list, pending a more thorough lookup solution, if
anyone wants to do that.  Ref http://news.php.net/php.internals/69990

A router can be used to add to, or override, the MIME type lookups,
see http://php.net/manual/en/features.commandline.webserver.php

11 years agoNEWS
Remi Collet [Fri, 15 Nov 2013 08:52:48 +0000 (09:52 +0100)]
NEWS

11 years agoFix Bug #65714 PHP cli forces the tty to cooked mode
Remi Collet [Fri, 15 Nov 2013 08:49:42 +0000 (09:49 +0100)]
Fix Bug #65714  PHP cli forces the tty to cooked mode

Only drop the using_history() call with libedit as I don't know
if it is required with readline.

This also allow to run a php script in background without
it being aborted on first output.

11 years agoMove the JSON bugfix into the 5.5.6 changelog.
Adam Harvey [Thu, 14 Nov 2013 18:52:07 +0000 (10:52 -0800)]
Move the JSON bugfix into the 5.5.6 changelog.

11 years agoRemoved UPGRADING note
Andrea Faulds [Wed, 13 Nov 2013 17:03:02 +0000 (17:03 +0000)]
Removed UPGRADING note

Conflicts:
UPGRADING

11 years agoFix failed test with recent glibc
Remi Collet [Wed, 13 Nov 2013 12:19:10 +0000 (13:19 +0100)]
Fix failed test with recent glibc

In recent version of strptime glibc upstream has fixed a discrepancy between
documentation and actual behaviour by skipping over the sequence that would match %Z.
See http://repo.or.cz/w/glibc.git/commitdiff/ddc7e412ab252e7360a4357664beb3b5d9c4f42b

So when %Z is used in format
glibc <= 2.18 returns the GMT as unparsed
glibc >= 2.19 returns empty string

Removing %Z from tested format gives the same behavior with all version.

11 years agoRewrote test using tcp instead of http:// stream
Andrea Faulds [Tue, 22 Oct 2013 16:07:37 +0000 (16:07 +0000)]
Rewrote test using tcp instead of http:// stream

11 years agoImplemented FR #65917 (getallheaders() is not supported by the built-in...)
Andrea Faulds [Thu, 17 Oct 2013 22:19:09 +0000 (22:19 +0000)]
Implemented FR #65917 (getallheaders() is not supported by the built-in...)

- Implemented apache_request_headers() and getallheaders() alias in CLI server
- Implemented apache_response_headers() in CLI server using FastCGI code

Conflicts:
NEWS
UPGRADING

11 years ago5.5.7 now
Julien Pauli [Tue, 12 Nov 2013 17:20:09 +0000 (18:20 +0100)]
5.5.7 now

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Adam Harvey [Sun, 10 Nov 2013 21:11:28 +0000 (16:11 -0500)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Update NEWS and remove the unnecessary UPGRADING note.
  UPGRADING and NEWS
  Better test: Check combined leading/trailing
  Fixed whitespace part of bug #64874 ("json_decode handles whitespace and case-sensitivity incorrectly")

11 years agoUpdate NEWS and remove the unnecessary UPGRADING note.
Adam Harvey [Sun, 10 Nov 2013 20:46:31 +0000 (15:46 -0500)]
Update NEWS and remove the unnecessary UPGRADING note.

11 years agoMerge remote-tracking branch 'ajf/JSONWhitespaceFix' into PHP-5.4
Adam Harvey [Sun, 10 Nov 2013 20:43:56 +0000 (15:43 -0500)]
Merge remote-tracking branch 'ajf/JSONWhitespaceFix' into PHP-5.4

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Rasmus Lerdorf [Sat, 9 Nov 2013 17:46:43 +0000 (09:46 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix broken test

11 years agoFix broken test
Rasmus Lerdorf [Sat, 9 Nov 2013 17:45:52 +0000 (09:45 -0800)]
Fix broken test

11 years agoFixed issue #115 (path issue when using phar).
Dmitry Stogov [Fri, 8 Nov 2013 12:35:05 +0000 (16:35 +0400)]
Fixed issue #115 (path issue when using phar).
Fixed issue #149 (Phar mount points not working with OPcache enabled).

11 years agoAdded tests for PHAR/OPCahce incompatibilities
Dmitry Stogov [Fri, 8 Nov 2013 09:50:57 +0000 (13:50 +0400)]
Added tests for PHAR/OPCahce incompatibilities

11 years agoUpdate NEWS
Xinchen Hui [Fri, 8 Nov 2013 07:33:49 +0000 (15:33 +0800)]
Update NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Fri, 8 Nov 2013 07:33:27 +0000 (15:33 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoFixed bug #65947 (basename is no more working after fgetcsv in certain situation)
Xinchen Hui [Fri, 8 Nov 2013 07:32:28 +0000 (15:32 +0800)]
Fixed bug #65947 (basename is no more working after fgetcsv in certain situation)

previous codes: "#define php_mblen(ptr, len) ((ptr) == NULL ? mbsinit(&BG(mblen_state)):
(int)mbrlen(ptr, len, &BG(mblen_state)))#

it use mbsinit there, seems try to initialize the mblen_state, but:
"This function does not change the state identified by ps. Typical ways
to make the state pointed by ps an initial state are:

memset (ps,0,sizeof(*ps));  // ps points to zero-valued object
"
http://www.cplusplus.com/reference/cwchar/mbsinit/?kw=mbsinit

11 years agoUpdate NEWS
Xinchen Hui [Fri, 8 Nov 2013 07:08:07 +0000 (15:08 +0800)]
Update NEWS