7ffc442927
Merge branch 'PHP-5.3' of ../php-5.3 into PHP-5.4
2012-03-24 15:15:27 +08:00
fcae164ea6
Implemented FR #60738 (Allow 'set_error_handler' to handle NULL)
2012-03-24 15:13:10 +08:00
45a9b12c7c
Merge branch 'PHP-5.3' of ../php-5.3 into PHP-5.4
2012-03-24 14:34:01 +08:00
9a87fe1c52
Merge from PHP-5.4
...
Improve set_exception_handler
2012-03-24 14:33:00 +08:00
503e9d955c
Merge branch 'PHP-5.3' of ../php-5.3 into PHP-5.4
2012-03-24 14:22:53 +08:00
56dac369ab
Fix ZTS build
2012-03-24 14:22:04 +08:00
e3dc1d8101
Typo
2012-03-24 12:23:41 +08:00
f84d55b062
Fix test
2012-03-24 12:15:04 +08:00
4130f5a43c
Improve set_exception_handler
...
Remove useless alloc/free and return_value copy while doing reset
exception handler
2012-03-24 11:54:50 +08:00
114d662d12
Remove empty lines
2012-03-24 11:35:13 +08:00
e018e2ae86
Merge branch '5.3' into 5.4
2012-03-23 22:14:36 +00:00
f514856fbb
Merge branch 'dom_debug_handler' into 5.3
2012-03-23 22:14:24 +00:00
15d7d460bd
Updated NEWS (DOM object debug info handler).
2012-03-23 22:13:26 +00:00
372801d94c
Fixed tests that var_dump/print_r DOM objects.
2012-03-23 22:08:33 +00:00
b61017c9b6
Improved on DOM object debug info handler. Added test.
2012-03-23 21:23:24 +00:00
d04682766d
Added DOM Debug handler
2012-03-23 21:23:23 +00:00
0cf70b1a42
Merge branch '5.3' into 5.4
2012-03-23 11:32:20 +00:00
3960def881
Fixed bug #61482 , caused by the fix to bug #61418 .
...
Turns out I'd forgotten to also update the destructor for the iterator
returned by DirectoryIterator.
The iterator for DirectoryIterator maintains the same ->current pointer
throughout its existence (the DirectoryIterator itself) and returns it
(the same object) everytime a value is requested from the iterator.
Moving forward the iterator only changes the object. Previous code
added two references to the object in get_iterator on the account of
1) the iterator memory living in its DirectoryIterator object and
2) the object being stored in iterator->current. This seems to be
unnecessary. Iterators are not responsible for incrementing the refcount
of the values they yield, that's up to the caller (the engine). What
matters for the iterator is that the object exists as long as the
iterator exists and this can be guaranteed by incremented the refcount
only once. Consequently, I only add one reference in get_iterator
(and reclaim it in the iterator destructor).
2012-03-23 11:19:19 +00:00
85725337d5
Revert "Revert "- Fixed bug #61418 (Segmentation fault when DirectoryIterator's or" - causes bug #61482 "
...
This reverts commit a89c4a34ee
2012-03-23 09:40:27 +00:00
e8ecb11449
Revert "revert from NEWS too"
...
This reverts commit 4990250f2d
2012-03-23 09:40:20 +00:00
4990250f2d
revert from NEWS too
2012-03-22 22:34:32 -07:00
bcc15b5633
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Revert "- Fixed bug #61418 (Segmentation fault when DirectoryIterator's or" - causes bug #61482
Add initialization tests for SQLT_INT binds
Fix NEWS
2012-03-22 22:30:51 -07:00
a89c4a34ee
Revert "- Fixed bug #61418 (Segmentation fault when DirectoryIterator's or" - causes bug #61482
...
This reverts commit 714f1ff4b3
2012-03-22 22:29:50 -07:00
ee755fafb9
update for git
2012-03-22 20:04:22 -07:00
7164175e85
Add initialization tests for SQLT_INT binds
...
Added tests for SQLT_INT binds particularly to check for uninitialized
variables.
2012-03-22 13:24:46 -07:00
22f4043a38
Merge branch 'PHP-5.4' of /home/cjones/php-src into PHP-5.4
...
* 'PHP-5.4' of /home/cjones/php-src: (21 commits)
Fixed bug #61423 (gzip compression fails).
BFN
Fixed bug #61423 (gzip compression fails).
Revert "Fixed reference counting"
Revert "Fixed reference counting"
Revert "Fixed reference counting"
Fixed reference counting
Fixed reference counting
Fix test, and merge the modification from trunk
Ignore the tempoary files
Fix test, which was broken by the fix for #61173
Use the NEWS merge driver if available
Made some SplFileObject::fputcsv not pollute the working dir.
Fixed bug #61453 .
Fixed bug #49853 (Soap Client stream context header option ignored)
Always keep the NEWS file from the branch when merging
Fixed bug #61043 (Regression in magic_quotes_gpc fix for CVE-2012-0831)
- update NEWS
- add test for bug #55000 and #54374
- merge fix bug #54374 , bug #55500 - filter file names better, no dangling [s, svn revision 321664
...
2012-03-22 11:34:25 -07:00
1a0b0ead14
Fix NEWS
2012-03-22 16:40:13 +01:00
f9f631fb76
Fixed bug #61423 (gzip compression fails).
...
Conflicts:
NEWS
2012-03-22 09:46:33 -04:00
2630bc6e5f
BFN
2012-03-22 09:15:40 -04:00
30f6a9ba48
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #61423 (gzip compression fails).
Revert "Fixed reference counting"
2012-03-22 09:15:17 -04:00
b4aea52682
Fixed bug #61423 (gzip compression fails).
2012-03-22 09:13:45 -04:00
3f9c3ad288
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
...
* 'PHP-5.4' of git.php.net:php-src:
Revert "Fixed reference counting"
Fixed reference counting
2012-03-22 16:40:15 +04:00
dd33437eee
Revert "Fixed reference counting"
...
This reverts commit 752fec88ef
2012-03-22 15:52:32 +04:00
672fe54a00
Revert "Fixed reference counting"
...
This reverts commit 14af1fe692
2012-03-22 15:51:58 +04:00
b60f9fe146
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed reference counting
2012-03-22 12:13:52 +01:00
0b646e8027
Revert "Fixed reference counting"
...
This reverts commit 752fec88ef
2012-03-22 12:13:31 +01:00
752fec88ef
Fixed reference counting
2012-03-22 15:03:38 +04:00
14af1fe692
Fixed reference counting
2012-03-22 15:03:16 +04:00
df129ae7ea
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix test, and merge the modification from trunk
2012-03-22 17:31:15 +08:00
523396cb28
Fix test, and merge the modification from trunk
2012-03-22 17:30:16 +08:00
8254e21a68
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Ignore the tempoary files
2012-03-22 17:22:47 +08:00
27208de763
Ignore the tempoary files
2012-03-22 17:22:17 +08:00
2dbced096a
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix test, which was broken by the fix for #61173
Conflicts:
ext/fileinfo/tests/finfo_open_error.phpt
2012-03-22 17:17:42 +08:00
e96a172114
Fix test, which was broken by the fix for #61173
2012-03-22 17:10:03 +08:00
ab825fdc24
Merge branch 'PHP-5.3' of ../php-5.3 into PHP-5.4
...
* 'PHP-5.3' of ../php-5.3:
Add initialization tests for SQLT_INT binds
2012-03-21 16:14:51 -07:00
fe5785d92b
Add initialization tests for SQLT_INT binds
...
Added tests for SQLT_INT binds particularly to check for uninitialized
variables.
2012-03-21 16:12:28 -07:00
c0e9767131
Merge branch '5.3' into 5.4 (just to sync, no code changes)
2012-03-21 21:31:58 +00:00
cdc5d4a801
Merge branch 'PHP-5.3' of git.php.net:/php-src into 5.3
2012-03-21 21:13:35 +00:00
2d2995f343
Fixed bug #61043 : Regression in magic_quotes_gpc fix (CVE-2012-0831)
...
Merge commit 'refs/pull/12/head' of git://github.com/php/php-src into 5.3
Signed-off-by: Gustavo André dos Santos Lopes <cataphract@php.net >
2012-03-21 21:12:31 +00:00
4f81b4c649
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Use the NEWS merge driver if available
2012-03-21 18:12:16 +01:00
Xinchen Hui