clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-03 15:56:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
74,842 Commits 494 Branches 1,367 Tags 813 MiB
875df12c0b
Commit Graph

74842 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
David Soria Parra
83580ea956 Merge branch 'PHP-5.5' 
* PHP-5.5:
  News update
  PHP 5.5.0RC3 NEWS
 2013-06-05 23:09:27 +02:00
David Soria Parra
c649186c31 News update 2013-06-05 23:08:48 +02:00
David Soria Parra
aef5295756 PHP 5.5.0RC3 NEWS 2013-06-05 23:06:51 +02:00
Johannes Schlüter
9a9f42767d Merge branch 'PHP-5.5' 2013-06-05 16:35:27 +02:00
Johannes Schlüter
fdeefc466e Merge branch 'PHP-5.4' into PHP-5.5 2013-06-05 16:35:14 +02:00
Johannes Schlüter
5ee047b486 Merge branch 'PHP-5.3' into PHP-5.4 2013-06-05 16:34:54 +02:00
Johannes Schlüter
ec3bcbcb5a Add NEWS for PHP 5.3.26 2013-06-05 16:34:18 +02:00
Xinchen Hui
ecfc3599a7 Merge branch 'PHP-5.5' 2013-06-05 17:32:09 +08:00
Xinchen Hui
7da648ff2f Update NEWS 2013-06-05 17:30:57 +08:00
Xinchen Hui
e89537f2a3 Merge branch 'PHP-5.4' into PHP-5.5 2013-06-05 17:30:09 +08:00
Xinchen Hui
3c93402f86 Update NEWS 2013-06-05 17:29:04 +08:00
Xinchen Hui
f597f5561e Merge branch 'PHP-5.3' into PHP-5.4 2013-06-05 17:26:10 +08:00
Xinchen Hui
3c87945c95 Fixed bug #64960 (Segfault in gc_zval_possible_root) 2013-06-05 17:25:00 +08: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
Stanislav Malyshev
90bb28726b news for dblib fixes 2013-06-03 21:54:50 -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
245e103ed3 NEWS 2013-06-03 14:17:00 +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