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,644 Commits 494 Branches 1,367 Tags 813 MiB
3b54de3db0
Commit Graph

74644 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
598e2690b8 Merge branch 'pull-request/309' into PHP-5.3 2013-05-31 16:26:38 +02:00
Matteo Beccati
bf4a034e3e NEWS 2013-05-31 16:26:06 +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
c829895a1a NEWS 2013-05-31 08:45:54 +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
0c9f11758f NEWS 2013-05-31 08:45:09 +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
029c1da846 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed incorrect argument number
 2013-05-29 11:15:27 +04:00
Dmitry Stogov
7e00d0994f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed incorrect argument number
 2013-05-29 11:14:15 +04:00
Dmitry Stogov
8b515fa00a Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed incorrect argument number

Conflicts:
	Zend/zend_compile.c
 2013-05-29 11:12:43 +04:00
Dmitry Stogov
13e5c97ffd Fixed incorrect argument number 2013-05-29 11:09:55 +04: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
76ad52ccc5 Merge branch 'PHP-5.5' 
* PHP-5.5:
  NEWS
  Fixed Bug #64915 (error_log ignored when daemonize=0)
 2013-05-24 12:11:16 +02:00
Remi Collet
af13dded5c NEWS 2013-05-24 12:11:04 +02:00
Remi Collet
433731d463 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed Bug #64915 (error_log ignored when daemonize=0)
 2013-05-24 12:10:39 +02:00
Remi Collet
9f6ca9bc64 Fixed Bug #64915 (error_log ignored when daemonize=0) 
Use configured error_log file when stderr is not a tty.
So only use tty during interactive debug run.
 2013-05-24 12:09:05 +02:00
David Soria Parra
cd23df35b2 Merge branch 'PHP-5.5' 
* PHP-5.5:
  News for upcoming RC3 if necessary
  News for RC2
 2013-05-23 00:57:30 +02:00
David Soria Parra
2df1067036 News for upcoming RC3 if necessary 2013-05-23 00:44:42 +02:00
David Soria Parra
aa5f19cffb News for RC2 2013-05-23 00:44:08 +02:00
Johannes Schlüter
925a71e583 Merge branch 'PHP-5.5' 2013-05-22 17:20:49 +02:00
Johannes Schlüter
4fe74f14c4 Merge branch 'PHP-5.4' into PHP-5.5 2013-05-22 17:19:58 +02:00
Johannes Schlüter
cd74b7d57e Merge branch 'PHP-5.3' into PHP-5.4 2013-05-22 17:15:27 +02:00