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
99637 commits 526 branches 1434 tags 873 MiB
Commit graph

99637 commits

This branch
This branch
All branches
Author SHA1 Message Date
Derick Rethans
31e986bc17 Updated to version 2016.8 (2016h) 2016-10-24 10:37:20 +01:00
Derick Rethans
533fbab0f4 Empty merge 2016-10-24 10:37:19 +01:00
Derick Rethans
7b9a17d797 Updated to version 2016.8 (2016h) 2016-10-24 10:37:17 +01:00
Derick Rethans
4d2cc0149f Empty merge 2016-10-24 10:37:16 +01:00
Derick Rethans
7544040469 Updated to version 2016.8 (2016h) 2016-10-24 10:37:13 +01:00
Derick Rethans
76293254cf Empty merge 2016-10-24 10:37:12 +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
Xinchen Hui
1322594175 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Update NEWS
 2016-10-22 14:51:23 +08:00
Xinchen Hui
7c8650fe81 Update NEWS 2016-10-22 14:51:11 +08:00
Xinchen Hui
a6e8634a63 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed bug #73350 (Exception::__toString() cause circular references)
 2016-10-22 14:50:53 +08:00
Xinchen Hui
788368ff1c Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #73350 (Exception::__toString() cause circular references)
 2016-10-22 14:50:42 +08:00
Xinchen Hui
eca84946a4 Fixed bug #73350 (Exception::__toString() cause circular references) 2016-10-22 14:50:21 +08:00
Anatol Belski
5e480021a7 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Better fix for bug #73360
  Revert "Fixed bug #73360 Unable to work in root with unicode chars"
 2016-10-21 21:34:09 +02:00
Anatol Belski
2860fd40d6 Better fix for bug #73360 
This also fixes the TS issue. And, it also reveals that there's an
issue in the VCWD_* API to be possibly addressed.
 2016-10-21 21:29:35 +02:00
Anatol Belski
fbf46d36ca Revert "Fixed bug #73360 Unable to work in root with unicode chars" 
This reverts commit 64fee0aecb.
 2016-10-21 20:15:16 +02:00
Anatol Belski
1b6c6aa1c4 Merge branch 'PHP-7.1' 
* PHP-7.1:
  update NEWS
 2016-10-21 16:57:30 +02:00
Dmitry Stogov
d6c332eb51 Turn IS_TYPE_COLLECTABLE zval flag into GC_COLLECTABLE zend_refcounted flag. 
This simplifies checks and allows reset this flag for "acyclic" arrays and objects.
 2016-10-21 17:47:30 +03:00
Anatol Belski
9ffc90baf8 update NEWS 
The bug is currently not good testable, because the doc_root will be
blocked from the invoked test server process. This will prevent the
cleanup, which would be confusing.
 2016-10-21 16:43:55 +02:00
Anatol Belski
04bba0c078 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed bug #73360 Unable to work in root with unicode chars
 2016-10-21 16:00:49 +02:00
Anatol Belski
64fee0aecb Fixed bug #73360 Unable to work in root with unicode chars 2016-10-21 15:22:59 +02: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
Kalle Sommer Nielsen
66b2c5c5a4 Merge branch 'master' of git.php.net:php-src 2016-10-20 13:10:51 +02:00
Kalle Sommer Nielsen
dfbcd4e207 Do not overwrite config.nice.bat if --with-config-profile is used on Windows 2016-10-20 13:10:28 +02:00
Christoph M. Becker
ed61791a5a Update UPGRADING wrt. imageresolution() 
Cf. <http://git.php.net/?p=php-src.git;a=commit;h=209d4220>.
 2016-10-20 12:59:03 +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