delta/php-git.git/ext, branch php-5.5.6 git.php.net: repository/php-src.git Merge branch 'PHP-5.4' into PHP-5.5 2013-11-10T21:11:28+00:00 Adam Harvey aharvey@php.net 2013-11-10T21:11:28+00:00 304bff90f42479d412e4124c11803f384cae909d * 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") 
* 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")
Merge remote-tracking branch 'ajf/JSONWhitespaceFix' into PHP-5.4 2013-11-10T20:43:56+00:00 Adam Harvey aharvey@php.net 2013-11-10T20:43:56+00:00 288e9c642375663cd6eb232ad1b236df912e787e 






Merge branch 'PHP-5.4' into PHP-5.5
2013-11-09T17:46:43+00:00

Rasmus Lerdorf
rasmus@lerdorf.com

2013-11-09T17:46:43+00:00

df7321359e0c11a1de99285dee64c8e69ee28653

* PHP-5.4:
  Fix broken test





* PHP-5.4:
  Fix broken test







Fix broken test
2013-11-09T17:45:52+00:00

Rasmus Lerdorf
rasmus@lerdorf.com

2013-11-09T17:45:52+00:00

064ba179b15bda7566fa43297e2cee8033bc850f












Fixed issue #115 (path issue when using phar).
2013-11-08T12:35:05+00:00

Dmitry Stogov
dmitry@zend.com

2013-11-08T12:35:05+00:00

915c428ba1006a144c4fca45e44631ec058a5074

Fixed issue #149 (Phar mount points not working with OPcache enabled).





Fixed issue #149 (Phar mount points not working with OPcache enabled).







Added tests for PHAR/OPCahce incompatibilities
2013-11-08T09:50:57+00:00

Dmitry Stogov
dmitry@zend.com

2013-11-08T09:50:57+00:00

49fbe2579e9cbb4314346c8eaf959c670de0abdb












Merge branch 'PHP-5.4' into PHP-5.5
2013-11-08T07:33:27+00:00

Xinchen Hui
laruence@php.net

2013-11-08T07:33:27+00:00

5f17c4d08e2bcce1159444adcc2a1e40ab80618f












Fixed bug #65947 (basename is no more working after fgetcsv in certain situation)
2013-11-08T07:32:28+00:00

Xinchen Hui
laruence@php.net

2013-11-08T07:32:28+00:00

cf2626f10c92709f8db44afa15fc09ec6a9d8b0c

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





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







Merge branch 'PHP-5.4' into PHP-5.5
2013-11-08T07:07:43+00:00

Xinchen Hui
laruence@php.net

2013-11-08T07:07:43+00:00

41eb3c959d4e42a61950b46e1cbd28936fc49377












Fixed Bug #66043 (Segfault calling bind_param() on mysqli)
2013-11-08T07:06:36+00:00

Xinchen Hui
laruence@php.net

2013-11-08T07:06:36+00:00

fd3fa9b53c6bc8f34c1c8bf75141f7ee74dc8db0

Although the doc said it is (unsigned int *), but it is ulong* in the
libmysql 5.0 's source codes





Although the doc said it is (unsigned int *), but it is ulong* in the
libmysql 5.0 's source codes