f540e086e2
Fixed bug #64106 : Segfault on SplFixedArray[][x] = y when extended
2013-01-30 20:40:02 +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
a666285bc2
Happy New Year
2013-01-01 16:37:09 +08:00
0a7395e009
Happy New Year
2013-01-01 16:28:54 +08:00
a2045ff332
Happy New Year~
2013-01-01 16:02:16 +08:00
4d2593e1be
Merge branch 'PHP-5.4' into PHP-5.5
2012-12-13 10:45:33 +08:00
1f516510b7
Merge branch 'PHP-5.3' into PHP-5.4
2012-12-13 10:44:56 +08:00
39a3007ab2
MFH
2012-12-13 10:44:14 +08:00
bc7857169a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Use get_gc instead of hacks of get_properties
2012-12-05 17:59:46 +04:00
df97c3aa0d
Use get_gc instead of hacks of get_properties
2012-12-05 17:58:36 +04: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
240f8d06de
commented out the HHC_LOCATION line, as there are no easy to use alternatives for
...
hhc.exe on linux.
we should either run the chm build on a windows box(maybe on the replacement of oti1),
or look into running it through wine see
http://cweiske.de/tagebuch/Generating%20CHM%20files%20with%20Wine%20on%20a%20Linux%20server,%20and%20a%20bit%20about%20PEAR's%20PhD%20transition.htm
for details.
I also set DOT_CLEANUP to NO as the doc generation was spitting out errors regarding some dot
file cannot be found.
2012-10-25 17:11:13 +02: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
6284ef112e
Fixed bug #63236 (Executable permission on various source files)
2012-10-09 13:28:31 +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
e4a8fa6a15
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-09 13:29:51 +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
75a2c0d715
Merge branch 'PHP-5.4'
2012-10-09 13:30:22 +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
9ad748edfb
Merge branch 'PHP-5.4'
...
* PHP-5.4:
- Value stored to var is never used
2012-08-19 12:55:46 -03:00
2497bb97e7
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- Value stored to var is never used
2012-08-19 12:55:43 -03:00
Nikita Popov