archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-17 22:48:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
99679 commits 526 branches 1434 tags 873 MiB
Commit graph

43840 commits

Author SHA1 Message Date
Adam Baratz
0a2c02cb57 Fix #73396: bigint columns are returned as strings 2016-10-27 13:52:59 -04:00
Adam Baratz
886e721356 Remove unneeded macro check. This "hack" is replicated in php_pdo_dblib_int.h. 2016-10-27 12:15:45 -04:00
Adam Baratz
3d35f0b3b2 remove unread var 2016-10-27 12:15:01 -04:00
Adam Baratz
6b931b813f add myself to pdo_dblib CREDITS 2016-10-27 12:14:12 -04:00
Andrea Faulds
d8f27b2be8 Merge branch 'DedupNANINF' 2016-10-26 16:46:36 +01:00
Anatol Belski
356c162f54 Merge branch 'PHP-7.1' 
* PHP-7.1:
  make config.w32 compatible with ICU 58
 2016-10-26 13:08:17 +02:00
Anatol Belski
81f859b5ce Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  make config.w32 compatible with ICU 58
 2016-10-26 13:07:44 +02:00
Anatol Belski
0f9a4af90b make config.w32 compatible with ICU 58 2016-10-26 13:05:03 +02:00
Dmitry Stogov
4054d1cb64 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed incorrec type usage
  Revert "Update UPGRADING to reflect bug fix" This change was made in 7.0. Sorry for the noise.
  Update UPGRADING to reflect bug fix
  news for next rc
 2016-10-25 22:13:46 +03:00
Dmitry Stogov
bdd3fec7f8 Fixed incorrec type usage 2016-10-25 22:12:34 +03:00
Dmitry Stogov
cc973d6bb7 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Export zend_analyze_calls() to allow building call trees.
 2016-10-25 17:21:12 +03:00
Dmitry Stogov
01bc515b4d Export zend_analyze_calls() to allow building call trees. 2016-10-25 17:20:27 +03:00
Christoph M. Becker
c8c8c0b52c Merge branch 'PHP-7.1' 2016-10-25 14:41:00 +02:00
Christoph M. Becker
c30e5a32c1 Merge branch 'PHP-7.0' into PHP-7.1 2016-10-25 14:35:38 +02:00
Christoph M. Becker
af4bfe234c Merge branch 'PHP-5.6' into PHP-7.0 2016-10-25 14:31:41 +02:00
Christoph M. Becker
cd13d0260a Fix #72494: imagecropauto out-of-bounds access 
This issue has actually already been fixed with commit 46f2c690. We're
adding a regression test and a NEWS entry, and also port the fix in
gdImageCropThreshold() from libgd:
  * <b347e034>
  * <46f2c690>
 2016-10-25 14:29:48 +02:00
Derick Rethans
31e986bc17 Updated to version 2016.8 (2016h) 2016-10-24 10:37:20 +01:00
Derick Rethans
7b9a17d797 Updated to version 2016.8 (2016h) 2016-10-24 10:37:17 +01:00
Derick Rethans
7544040469 Updated to version 2016.8 (2016h) 2016-10-24 10:37:13 +01:00
Derick Rethans
4f5a755b9d Updated to version 2016.8 (2016h) 2016-10-24 10:37:07 +01:00
Nikita Popov
b551c30a2c Merge branch 'PHP-7.1' 2016-10-23 22:27:25 +02:00
Nikita Popov
cbde0a6fc2 Merge branch 'PHP-7.0' into PHP-7.1 2016-10-23 22:27:11 +02:00
Nikita Popov
89d3e234af Fix test output 
Changed due to eca84946a4.
 2016-10-23 22:26:25 +02:00
Nikita Popov
f636dbfe76 Merge branch 'PHP-7.1' 2016-10-23 22:13:59 +02:00
Nikita Popov
c3232c5903 Fix call graph construction 
Travis build for 7.1+ has been failing for the past week...
 2016-10-23 22:12:55 +02:00
Jakub Zelenka
df73aa0e65 Merge branch 'PHP-7.1' 2016-10-23 19:56:29 +01:00
Jakub Zelenka
820bca8ca3 Try to fix LibreSSL build 2016-10-23 19:55:22 +01:00
Jakub Zelenka
eca30fd1b1 Merge branch 'PHP-7.1' 2016-10-23 19:40:48 +01:00
Jakub Zelenka
930ae4034e Drop useless checks for DH and RSA 
If DH or RSA was disabled, the build would fail already as
it's used already elsewhere without checking the OPENSSL_NO_DH
or OPENSSL_NO_RSA defines.
 2016-10-23 19:37:07 +01:00
Amo Chohan
61e15a37a1 Add tests for PDO::getAvailableDrivers 2016-10-20 20:53:53 -07:00
Adam Baratz
6c867cb8e5 Remove DBDO-specific field 
DBDO is a PECL package which hasn't been updated since 2010 and has been marked
as unmaintained. Additionally, I can't find a reference to this field in the
latest source.
 2016-10-20 17:39:00 -04:00
Kalle Sommer Nielsen
54454f7335 Save some more calls to strlen() on the CURLFile helper methods 2016-10-20 16:03:46 +02:00
Kalle Sommer Nielsen
c0d4e72a68 Revert "Fix test, this is kinda ugly, but at least for me on Windows there seems to be some messed up line endings" 
This reverts commit aeeaedeeb7.

This seems to make Travis unhappy (shocker), so revert for now until we find a better fix
 2016-10-20 16:02:37 +02:00
Kalle Sommer Nielsen
61f524b370 Merge branch 'master' of git.php.net:php-src 2016-10-20 14:28:52 +02:00
Kalle Sommer Nielsen
9935d7e163 Save a call to strlen(), since we can figure out the length of this constant value with sizeof() at compile time 2016-10-20 14:28:24 +02:00
Kalle Sommer Nielsen
aeeaedeeb7 Fix test, this is kinda ugly, but at least for me on Windows there seems to be some messed up line endings 2016-10-20 14:24:01 +02:00
Nikita Popov
23772d5b70 Merge branch 'PHP-7.1' 2016-10-20 13:26:51 +02:00
Nikita Popov
736633310c Merge branch 'PHP-7.0' into PHP-7.1 2016-10-20 13:26:34 +02:00
Adam Saponara
55d17662cb Fix bug #71241: array_replace_recursive mutates ref params 
`array_replace_recursive` can sometimes mutate its params if
references are nested within. This differs from the PHP 5 behavior.
 2016-10-20 13:22:04 +02:00
Matteo Beccati
c3c06b92f9 Fixed test to accept MYSQLI_OPT_READ_TIMEOUT 
The new constant has been added in 7108db30
 2016-10-20 12:54:42 +02:00
Anatol Belski
a64c02fbb5 remove redundant includes 2016-10-20 11:42:23 +02:00
Anatol Belski
ab52afb932 fix Windows compilation 
php.h is included, it contains all the stuff needed and conflicts
otherwise.
 2016-10-20 11:42:23 +02:00
Leigh
f23e99dd07 Merge branch 'PHP-7.1' 2016-10-20 10:18:38 +01:00
Leigh
f5244f336a Merge branch 'PHP-7.0' into PHP-7.1 2016-10-20 10:18:16 +01:00
Leigh
c3361f16c7 Add php_random_int internal API 
This is the internal API compliment to `php_random_bytes`
 2016-10-20 10:18:07 +01:00
Kalle Sommer Nielsen
f38834a180 Fix compiler warnings, always cast to zend_long from sqlite3_int64 when converting to a zval 2016-10-20 10:57:38 +02:00
Kalle Sommer Nielsen
6ca38e8cf8 Ignore the return value of sqlite3->busyTimeout() if their "API Armor" is not enabled. 
The sqlite3_busy_timeout() function can only ever return SQLITE_OK if the armor is not compiled in, which means we can skip this error check
 2016-10-20 10:56:08 +02:00
Joe Watkins
e0b6ac2976 Merge branch 'pull-request/2135' 2016-10-20 05:33:12 +01:00
Joe Watkins
0d768f74b6 Merge branch 'pull-request/2152' 2016-10-20 05:25:03 +01:00
Joe Watkins
5de20ef3ae Merge branch 'pull-request/2152' into PHP-7.1 2016-10-20 05:23:21 +01:00