d3291de51a
Merge branch 'PHP-5.4' into PHP-5.5
2013-02-17 11:06:33 +08:00
263accb626
Merge branch 'PHP-5.3' into PHP-5.4
2013-02-17 11:05:34 +08:00
01ae5c3c2f
Fixed bug #64228 (RecursiveDirectoryIterator always assumes SKIP_DOTS)
2013-02-17 11:04:36 +08:00
f540e086e2
Fixed bug #64106 : Segfault on SplFixedArray[][x] = y when extended
2013-01-30 20:40:02 +01:00
bb4d11b405
Merge branch 'PHP-5.3' into PHP-5.4
2013-01-30 20:25:59 +01:00
321f4f18e5
Fixed bug #64106 : Segfault on SplFixedArray[][x] = y when extended
2013-01-30 20:23:39 +01:00
fc7b054c2d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #64023 (__toString() & SplFileInfo)
2013-01-23 13:24:50 +01:00
b8b3bb08b2
Merge branch 'bug64023' into PHP-5.4
...
* bug64023:
Fix bug #64023 (__toString() & SplFileInfo)
Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
2013-01-22 12:24:33 +01:00
aa0adce47d
Fix bug #64023 (__toString() & SplFileInfo)
...
Defining a __toString() method was having no effect when concatenating
the object. This was because the cast_object() handler would ignore
__toString().
Using echo() directly would actually use __toString(), but this was a
bug: the ECHO handler would try zend_std_cast_object_tostring() before
cast_object(), but cast_object() should have priority as
zend_std_cast_object_tostring() assumes an object with a
zend_class_entry.
2013-01-22 11:33:29 +01:00
deeacc7106
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix bug #63462 (Magic methods called twice for unset protected properties)
NEWS for bug #64011 . See 77ee200#64011 (get_html_translation_table())
Fix News
Update the arguments in the prototype of fpm_socket_unix_test_connect().
fixed build
NEWS for bug #63893
Fixed inconsequential bug in strtr()
Revert "Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa."
Revert "Update fputcsv() to escape all characters equally."
Remove _GNU_SOURCE, add local heap sort
The compiler can figure this out
Remove unused block
strtr() with 2nd param array - optimization
Refactoring, bugs & leaks
Optimize strtr w/ 2nd arg array
2013-01-18 13:42:04 -08:00
83864b470b
Revert "Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa."
...
This reverts commit 0510701474
2013-01-15 17:37:21 +08:00
8bf937f9bf
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa.
2013-01-15 15:50:57 +08:00
0510701474
Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa.
2013-01-15 15:49:52 +08:00
274ceb3d8d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #63680 (Memleak in splfixedarray with cycle reference)
Conflicts:
NEWS
2012-12-05 17:55:21 +04:00
881416cda6
Fixed bug #63680 (Memleak in splfixedarray with cycle reference)
2012-12-05 17:53:26 +04:00
1b9e0de2cc
Remove executable permission on inc
2012-10-10 10:44:34 +08:00
610c7fbe7b
Remove executable permission on phpt
2012-10-10 10:27:49 +08:00
69a4301f6c
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-10 10:45:07 +08:00
e081c55fb5
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-10 10:31:31 +08:00
139ac42bec
Fixed bug #63184 test (ext/spl/tests/RecursiveDirectoryIterator_getSubPathname_basic.phpt failed)
2012-10-01 22:42:22 +08:00
175a9de47f
Fix test
2012-10-01 00:15:47 +08:00
4e5e8c9da0
Merge branch 'PHP-5.4'
2012-10-10 10:45:34 +08:00
4b152e5470
Merge branch 'PHP-5.4'
2012-10-10 10:32:38 +08:00
a81d431068
Merge branch 'PHP-5.4'
2012-10-01 22:45:15 +08:00
f8d1fc62fa
Merge branch 'PHP-5.4'
2012-10-01 00:17:11 +08:00
d6ca1c9b9a
Merge branch 'PHP-5.4'
2012-09-29 14:39:59 +08:00
36c10242cd
Remove meaningless md5 string && Attempt to fix #63184
2012-09-29 14:38:29 +08:00
87df717909
Merge branch 'PHP-5.4'
...
* PHP-5.4:
fix unix/win dir separators
2012-09-27 19:54:12 +02:00
6a50a8640c
fix unix/win dir separators
2012-09-27 19:52:34 +02:00
6793e09a4e
Merge branch 'PHP-5.4'
2012-09-18 23:17:31 +02:00
ee172ce3cc
Merging PR #116
2012-09-18 23:15:03 +02:00
7b5960b085
Merge branch 'PHP-5.4'
2012-09-01 14:38:33 +08:00
f3108b5f81
Remove extra blank in notice message, should act as same as vm
2012-09-01 14:37:45 +08:00
59e34bad32
Merge branch 'PHP-5.4'
2012-09-01 14:27:59 +08:00
863e7e0acb
Merge branch 'PHP-5.3' into PHP-5.4
...
Conflicts:
ext/spl/spl_array.c
2012-09-01 14:27:09 +08:00
67d7d03f00
Fixed bug #62987 (Assigning to ArrayObject[null][something] overrides all undefined variables)
...
The get_zval_ptr_ptr of spl_array handler should act as same as the vm's
2012-09-01 14:21:34 +08:00
a3d701e11c
Merge branch 'PHP-5.4'
2012-08-23 23:28:24 +08:00
13bcf685cb
Fixed bug #62904 (Crash when cloning an object which inherits SplFixedArray)
2012-08-23 23:27:16 +08:00
42f91d6ac6
Fixed bug #62904 (Crash when cloning an object which inherits SplFixedArray)
2012-08-23 23:21:25 +08:00
546b0e4a99
Merge branch 'PHP-5.4'
2012-08-21 13:33:23 +08:00
8722173ad5
Implemented FR #62840 (Add sort flag to ArrayObject::ksort)
2012-08-21 13:32:15 +08:00
e51acee43d
Merge branch 'PHP-5.4'
2012-08-13 11:04:05 +08:00
212cfb95d1
more test script for #62328
2012-08-13 11:03:35 +08:00
777b6679a4
missed the test script
2012-07-21 23:30:32 +08:00
a580405f38
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed bug #62616 (ArrayIterator::count() from IteratorIterator instance gives Segmentation fault)
2012-07-21 22:46:14 +08:00
0c996613c0
Fixed bug #62616 (ArrayIterator::count() from IteratorIterator instance gives Segmentation fault)
2012-07-21 22:45:16 +08:00
8238c6a4c8
test script for bug #61697
2012-07-18 19:19:31 +08:00
e84c5be631
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed bug #61527 (Recursive/ArrayIterator gives misleading notice when array empty or moved to the end)
2012-07-14 22:35:47 -07:00
a5d45bae85
Fixed bug #61527 (Recursive/ArrayIterator gives misleading notice when array empty or moved to the end)
2012-07-14 22:34:28 -07:00
455f3de802
Merge branch 'PHP-5.4'
...
* PHP-5.4:
removed unneccesary arrat and ini settings
addition SplFileObject tests
new tests from PHP TestFest June 2012
2012-07-14 19:25:16 -07:00
Xinchen Hui