Felipe Pena
f5bf90ef34
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com
- BFN
2013-06-25 21:18:34 -03:00
Felipe Pena
04db57066d
- Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com
2013-06-25 21:18:09 -03:00
Felipe Pena
2ab53f4b5e
Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
2013-06-25 18:01:46 -03:00
Felipe Pena
b78f129a4a
Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5
2013-06-25 18:01:40 -03:00
Felipe Pena
adb116dd48
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com
- BFN
2013-06-25 18:00:42 -03:00
Felipe Pena
41b73e4cee
- Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com
2013-06-25 18:00:33 -03:00
Christopher Jones
ec7ac71b52
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Minium changes to allow PDO_OCI to build with Oracle Database 12c libraries. (note OCI8 already builds with Oracle Database 12c)
2013-06-25 12:00:24 -07:00
Christopher Jones
423b132a7a
Minium changes to allow PDO_OCI to build with Oracle Database 12c libraries.
...
(note OCI8 already builds with Oracle Database 12c)
2013-06-25 11:55:41 -07:00
Xinchen Hui
157ccaf507
Fixed bug #64827 Segfault in zval_mark_grey (zend_gc.c)
...
I can not get a reproduce script since the context is very strict.
Of course I will try to make one, but for now, I just commit this first.
2013-06-25 13:47:50 +08:00
Xinchen Hui
9d9ec2a90e
Merge branch 'PHP-5.4' into PHP-5.5
2013-06-25 13:38:50 +08:00
Xinchen Hui
38eb909d06
Fixed Bug #61828 (Memleak when calling Directory(Recursive)Iterator/Spl(Temp)FileObject ctor twice)
2013-06-25 13:38:27 +08:00
Felipe Pena
ff292d619c
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fixed bug #61594 (ext/session/mod_mm.c: missing free of ps_mm_instance) patch by: jlawall at hotmail dot com
- BFN
2013-06-24 16:49:22 -03:00
Felipe Pena
982c11573d
- Fixed bug #61594 (ext/session/mod_mm.c: missing free of ps_mm_instance) patch by: jlawall at hotmail dot com
2013-06-24 16:49:15 -03:00
Felipe Pena
4b41959f9e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fixed bug #61387 (NULL valued anonymous column causes segfault in odbc_fetch_array) patch by: Brandon Kirsch
2013-06-24 14:47:40 -03:00
Felipe Pena
8776555d7a
- Fixed bug #61387 (NULL valued anonymous column causes segfault in odbc_fetch_array) patch by: Brandon Kirsch
2013-06-24 14:43:35 -03:00
Remi Collet
9da4985bf2
fix imagecreatefromwebp and imagewebp protos
2013-06-24 11:15:50 +02:00
Remi Collet
8075f1f4a3
Use same logic to load WebP image that other formats
2013-06-24 11:10:52 +02:00
Remi Collet
b4632d0c12
Upstream fix from https://bitbucket.org/libgd/gd-libgd/issue/75
2013-06-24 11:03:12 +02:00
Dmitry Stogov
f49b27e166
OPcache must be compatible with LiteSpeed SAPI
2013-06-24 11:59:50 +04:00
Stanislav Malyshev
ae5a09b47d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
seems to be working fine for me on 32-bit
2013-06-23 23:37:10 -07:00
Stanislav Malyshev
a0d48e01ed
seems to be working fine for me on 32-bit
2013-06-23 23:36:43 -07:00
Stanislav Malyshev
9872835cf3
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #62759 : Buggy grapheme_substr() on edge case
2013-06-23 21:27:08 -07:00
Stanislav Malyshev
860a5c4b01
Fix bug #62759 : Buggy grapheme_substr() on edge case
2013-06-23 21:26:16 -07:00
Jakub Vrana
e1acaea4f1
Require second parameter of imagecrop()
2013-06-23 20:29:54 -07:00
Stanislav Malyshev
1beb24bd6f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Implements feature Bug #63472 ability to set SO_BINDTODEVICE on socket.
Conflicts:
ext/sockets/sockets.c
2013-06-23 15:26:14 -07:00
Damjan Cvetko
a0b4348abc
Implements feature Bug #63472 ability to set SO_BINDTODEVICE on socket.
2013-06-23 15:20:54 -07:00
Remi Collet
fc898ee0f9
Fixed Bug #65060 imagecreatefrom... crashes with user streams
...
Fixed Bug #65084 imagecreatefromjpeg fails with URL
Regression introduced in 8a90aad
(drop of USE_GD_IOCTX)
Secure with php_stream_can_cast to avoid segfault in php_stream_cast.
(encountered when imagecreatefromxpm with URL)
2013-06-21 14:11:04 +02:00
Pierre Joye
876b474c7d
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-06-20 22:19:53 +02:00
Pierre Joye
07e52857b5
fix #65070 , bgcolor does not use the same format as the input image with imagerotate
2013-06-20 22:19:33 +02:00
Remi Collet
60afd3fce4
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
skip test for bug #64936 when tokenizer not built
2013-06-20 08:42:30 +02:00
Remi Collet
9be591bdb5
skip test for bug #64936 when tokenizer not built
2013-06-20 08:42:07 +02:00
David Soria Parra
c1b8fbc112
Update credits
2013-06-19 22:03:18 +02:00
Anatol Belski
2873b5b6eb
added some tests based on bug #64395
2013-06-19 16:24:30 +02:00
Remi Collet
fb68e0fe63
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Related to bug #65047 (Test skip on client / server version)
2013-06-19 12:26:53 +02:00
Remi Collet
67bde2f8ac
Related to bug #65047 (Test skip on client / server version)
...
bug46274.phpt and bug46274_2.phpt
Make query silent (when server don't know bytea_output option)
bug_49985.phpt
Make result "locale" independent
2013-06-19 12:26:21 +02:00
Matteo Beccati
9b8259cdfa
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #65047 (Test skip on client / server version)
Remove broken client version checking
Clean up leftover file after the test
2013-06-19 11:53:05 +02:00
Matteo Beccati
c666239265
Fixed bug #65047 (Test skip on client / server version)
2013-06-19 11:48:03 +02:00
Matteo Beccati
25e9aa6b0a
Remove broken client version checking
2013-06-19 11:48:03 +02:00
Matteo Beccati
5edd530511
Clean up leftover file after the test
2013-06-19 11:48:03 +02:00
Xinchen Hui
bb9928c343
Merge branch 'PHP-5.4' into PHP-5.5
2013-06-19 11:17:44 +08:00
Xinchen Hui
2ce4bd7f2d
Fix test typo
2013-06-19 11:15:52 +08:00
Stanislav Malyshev
af5e2eaf8d
Merge branch 'pull-request/320'
...
* pull-request/320:
this is test 5 not 6
fix race condition
more shared names that create race conditions
change to a unique filename
more shared filenames
yet another shared filename
don't share a filename to stop race conditions
fix race condition for 2-4 and normalize names for others
fix race condition when running tests in parallel
clean up after test
Fix #64572 : Clean up after the test
Fix #64572 : Clean up after the test
2013-06-17 01:06:20 -07:00
Stanislav Malyshev
6b896fa57f
Merge branch 'pull-request/320'
...
* pull-request/320:
this is test 5 not 6
fix race condition
more shared names that create race conditions
change to a unique filename
more shared filenames
yet another shared filename
don't share a filename to stop race conditions
fix race condition for 2-4 and normalize names for others
fix race condition when running tests in parallel
clean up after test
Fix #64572 : Clean up after the test
Fix #64572 : Clean up after the test
2013-06-17 01:06:01 -07:00
Stanislav Malyshev
a080611e48
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Tests: PDO Mysql - update for fixed getColumnMeta()
fix bug #48724
2013-06-17 00:42:21 -07:00
Daniel Beardsley
5ac0ee30ce
Tests: PDO Mysql - update for fixed getColumnMeta()
...
The test has always been disabled... so it's never run anyway. Oh well.
2013-06-17 00:41:21 -07:00
Antony Dovgal
95cc763a14
fix bug #48724
...
PDO's getColumnMeta() doesn't return native_type for BIT, TINYINT and YEAR
2013-06-17 00:27:21 -07:00
Stanislav Malyshev
69d187de02
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
readline can output control codes
Bug #55694 : Update readline test to support attempted_completion_over variable
Bug #55694 : Expose attempted_completion_over variable from readline library
2013-06-17 00:17:06 -07:00
Stanislav Malyshev
248414f132
readline can output control codes
2013-06-17 00:15:31 -07:00
Hartmel
272c5edea4
Bug #55694 : Update readline test to support attempted_completion_over variable
2013-06-16 23:44:44 -07:00
Hartmel
ca3e0862db
Bug #55694 : Expose attempted_completion_over variable from readline library
2013-06-16 23:42:43 -07:00