Xinchen Hui
|
4b152e5470
|
Merge branch 'PHP-5.4'
|
2012-10-10 10:32:38 +08:00 |
|
Xinchen Hui
|
e081c55fb5
|
Merge branch 'PHP-5.3' into PHP-5.4
|
2012-10-10 10:31:31 +08:00 |
|
Xinchen Hui
|
610c7fbe7b
|
Remove executable permission on phpt
|
2012-10-10 10:27:49 +08:00 |
|
Xinchen Hui
|
75a2c0d715
|
Merge branch 'PHP-5.4'
|
2012-10-09 13:30:22 +08:00 |
|
Xinchen Hui
|
e4a8fa6a15
|
Merge branch 'PHP-5.3' into PHP-5.4
|
2012-10-09 13:29:51 +08:00 |
|
Xinchen Hui
|
6284ef112e
|
Fixed bug #63236 (Executable permission on various source files)
|
2012-10-09 13:28:31 +08:00 |
|
Xinchen Hui
|
a81d431068
|
Merge branch 'PHP-5.4'
|
2012-10-01 22:45:15 +08:00 |
|
Xinchen Hui
|
139ac42bec
|
Fixed bug #63184 test (ext/spl/tests/RecursiveDirectoryIterator_getSubPathname_basic.phpt failed)
|
2012-10-01 22:42:22 +08:00 |
|
Xinchen Hui
|
f8d1fc62fa
|
Merge branch 'PHP-5.4'
|
2012-10-01 00:17:11 +08:00 |
|
Xinchen Hui
|
175a9de47f
|
Fix test
|
2012-10-01 00:15:47 +08:00 |
|
Xinchen Hui
|
d6ca1c9b9a
|
Merge branch 'PHP-5.4'
|
2012-09-29 14:39:59 +08:00 |
|
Xinchen Hui
|
36c10242cd
|
Remove meaningless md5 string && Attempt to fix #63184
|
2012-09-29 14:38:29 +08:00 |
|
Anatoliy Belsky
|
87df717909
|
Merge branch 'PHP-5.4'
* PHP-5.4:
fix unix/win dir separators
|
2012-09-27 19:54:12 +02:00 |
|
Anatoliy Belsky
|
6a50a8640c
|
fix unix/win dir separators
|
2012-09-27 19:52:34 +02:00 |
|
Lars Strojny
|
6793e09a4e
|
Merge branch 'PHP-5.4'
|
2012-09-18 23:17:31 +02:00 |
|
Lars Strojny
|
ee172ce3cc
|
Merging PR #116
|
2012-09-18 23:15:03 +02:00 |
|
Xinchen Hui
|
7b5960b085
|
Merge branch 'PHP-5.4'
|
2012-09-01 14:38:33 +08:00 |
|
Xinchen Hui
|
f3108b5f81
|
Remove extra blank in notice message, should act as same as vm
|
2012-09-01 14:37:45 +08:00 |
|
Xinchen Hui
|
59e34bad32
|
Merge branch 'PHP-5.4'
|
2012-09-01 14:27:59 +08:00 |
|
Xinchen Hui
|
863e7e0acb
|
Merge branch 'PHP-5.3' into PHP-5.4
Conflicts:
ext/spl/spl_array.c
|
2012-09-01 14:27:09 +08:00 |
|
Xinchen Hui
|
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 |
|
Xinchen Hui
|
a3d701e11c
|
Merge branch 'PHP-5.4'
|
2012-08-23 23:28:24 +08:00 |
|
Xinchen Hui
|
13bcf685cb
|
Fixed bug #62904 (Crash when cloning an object which inherits SplFixedArray)
|
2012-08-23 23:27:16 +08:00 |
|
Xinchen Hui
|
42f91d6ac6
|
Fixed bug #62904 (Crash when cloning an object which inherits SplFixedArray)
|
2012-08-23 23:21:25 +08:00 |
|
Xinchen Hui
|
546b0e4a99
|
Merge branch 'PHP-5.4'
|
2012-08-21 13:33:23 +08:00 |
|
Xinchen Hui
|
8722173ad5
|
Implemented FR #62840 (Add sort flag to ArrayObject::ksort)
|
2012-08-21 13:32:15 +08:00 |
|
Felipe Pena
|
9ad748edfb
|
Merge branch 'PHP-5.4'
* PHP-5.4:
- Value stored to var is never used
|
2012-08-19 12:55:46 -03:00 |
|
Felipe Pena
|
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 |
|
Felipe Pena
|
6cd0e446dd
|
- Value stored to var is never used
|
2012-08-19 12:55:38 -03:00 |
|
Xinchen Hui
|
e51acee43d
|
Merge branch 'PHP-5.4'
|
2012-08-13 11:04:05 +08:00 |
|
Xinchen Hui
|
212cfb95d1
|
more test script for #62328
|
2012-08-13 11:03:35 +08:00 |
|
Xinchen Hui
|
777b6679a4
|
missed the test script
|
2012-07-21 23:30:32 +08:00 |
|
Xinchen Hui
|
cc30524c89
|
Fixed bug #62616 (ArrayIterator::count() from IteratorIterator instance gives Segmentation fault)
|
2012-07-21 23:26:18 +08:00 |
|
Xinchen Hui
|
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 |
|
Xinchen Hui
|
0c996613c0
|
Fixed bug #62616 (ArrayIterator::count() from IteratorIterator instance gives Segmentation fault)
|
2012-07-21 22:45:16 +08:00 |
|
Xinchen Hui
|
8238c6a4c8
|
test script for bug #61697
|
2012-07-18 19:19:31 +08:00 |
|
Stanislav Malyshev
|
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 |
|
Stanislav Malyshev
|
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 |
|
Stanislav Malyshev
|
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 |
|
donnut
|
53ba768ed8
|
removed unneccesary arrat and ini settings
|
2012-07-14 19:22:03 -07:00 |
|
donnut
|
4539d799bb
|
addition SplFileObject tests
|
2012-07-14 19:21:50 -07:00 |
|
donnut
|
2cb7a678a1
|
new tests from PHP TestFest June 2012
|
2012-07-14 19:21:34 -07:00 |
|
Anatoliy Belsky
|
ed1f5b4dae
|
Merge branch 'PHP-5.4'
* PHP-5.4:
reverted news about #62477
reverted changes for #62477
Conflicts:
NEWS
|
2012-07-12 11:02:33 +02:00 |
|
Anatoliy Belsky
|
86428169d3
|
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
reverted changes for #62477
|
2012-07-12 10:57:26 +02:00 |
|
Anatoliy Belsky
|
ad7eeba3c1
|
reverted changes for #62477
|
2012-07-12 10:54:14 +02:00 |
|
Anatoliy Belsky
|
b530d6d790
|
Merge branch 'PHP-5.4'
* PHP-5.4:
Fixed bug #62477 LimitIterator int overflow
|
2012-07-11 22:30:40 +02:00 |
|
Anatoliy Belsky
|
40f8010a13
|
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed bug #62477 LimitIterator int overflow
|
2012-07-11 22:29:45 +02:00 |
|
Anatoliy Belsky
|
b383ddf1e5
|
Fixed bug #62477 LimitIterator int overflow
|
2012-07-11 22:25:31 +02:00 |
|
Anatoliy Belsky
|
f76bb14814
|
Merge branch 'PHP-5.4'
* PHP-5.4:
fixed #62433 test for win
|
2012-07-09 12:45:56 +02:00 |
|
Anatoliy Belsky
|
2032470e41
|
fixed #62433 test for win
|
2012-07-09 12:42:10 +02:00 |
|