2c3f6dcdb6
Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4
...
Conflicts:
NEWS
2013-07-08 20:28:51 +02:00
9fc38183b7
Fixed segfault in mysqlnd when doing long prepare
2013-07-08 20:23:32 +02:00
e4a28b7b7b
Merge branch 'PHP-5.3' into PHP-5.4
...
# By Rob Richards (1)
* PHP-5.3:
truncate results at depth of 255 to prevent corruption
2013-07-06 07:59:20 -04:00
7d163e8a08
truncate results at depth of 255 to prevent corruption
2013-07-06 07:53:07 -04:00
7549beb102
- Fixed build on FreeTDS 0.82
2013-07-03 15:02:03 -03:00
5bc7e597d9
Make sure return value is initialised in case transaction startup fails
2013-07-03 17:08:14 +02:00
0265c2d961
Make sure result is initilized
...
Practically this could only be an issue when overriding mysqlnd from
an extension, but makes static analysis happy
2013-07-03 16:53:09 +02:00
f4ce5e7fb6
Fixed Bug #65142 Missing phar man page
...
Simple man page from phar help output.
2013-07-02 10:46:50 +02:00
743c4864eb
Fixed mysql tests parsing phpinfo()
2013-07-02 08:23:33 +02:00
87dda666c7
Fixed bug #35703 : when session_name("123") consist only digits, should warning
2013-06-29 11:35:55 +09:00
ef63334fa6
Fixed bug #49175 : mod_files.sh does not support hash bits
2013-06-29 11:35:55 +09:00
e46beabe8f
Merge branch 'bug61860' into PHP-5.4
...
* bug61860:
small optimization
fix bug #61860 : use USearch for searches, it does the right thing
2013-06-28 13:54:57 -07:00
3becd3879f
Add a __wakeup() method to SplFixedArray, thereby fixing serialising an
...
SplFixedArray object and bug #60560 (SplFixedArray un-/serialize, getSize(),
count() return 0, keys are strings).
2013-06-28 13:50:33 -07:00
ce8c023910
Fix bug #62535 - $_SESSION[$key]["cancel_upload"] doesn't work as documented
...
When uploading multiple files, the array in the session where the progress
data is stored (and cancel_upload key is set) was overwritten whenever the
progress data was updated, so pending uploads would proceed anyway.
2013-06-27 19:05:23 +01:00
fa8611c81e
Fixed bug #65136 (RecursiveDirectoryIterator segfault)
2013-06-27 12:37:57 +08:00
60dcc5851f
- Fixed bug #64467 (Segmentation fault after imap_reopen failure) patch by: askalski at gmail dot com
2013-06-26 19:15:19 -03:00
7e33b5d2fa
- Fixed bug #63409 (php-dba function test fails on big-endian machine) patch by: tianhonglouis at gmail dot com
2013-06-26 13:50:37 -03:00
f477ad22c2
- Fixed test
2013-06-26 13:36:36 -03:00
b34e8d2e3e
add new test
2013-06-26 16:44:26 +02:00
6c8cef3ca4
Fixed bug #65015 (pg_send_query does not flush send buffer) patch submitted by: adam at vektah dot net
2013-06-26 16:17:57 +09:00
4289696828
- Fixed bug #62475 (variant_* functions causes crash when null given as an argument)
2013-06-25 21:36:50 -03:00
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
2ab53f4b5e
Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
2013-06-25 18:01:46 -03:00
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
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
38eb909d06
Fixed Bug #61828 (Memleak when calling Directory(Recursive)Iterator/Spl(Temp)FileObject ctor twice)
2013-06-25 13:38:27 +08:00
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
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
e3d625bc4e
small optimization
2013-06-23 23:52:28 -07:00
a0d48e01ed
seems to be working fine for me on 32-bit
2013-06-23 23:36:43 -07:00
8aba119f55
fix bug #61860 : use USearch for searches, it does the right thing
2013-06-23 23:24:12 -07:00
860a5c4b01
Fix bug #62759 : Buggy grapheme_substr() on edge case
2013-06-23 21:26:16 -07:00
a0b4348abc
Implements feature Bug #63472 ability to set SO_BINDTODEVICE on socket.
2013-06-23 15:20:54 -07:00
9be591bdb5
skip test for bug #64936 when tokenizer not built
2013-06-20 08:42:07 +02:00
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
c666239265
Fixed bug #65047 (Test skip on client / server version)
2013-06-19 11:48:03 +02:00
25e9aa6b0a
Remove broken client version checking
2013-06-19 11:48:03 +02:00
5edd530511
Clean up leftover file after the test
2013-06-19 11:48:03 +02:00
2ce4bd7f2d
Fix test typo
2013-06-19 11:15:52 +08:00
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
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
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
248414f132
readline can output control codes
2013-06-17 00:15:31 -07:00
272c5edea4
Bug #55694 : Update readline test to support attempted_completion_over variable
2013-06-16 23:44:44 -07:00
ca3e0862db
Bug #55694 : Expose attempted_completion_over variable from readline library
2013-06-16 23:42:43 -07:00
cfb1ffb4fa
Fix typo in test
2013-06-17 13:22:20 +08:00
7bb052ee3e
add more tests for bug #64166
2013-06-16 16:34:34 -07:00
0dc98208ee
Move unsigned char declaration to top of block
2013-06-16 16:04:29 -07:00
d9c034ee5e
trailing ws
2013-06-16 16:04:24 -07:00
b5b0a53b09
Fix #64166 : quoted-printable-encode stream filter incorrectly discarding whitespace
...
Second attempt: need to use lookaheadto determine whether to encode ws
2013-06-16 16:04:19 -07:00
Andrey Hristov