php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-29 03:32:20 +02:00
Code Issues Packages Projects Releases Wiki Activity
99,595 Commits 547 Branches 1,481 Tags
dfbcd4e20727b82e5e093d4e8f404aaefd9fbae5
Commit Graph

99595 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
b4a6408029 news entry for pr #2135 2016-10-20 05:34:22 +01:00
Joe Watkins
e0b6ac2976 Merge branch 'pull-request/2135' 2016-10-20 05:33:12 +01:00
Joe Watkins
2d3bf0da44 news entry for pr #2152 2016-10-20 05:25:49 +01:00
Joe Watkins
0d768f74b6 Merge branch 'pull-request/2152' 2016-10-20 05:25:03 +01:00
Joe Watkins
1752b44d15 news entry for #pr 2152 2016-10-20 05:23:40 +01:00
Joe Watkins
5de20ef3ae Merge branch 'pull-request/2152' into PHP-7.1 2016-10-20 05:23:21 +01:00
Joe Watkins
9e480a1766 news entry for #pr 2152 2016-10-20 05:21:56 +01:00
Joe Watkins
295377630a Merge branch 'pull-request/2152' into PHP-7.0 2016-10-20 05:19:10 +01:00
Dmitry Stogov
03cd0f6b06 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed typo
 2016-10-20 01:17:55 +03:00
Dmitry Stogov
565ce0d41d Fixed typo 2016-10-20 01:17:40 +03:00
Dmitry Stogov
65ea250022 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Introduced HT_IS_PACKED() and HT_IS_WITHOUT_HOLES() macros. (Benjamin Coutu)
 2016-10-19 23:12:17 +03:00
Dmitry Stogov
9ded1b4edb Introduced HT_IS_PACKED() and HT_IS_WITHOUT_HOLES() macros. (Benjamin Coutu) 2016-10-19 23:10:42 +03:00
Joe Watkins
67dc4de592 Merge branch 'master' of git.php.net:/php-src 2016-10-19 13:45:27 +01:00
Joe Watkins
3a0872d08f Implement #72612 (libxmlrc uses system malloc instead of PHP alloc routines) 2016-10-19 13:43:31 +01:00
Kalle Sommer Nielsen
465fdd1de8 T1Lib support was removed in 7.0 2016-10-19 09:02:41 +02:00
Kalle Sommer Nielsen
60d847a0cf Fix typo 2016-10-19 09:01:29 +02:00
Kalle Sommer Nielsen
6ebb447d77 Poor copy/paste mistake, nobody saw I used getrusage.[c|h] as skeleton here! 2016-10-19 07:10:28 +02:00
Kalle Sommer Nielsen
63869d9491 Move these files to the same compilation batch instead of two 2016-10-19 06:44:30 +02:00
Kalle Sommer Nielsen
59090b6499 Ignore notices with headers already being defined to their magic HAVE_<name>_H define on Windows. 
This is very minor and only happens so far for zlib.h, which both ext/zip and ext/zlib looks for.
 2016-10-19 06:29:15 +02:00
Kalle Sommer Nielsen
0ffd0a0217 Improve the config.simple.bat for Windows a little; 
This adds --with-config-profile=foobar, this generates a config.foobar.bat file in the root of php-src directory with the relevant configuration arguments.
 2016-10-19 01:14:15 +02:00
Kalle Sommer Nielsen
815ee7d06c Added config.simple.bat to .gitignore 2016-10-18 23:29:28 +02:00
Kalle Sommer Nielsen
d0a3f2e46d Make proc_nice() more in line with that of Unix, as discussed with Anatol 2016-10-18 23:25:59 +02:00
Kalle Sommer Nielsen
e2b52c510e Always include the header for nice() on Windows 2016-10-18 23:14:46 +02:00
Kalle Sommer Nielsen
6cb13be2c8 Added config.simple for the Windows build system, this is pretty much 
like running configure for only the core of PHP and sapi/cli for quick
and fast building.

buildconf
config.simple
nmake
Release_TS\php -v

(This also enables --with-mp for multi processing for a faster build)
 2016-10-18 23:13:30 +02:00
Anatol Belski
7755adf57b Merge branch 'PHP-7.1' 
* PHP-7.1:
  update NEWS
  update NEWS
 2016-10-18 19:44:47 +02:00
Anatol Belski
eaba20999b update NEWS 2016-10-18 19:44:20 +02:00
Anatol Belski
744ea9721e Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  update NEWS
 2016-10-18 19:43:57 +02:00
Anatol Belski
b754bc797c update NEWS 2016-10-18 19:43:12 +02:00
Anatol Belski
3813d3bbc5 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed bug #73329 (Float)"Nano" == NAN
 2016-10-18 19:14:54 +02:00
Anatol Belski
671f647739 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #73329 (Float)"Nano" == NAN
 2016-10-18 19:14:14 +02:00
Anatol Belski
9f2ab75b10 Fixed bug #73329 (Float)"Nano" == NAN 
The special cases (float)"inf", etc. were never intended and are
caused by the updated strtod lib. While it might be nice as an
easy way to produce Inf and NaN special values, it was never
documented and cause BC breaches.
 2016-10-18 19:11:18 +02:00
Anatol Belski
7d43aee474 Merge branch 'PHP-7.1' 
* PHP-7.1:
  sync NEWS
  sync NEWS
 2016-10-18 18:26:11 +02:00
Anatol Belski
1c7a53a3c0 sync NEWS 2016-10-18 18:24:42 +02:00
Anatol Belski
6d6616cc9d Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  sync NEWS
 2016-10-18 18:22:52 +02:00
Anatol Belski
b4371a4292 sync NEWS 
48f1a178 is reverted
 2016-10-18 18:18:04 +02:00
Christoph M. Becker
35b19cd2d9 Make this test meaningful 
We're not only checking that hash_update_file() succeeds, but rather
that it properly works.

Furthermore, we fix the SKIPIF section – we don't need mhash to run the
test, and we don't need to check for unsupported PHP versions.

We also shorten the test name to avoid cluttering the test reports with
unnecessary detail.
 2016-10-18 14:57:41 +02:00
Johannes Schlüter
b7fe687914 Install ext/json headers so that other extension can parse, too 2016-10-18 14:48:17 +02:00
Bob Weinand
2b246e2e38 Merge branch 'PHP-7.1' 2016-10-18 14:32:12 +02:00
Bob Weinand
58f3b9c0ef Merge remote-tracking branch 'origin/PHP-7.0' into PHP-7.1 2016-10-18 14:31:49 +02:00
Christoph M. Becker
81043bbfea Use our own domains to test getmxrr() 2016-10-18 14:28:49 +02:00
Christoph M. Becker
371f41250c Remove superfluous checks for PNG support 
PNG support is required to build ext/gd, so there's no need to check
for it in the tests.
 2016-10-18 14:17:37 +02:00
Bob Weinand
8b177f6a2a Fixed bug #73338 (Exception thrown from error handler may crash) 2016-10-18 14:14:24 +02:00