Anatol Belski
2873b5b6eb
added some tests based on bug #64395
2013-06-19 16:24:30 +02:00
Remi Collet
04b2f8d53e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Related to bug #65047 (Test skip on client / server version)
2013-06-19 12:27:12 +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
77032bcd9c
Merge branch 'PHP-5.5'
...
* PHP-5.5:
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: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
ce1cb1f7a6
Merge branch 'PHP-5.5'
2013-06-19 11:17:55 +08: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
Nikita Popov
7713b8c2ac
GMP improvements
...
As per RFC https://wiki.php.net/rfc/operator_overloading_gmp
2013-06-17 17:59:12 +02:00
Stanislav Malyshev
1143f58a70
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Merge branch 'pull-request/320'
Merge branch 'pull-request/320'
2013-06-17 01:07:28 -07: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
a434251322
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Tests: PDO Mysql - update for fixed getColumnMeta()
fix bug #48724
2013-06-17 00:42:36 -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
a72fc256f4
Merge branch 'PHP-5.5'
...
* PHP-5.5:
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:28 -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
Xinchen Hui
875df12c0b
Merge branch 'PHP-5.5'
2013-06-17 13:25:04 +08:00
Xinchen Hui
aa2369f85a
Merge branch 'PHP-5.4' into PHP-5.5
2013-06-17 13:23:24 +08:00
Xinchen Hui
cfb1ffb4fa
Fix typo in test
2013-06-17 13:22:20 +08:00
Stanislav Malyshev
e3cd0d1417
Merge branch 'PHP-5.5'
...
* PHP-5.5:
add more tests for bug #64166
Move unsigned char declaration to top of block
trailing ws
Fix #64166 : quoted-printable-encode stream filter incorrectly discarding whitespace
Fix #64166 : quoted-printable-encode stream filter incorrectly discarding whitespace
2013-06-16 16:39:06 -07:00
Stanislav Malyshev
7d1fef15cf
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add more tests for bug #64166
Move unsigned char declaration to top of block
trailing ws
Fix #64166 : quoted-printable-encode stream filter incorrectly discarding whitespace
Fix #64166 : quoted-printable-encode stream filter incorrectly discarding whitespace
2013-06-16 16:38:49 -07:00
Stanislav Malyshev
7bb052ee3e
add more tests for bug #64166
2013-06-16 16:34:34 -07:00
Michael M Slusarz
0dc98208ee
Move unsigned char declaration to top of block
2013-06-16 16:04:29 -07:00
Michael M Slusarz
d9c034ee5e
trailing ws
2013-06-16 16:04:24 -07:00
Michael M Slusarz
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
Michael M Slusarz
600d6deef9
Fix #64166 : quoted-printable-encode stream filter incorrectly discarding whitespace
...
If trailing whitespace on a line is detected, mark the linebreak as a
soft linebreak.
2013-06-16 16:04:14 -07:00
Stanislav Malyshev
6db7e31fa6
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix bug #64936 - clean doc comment state at the beginning and end of the scan
ws fix
2013-06-16 15:30:44 -07:00
Stanislav Malyshev
ac343d5c1f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #64936 - clean doc comment state at the beginning and end of the scan
ws fix
Conflicts:
Zend/zend_language_scanner.c
Zend/zend_language_scanner.l
Zend/zend_language_scanner_defs.h
2013-06-16 15:29:25 -07:00
Stanislav Malyshev
2208447d42
Fix bug #64936 - clean doc comment state at the beginning and end of the scan
2013-06-16 15:22:23 -07:00
Anatol Belski
fd706595d4
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix test
2013-06-17 00:11:05 +02:00
Anatol Belski
3625b83aaa
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix test
2013-06-17 00:10:32 +02:00
Anatol Belski
b6dd1ec60d
fix test
...
breach introduced in ac40c0b562
2013-06-17 00:09:05 +02:00
Xinchen Hui
0842d5c06e
Merge branch 'PHP-5.5'
2013-06-16 22:57:01 +08:00
Xinchen Hui
6cd6349ff8
Merge branch 'PHP-5.4' into PHP-5.5
2013-06-16 22:56:22 +08:00
Xinchen Hui
49e57a3165
Fixed bug #63176 (Segmentation fault when instantiate 2 persistent PDO to the same db server)
2013-06-16 22:55:59 +08:00
Boris Lytochkin
3457096758
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix typo in test
2013-06-16 00:10:06 +04:00
Boris Lytochkin
3dd2de3f45
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix typo in test
2013-06-16 00:09:55 +04:00
Boris Lytochkin
7457867ba8
fix typo in test
2013-06-16 00:09:18 +04:00
Anatol Belski
c1772cc3df
Merge branch 'PHP-5.5'
...
* PHP-5.5:
ensure the error_reporting level to get expected notice
2013-06-12 13:15:32 +02:00
Anatol Belski
a0cb61b292
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
ensure the error_reporting level to get expected notice
2013-06-12 13:15:18 +02:00
Anatol Belski
ed2690477c
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
ensure the error_reporting level to get expected notice
2013-06-12 13:14:53 +02:00
Anatol Belski
cd1b44c4b6
ensure the error_reporting level to get expected notice
2013-06-12 13:13:48 +02:00
Anatol Belski
00ba7d416f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fixed tests
2013-06-11 12:40:30 +02:00
Anatol Belski
cb542d3c83
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed tests
2013-06-11 12:39:50 +02:00
Anatol Belski
1cc750493f
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
fixed tests
2013-06-11 12:39:28 +02:00
Anatol Belski
eccc05fc44
fixed tests
2013-06-11 12:38:49 +02:00
Anatol Belski
251ec84a97
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
missing tests for bug #53437
2013-06-11 11:22:55 +02:00
Anatol Belski
f16143f5ac
missing tests for bug #53437
2013-06-11 11:19:57 +02:00
Anatol Belski
8b74d46026
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fixed EOL
2013-06-11 08:33:19 +02:00
Anatol Belski
bd4f6ad8a0
fixed EOL
2013-06-11 08:32:54 +02:00
Anatol Belski
c90e95baf6
Merge branch 'PHP-5.5'
...
* PHP-5.5:
added closing ?>
2013-06-11 08:26:07 +02:00
Anatol Belski
28e264db2a
added closing ?>
2013-06-11 08:25:38 +02:00
Stanislav Malyshev
8ac131503d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Merge branch 'pull-request/341'
Merge branch 'pull-request/341'
2013-06-10 14:31:57 -07:00
Stanislav Malyshev
4427d1dcfd
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:30:59 -07:00
Stanislav Malyshev
02e4d7a290
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:30:59 -07:00
Stanislav Malyshev
ac40c0b562
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:20:18 -07:00
Anatol Belski
d7c943e2a1
Merge branch 'PHP-5.5'
...
* PHP-5.5:
split the test for 32 and 64 bit
2013-06-10 22:49:56 +02:00
Anatol Belski
ec79075394
split the test for 32 and 64 bit
2013-06-10 22:49:30 +02:00
Stanislav Malyshev
09bc6d7cf6
Merge branch 'PHP-5.5'
...
* PHP-5.5:
typo fixes (argument)
typo fixes (accommodate, parameter)
2013-06-10 13:37:56 -07:00
Stanislav Malyshev
84e35fb2e0
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
typo fixes (argument)
typo fixes (accommodate, parameter)
2013-06-10 13:36:41 -07:00
Veres Lajos
04145dc2aa
typo fixes (argument)
2013-06-10 13:36:17 -07:00
Veres Lajos
ed2e84e239
typo fixes (accommodate, parameter)
2013-06-10 13:36:03 -07:00
Anatol Belski
0f9cf35315
Backported the fix for bug #53437
2013-06-10 19:52:29 +02:00
Anatol Belski
88c2dbe5fc
Backported the fix for bug #53437
2013-06-10 19:48:18 +02:00
Anatol Belski
b80b8373af
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fixed the test
2013-06-10 18:31:40 +02:00
Anatol Belski
760c85a70a
fixed the test
2013-06-10 18:31:18 +02:00
Anatol Belski
44d9060648
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix a BC breach related to bug #53437
2013-06-10 17:50:13 +02:00
Anatol Belski
02f3922047
Fix a BC breach related to bug #53437
...
days and special_amount properties are exported as int again
2013-06-10 17:48:13 +02:00
Jakub Vrana
46d3738d0a
Fix image method signatures
2013-06-10 02:24:03 -07:00
Jakub Vrana
b787fdebba
Fix image method signatures
2013-06-10 02:13:13 -07:00
Stanislav Malyshev
1355908149
Merge branch 'PHP-5.5'
...
* PHP-5.5:
PHPTests for the DOMDocument::loadHTMLfile method. They cover - The basic behaviour - When the method receives as argument a file which doesn't exist - When the argument is an empty string - When an empty file is loaded - When a not-well formed html file is loaded
2013-06-10 01:53:36 -07:00
Stanislav Malyshev
7a2d9690fe
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
PHPTests for the DOMDocument::loadHTMLfile method. They cover - The basic behaviour - When the method receives as argument a file which doesn't exist - When the argument is an empty string - When an empty file is loaded - When a not-well formed html file is loaded
2013-06-10 01:53:29 -07:00
Antonio Diaz Ruiz
8a8bef1b73
PHPTests for the DOMDocument::loadHTMLfile method.
...
They cover
- The basic behaviour
- When the method receives as argument a file which doesn't exist
- When the argument is an empty string
- When an empty file is loaded
- When a not-well formed html file is loaded
It also includes 2 auxilary files
- An empty html file
- A not well formed html file
2013-06-10 01:50:00 -07:00
Dmitry Stogov
14a943ae86
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Callback has to be restored in MSHUTDOWN
2013-06-10 12:34:34 +04:00
Dmitry Stogov
731b4a3fa4
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Callback has to be restored in MSHUTDOWN
2013-06-10 12:34:08 +04:00
Dmitry Stogov
336a8e1943
Callback has to be restored in MSHUTDOWN
2013-06-10 12:32:53 +04:00
Dmitry Stogov
738dfc69e7
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed comments
2013-06-10 12:06:14 +04:00
Dmitry Stogov
53e6529203
Fixed comments
2013-06-10 12:05:20 +04:00
Dmitry Stogov
95d88cc66a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Avoid multiple allocations of the same key in different processes
2013-06-10 11:44:54 +04:00
Dmitry Stogov
23a9bb09ba
Avoid multiple allocations of the same key in different processes
2013-06-10 11:43:03 +04:00
Dmitry Stogov
456ef2ebfa
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Compact HashTables before storing them in shared memory
Conflicts:
ext/opcache/ZendAccelerator.c
2013-06-10 11:25:41 +04:00
Dmitry Stogov
540488bf55
Compact HashTables before storing them in shared memory
2013-06-10 11:22:19 +04:00
Dmitry Stogov
841e1f0364
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Use size_t instead of int
2013-06-10 10:37:53 +04:00
Dmitry Stogov
2e9d3e8b39
Use size_t instead of int
2013-06-10 10:36:35 +04:00
Xinchen Hui
00c7440b81
Merge branch 'PHP-5.5'
2013-06-09 22:26:18 +08:00
Xinchen Hui
3f229f4364
Merge branch 'PHP-5.4' into PHP-5.5
2013-06-09 22:25:49 +08:00
Xinchen Hui
f338510c94
Merge branch 'PHP-5.3' into PHP-5.4
2013-06-09 22:25:07 +08:00
Xinchen Hui
75c57122e3
Fixed bug #64997 (Segfault while using RecursiveIteratorIterator on 64-bits systems)
2013-06-09 22:24:48 +08:00
Matteo Beccati
2c0f09540e
Fixed signedness warning
2013-06-07 09:38:58 +02:00
Matteo Beccati
19ead23e8e
Fixed bug #63657 (pgsqlCopyFrom/To methods use Postgres < 7.3 syntax)
...
Although still supported (for now), I've replaced with pre-9.0 syntax.
Still not cutting edge, but it works with any version PDO_pgsql is
compatible with (7.4+) and will possibly keep working for longer than
what we already had.
2013-06-07 09:36:54 +02:00
Anatol Belski
c6b569011a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
updated NEWS
updated NEWS
Fixed bug #64934 Apache2 TS crash with get_browser()
2013-06-06 18:53:41 +02:00
Anatol Belski
bbdbef40db
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated NEWS
Fixed bug #64934 Apache2 TS crash with get_browser()
2013-06-06 18:52:39 +02:00
Anatol Belski
25cae37b13
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #64934 Apache2 TS crash with get_browser()
2013-06-06 18:51:32 +02:00
Anatol Belski
1aee7ad636
Fixed bug #64934 Apache2 TS crash with get_browser()
...
In favour of reading the browscap.ini into a true global var
only once in MINIT, the price for that is to deep copy the
any data from it.
2013-06-06 18:49:04 +02:00
Stanislav Malyshev
3c8c200d0a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix CVE-2013-2110 - use correct formula to calculate string size
2013-06-04 22:01:02 -07:00
Stanislav Malyshev
785f4c5fc6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix CVE-2013-2110 - use correct formula to calculate string size
2013-06-04 22:00:45 -07:00
Stanislav Malyshev
efdeec3c0e
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
fix CVE-2013-2110 - use correct formula to calculate string size
2013-06-04 21:58:44 -07:00
Stanislav Malyshev
93e0d78ec6
fix CVE-2013-2110 - use correct formula to calculate string size
2013-06-04 21:56:33 -07:00
Matteo Beccati
b62b8b4528
Fixed Bug #42614 (PDO_pgsql: add pg_get_notify support)
2013-06-05 01:58:55 +02:00
Matteo Beccati
baabd11929
Refactored custom PDO_pgsql methods to trigger errors/exceptions
...
BC Break: the custom methods were previously just return false on
failure. Now they throw an exception with a proper error message.
An hopefully welcome improvement, but some application might be
depending on the old behaviour. FWIW the PDO::pgsqlCopy* methods
are not documented, even though they are available since 5.3.x.
2013-06-05 01:58:37 +02:00
Matteo Beccati
1e36e45d97
Allow PDO drivers custom methods to trigger errors/exceptions
...
Moved a few definitions from php_pdo_int.h to a new php_pdo_error.h
header file that can be included if drivers need PDO's own error
handling to be triggered within custom methods (e.g. PDO::pgsqlLOBOpen).
2013-06-04 16:49:16 +02:00
Stanislav Malyshev
b144c26319
Merge branch 'PHP-5.5'
...
* PHP-5.5:
news for dblib fixes
FIX BUG #55647 , #60512 , #60512 , #61900 , #64338 , #64808 , #63638
Fix PDO_DBLIB bugs: #64338 , #64808 , #63638
Conflicts:
ext/pdo_dblib/dblib_driver.c
ext/pdo_dblib/dblib_stmt.c
2013-06-03 22:03:25 -07:00
Stanislav Malyshev
74e52eaea9
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
news for dblib fixes
Fix PDO_DBLIB bugs: #64338 , #64808 , #63638
Conflicts:
ext/pdo_dblib/dblib_driver.c
ext/pdo_dblib/dblib_stmt.c
2013-06-03 22:00:51 -07:00
Stanley Sufficool
d8f938c784
FIX BUG #55647 , #60512 , #60512 , #61900 , #64338 , #64808 , #63638
...
Return an error on passwords longer than 30 chars instead of segfault.
Set error and message handlers properly.
Do not segfault in out of bound colnums in getColumnMeta()
Fix DBSETOPT to use a blank string instead of NULL to stop FreeTDS complaints.
Use DBSETLDBNAME for compatibillity with SQL Azure.
2013-06-03 20:34:47 -07:00
Stanley Sufficool
5a04ab9a54
Fix PDO_DBLIB bugs: #64338 , #64808 , #63638
...
Synchronize with master
2013-06-03 20:02:08 -07:00
Remi Collet
57dd91be82
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed Bug #64962 imagerotate produce corrupted image
2013-06-03 15:02:43 +02:00
Remi Collet
3579e81200
Fixed Bug #64962 imagerotate produce corrupted image
...
See https://bitbucket.org/libgd/gd-libgd/issue/67/problem-with-gdrotate
This computation need to be done in signed range.
2013-06-03 15:01:48 +02:00
Remi Collet
809b13d67b
Merge branch 'PHP-5.5'
...
* PHP-5.5:
NEWS
Fixed Bug #64961 segfault in imagesetinterpolation
2013-06-03 14:17:22 +02:00
Remi Collet
99ea60c2dd
Fixed Bug #64961 segfault in imagesetinterpolation
...
enum type are not long ;) so cannot be used as zend_parse_parameters arg.
2013-06-03 14:15:18 +02:00
Matteo Beccati
760099c2e6
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Clean up leftover test files
Improved test portability so that it doesn't fail with pdo_pgsql
Fix PDO::inTransaction() test for pgsql
2013-06-02 13:39:45 +02:00
Matteo Beccati
ad135fc69f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Clean up leftover test files
Improved test portability so that it doesn't fail with pdo_pgsql
Fix PDO::inTransaction() test for pgsql
2013-06-02 13:39:38 +02:00
Matteo Beccati
7360f0f1e6
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Clean up leftover test files
2013-06-02 13:39:19 +02:00
Matteo Beccati
2463e89794
Clean up leftover test files
2013-06-02 13:38:43 +02:00
Matteo Beccati
a98359b7b9
Improved test portability so that it doesn't fail with pdo_pgsql
2013-06-02 13:32:48 +02:00
Nikita Popov
cbf90b1a90
Fix PDO::inTransaction() test for pgsql
...
inTransaction() nowadays casts the in_transaction result to boolean.
I'm not sure whether the INERROR state should result in true or false.
For now I went with the result that we actually get.
2013-06-02 13:28:30 +02:00
Matteo Beccati
ab25fcb2a1
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #64609 (pg_convert enum type support)
2013-06-02 06:34:14 +02:00
Matteo Beccati
d5a1c0cae2
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #64609 (pg_convert enum type support)
2013-06-02 06:34:05 +02:00
Matteo Beccati
51c065f611
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #64609 (pg_convert enum type support)
2013-06-02 06:33:54 +02:00
Matteo Beccati
25aae37229
Fixed bug #64609 (pg_convert enum type support)
2013-06-02 06:29:35 +02:00
Matteo Beccati
924605eeb4
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #62857 (bytea test failures)
2013-06-01 23:23:31 +02:00
Matteo Beccati
d9c2eecec0
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #62857 (bytea test failures)
2013-06-01 23:23:14 +02:00
Matteo Beccati
de42833115
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #62857 (bytea test failures)
2013-06-01 23:22:50 +02:00
Matteo Beccati
79803bebde
Fixed bug #62857 (bytea test failures)
...
Postgres 9.1+ test fixes. Tests were failing due to the default
standard_conforming_strings GUC being changed to on. Also the
pg_escape_bytea test was encoding the data before estabilishing
a connection, thus falling back to the old escaping type which
isn't properly handled by the backend when using a default
configuration.
I haven't updated the NEWS file as it's just test fixes.
2013-06-01 23:15:48 +02:00
Stanley Sufficool
c34a2757db
FIX BUG #55647
...
PDO DBLIB was returning false if there were no results after a
statement was executed. This should be the fetch methods response
not the execute method response.
2013-06-01 00:38:09 -07:00
Stanley Sufficool
d9be9e0231
FIX BUG #60512 (the correct way this time)
...
Last fix just truncated the password. This fixes the message
handler per the bug report.
2013-06-01 00:03:44 -07:00
Stanley Sufficool
3b54de3db0
FIX BUG #60512
...
FreeTDS will segfault when passwords over 30 characters are used.
Truncate the password and let the server return an error if the
password is still invalid.
2013-05-31 23:58:16 -07:00
Stanley Sufficool
317653e694
FIX BUG #61900
...
PDO DBLIB was not setting error and message handlers when FreeTDS was used.
Updated to set error and message handlers the same way as mssql.
2013-05-31 23:24:57 -07:00
Stanley Sufficool
0e2bcf3373
FIX BUG #64338 , #64808 , #63638
...
PDO DBLIB would segfault on getcolumn meta when colno was
out of bounds. DBLIB connection specified null arg to dbsetopt
per Microsoft technical docs, but FreeTDS complains. The SQL USE
statement was invalid for SQL Azure, use DBSETLDBNAME instead.
2013-05-31 22:53:08 -07:00
Matteo Beccati
d22c7368e7
Merge branch 'PHP-5.5'
2013-05-31 16:27:16 +02:00
Matteo Beccati
d19e46d9d4
Merge branch 'PHP-5.4' into PHP-5.5
2013-05-31 16:27:01 +02:00
Matteo Beccati
a3b5b42e77
Merge branch 'PHP-5.3' into PHP-5.4
2013-05-31 16:26:54 +02:00
Matteo Beccati
510498947e
Slightly edited tests and fix for bug #62024
2013-05-31 16:19:58 +02:00
Matheus Degiovani
df6ca450ce
Fixed bug #62024 (unable to run consecutive prepared querys with null values)
...
Credits to james@kenjim.com for the patch.
2013-05-31 14:30:57 +02:00
Matheus Degiovani
65d233f06c
Fixed bug #64037 (wrong value returned when using a negative numeric field equal to the scale)
2013-05-31 14:30:51 +02:00
Remi Collet
f8b4c0815a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
NEWS
NEWS
Fixed Bug #64949 (Buffer overflow in _pdo_pgsql_error)
Use size_t everywhere instead
This needs to be a long Otherwise we are limited to a 32G opcache segment
2013-05-31 08:46:18 +02:00
Remi Collet
f3ca1d3125
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS
Fixed Bug #64949 (Buffer overflow in _pdo_pgsql_error)
2013-05-31 08:45:32 +02:00
Remi Collet
2dd67abb7d
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed Bug #64949 (Buffer overflow in _pdo_pgsql_error)
2013-05-31 08:44:33 +02:00
Remi Collet
1c623e3b07
Fixed Bug #64949 (Buffer overflow in _pdo_pgsql_error)
...
There is a lot of call such as:
pdo_pgsql_error(dbh, PGRES_FATAL_ERROR, "Copy command failed");
Where the 3rd paramater is a error message string where a sqlstate (5 chars)
is expected. This cause a segfault in copy_from.phpt and copy_to.phpt.
This is only a sanity check to avoid buffer overflow, but obviously this
calls need to be fixed (using NULL or a correct sqlstate).
2013-05-31 08:39:32 +02:00
Stanley Sufficool
0074cd2675
pdo_dblib: fix bug #64522DBLIB statement destructor was being called late and clobbered results from subsequent statement objects sharing the same connection
2013-05-30 21:59:00 -07:00
Rasmus Lerdorf
4c762152bf
Use size_t everywhere instead
2013-05-29 14:34:53 -07:00
Rasmus Lerdorf
e02add77fc
Use size_t everywhere instead
2013-05-29 14:34:22 -07:00
Rasmus Lerdorf
80c13e9965
This needs to be a long
...
Otherwise we are limited to a 2G opcache segment
2013-05-29 14:26:42 -07:00
Rasmus Lerdorf
29ee4b81f2
This needs to be a long
...
Otherwise we are limited to a 32G opcache segment
2013-05-29 14:22:43 -07:00
Dmitry Stogov
ad90e90d90
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
Fix #64745 hash_pbkdf2 truncation issue
2013-05-29 00:02:37 +04:00
Dmitry Stogov
9e019f1099
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
Fix #64745 hash_pbkdf2 truncation issue
2013-05-29 00:02:13 +04:00
Dmitry Stogov
458f02c471
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed crash during search in empty persistent HashTable
2013-05-29 00:01:35 +04:00
Dmitry Stogov
6008ac8e32
Fixed crash during search in empty persistent HashTable
2013-05-28 23:45:36 +04:00
Anthony Ferrara
2129c70896
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix #64745 hash_pbkdf2 truncation issue
2013-05-28 15:38:11 -04:00
Anthony Ferrara
540a5a52e8
Fix #64745 hash_pbkdf2 truncation issue
...
When using hash_pbkdf2 with hex output and 0 length (auto), it incorrectly
truncates the result to 1/2 the expected result.
2013-05-28 15:30:45 -04:00
Pierre Joye
8059ec1832
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix #64898imagerotate is broken with bilinear interpolation
2013-05-27 09:22:00 +02:00
Pierre Joye
2f01e06786
fix #64898imagerotate is broken with bilinear interpolation
2013-05-27 09:21:41 +02:00
Anatol Belski
6e081f8a82
Merge branch 'PHP-5.5'
...
* PHP-5.5:
reduced the file size even more
2013-05-25 00:11:09 +02:00
Anatol Belski
b262787ef9
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
reduced the file size even more
2013-05-25 00:10:49 +02:00
Anatol Belski
bcdac7526d
reduced the file size even more
...
the first second is what at least has to be
2013-05-25 00:09:32 +02:00
Anatol Belski
3a3828669f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #64916 finfo testcase contains copyrighted music.
2013-05-25 00:02:34 +02:00
Anatol Belski
fbdce3b6f6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #64916 finfo testcase contains copyrighted music.
2013-05-25 00:02:09 +02:00
Anatol Belski
2d386db878
Fixed bug #64916 finfo testcase contains copyrighted music.
...
I wasn't able to produce a file causing exactly the same crash.
However the first three seconds of the originally reported
file are pretty enough to repro bug #64830 . That reduces its
size to 72k.
2013-05-24 23:58:31 +02:00
Remi Collet
c50cef1dc5
Fixed bug #64895 Integer overflow in SndToJewish
2013-05-22 08:30:50 +02:00
Remi Collet
88db679742
Merge branch 'PHP-5.5'
...
* PHP-5.5:
NEWS
NEWS
Fixed bug #64895 Integer overflow in SndToJewish
2013-05-22 08:30:00 +02:00
Remi Collet
d64e8dd7a4
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS
Fixed bug #64895 Integer overflow in SndToJewish
2013-05-22 08:29:30 +02:00
Remi Collet
73eedaf6f7
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #64895 Integer overflow in SndToJewish
2013-05-22 08:29:08 +02:00
Remi Collet
fc2a9d6e47
Fixed bug #64895 Integer overflow in SndToJewish
2013-05-22 08:28:05 +02:00
Remi Collet
57b35f1b0d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Integer overflow in SndToJewish leads to php hang AT least in (inputDay is long, metonicCycle is int): metonicCycle = (inputDay + 310) / 6940;
2013-05-21 18:09:22 +02:00
Remi Collet
4840ff0f05
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Integer overflow in SndToJewish leads to php hang AT least in (inputDay is long, metonicCycle is int): metonicCycle = (inputDay + 310) / 6940;
2013-05-21 18:09:02 +02:00
Remi Collet
646ebc2cb9
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Integer overflow in SndToJewish leads to php hang AT least in (inputDay is long, metonicCycle is int): metonicCycle = (inputDay + 310) / 6940;
2013-05-21 18:08:45 +02:00
Remi Collet
4828f7343b
Integer overflow in SndToJewish leads to php hang
...
AT least in (inputDay is long, metonicCycle is int):
metonicCycle = (inputDay + 310) / 6940;
So large value give strange (negative) results or php hangs.
This is patch already applied in some linux distro.
2013-05-21 18:04:17 +02:00
Andrey Hristov
e19b7c2b57
Merge branch 'PHP-5.5'
2013-05-21 13:28:09 +02:00
Andrey Hristov
378a5f9bfe
updates
2013-05-21 13:27:45 +02:00
Pierre Joye
9ef6b30dc3
Merge branch 'PHP-5.5'
...
* PHP-5.5:
entry for #64214
other fix for #64214 , unmodified file may not have old fp set, causing other possible crashes
2013-05-17 11:51:18 +02:00
Pierre Joye
40d5458eff
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
entry for #64214
other fix for #64214 , unmodified file may not have old fp set, causing other possible crashes
2013-05-17 11:50:52 +02:00
Pierre Joye
b142e8825f
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2013-05-17 11:49:45 +02:00
Pierre Joye
aff65a0346
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
entry for #64214
other fix for #64214 , unmodified file may not have old fp set, causing other possible crashes
2013-05-17 11:49:33 +02:00
Pierre Joye
3eb1745643
other fix for #64214 , unmodified file may not have old fp set, causing other possible crashes
2013-05-17 11:45:13 +02:00
Sara Golemon
cfd1045822
Add optional second arg to unserialize()
...
Returns the number of bytes consumed by reference for
streaming unserialization.
Actual unserialization behavior is not modified at all.
The need for this came up while trying to parse SplDoublyLinkedList's
serialization format which uses a non-standard stream of serialized values.
2013-05-16 15:18:35 -07:00
Anatol Belski
bc656cde04
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed error handling for ext/sockets under win
2013-05-16 19:29:42 +02:00
Anatol Belski
d565e8f0eb
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed error handling for ext/sockets under win
2013-05-16 19:29:25 +02:00
Anatol Belski
8dec06ea2a
Fixed error handling for ext/sockets under win
...
WSAGetLastError() must be the very next call after a socket
function had an invalid return. Any function call inbetween
will clear the error information.
2013-05-16 19:23:31 +02:00
David Soria Parra
c5841f8cb7
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix array_colum segfault
2013-05-15 14:43:03 +02:00
David Soria Parra
139e9824ad
Fix array_colum segfault
...
Separate zval to avoid gc from freeing
2013-05-15 14:42:39 +02:00
Anatol Belski
8fa8591cfa
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fixe preprocessor definition
2013-05-15 14:24:46 +02:00
Anatol Belski
082ee90b9b
fixe preprocessor definition
2013-05-15 14:24:21 +02:00
Anatol Belski
d8e44e3d70
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix unitialized vars when sql.safe_mode=1
more check for php_stream_fopen_tmpfile failure
2013-05-15 11:17:57 +02:00
Anatol Belski
077b575d51
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix unitialized vars when sql.safe_mode=1
more check for php_stream_fopen_tmpfile failure
2013-05-15 11:17:18 +02:00
Anatol Belski
de82e7edf7
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix unitialized vars when sql.safe_mode=1
more check for php_stream_fopen_tmpfile failure
2013-05-15 11:14:58 +02:00
Anatol Belski
86db5fb4c2
Fix unitialized vars when sql.safe_mode=1
...
which can break the subsequent mysqlnd_connect() call
2013-05-15 11:12:17 +02:00
Pierre Joye
ba1af29805
more check for php_stream_fopen_tmpfile failure
2013-05-14 16:45:11 +02:00
Andrey Hristov
1f97fde89e
Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5
2013-05-14 13:01:18 +02:00
Andrey Hristov
09cc4484a2
Merge branch 'master' of ssh://git.php.net/php-src
2013-05-14 12:57:19 +02:00
Andrey Hristov
47c5ba4c0c
Merge branch 'PHP-5.5'
...
Conflicts:
NEWS
2013-05-14 12:57:02 +02:00
Andrey Hristov
9d2dda9058
Fix for Bug #64394 MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS undeclared when using Connector/C
2013-05-14 11:26:35 +02:00
Anatol Belski
b1480987f9
Merge branch 'PHP-5.5'
...
* PHP-5.5:
updated libmagic.patch after fix for #64830
2013-05-14 11:16:17 +02:00