archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 08:49:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
99637 commits 526 branches 1434 tags 878 MiB
Commit graph

99637 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dmitry Stogov
5551cccc92 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed type inference rules.
  Update NEWS
 2016-10-18 12:41:10 +03:00
Dmitry Stogov
ac6134fb64 Fixed type inference rules. 2016-10-18 12:39:33 +03:00
Yasuo Ohgaki
10a075fbd5 Update NEWS 2016-10-18 09:28:18 +09:00
Yasuo Ohgaki
14beea9a36 Update NEWS 2016-10-18 09:28:08 +09:00
Yasuo Ohgaki
0a67b29a7c Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fix bug #47890 #73215 uniqid() should use better random source
 2016-10-18 09:14:57 +09:00
Yasuo Ohgaki
235cb691e1 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #47890 #73215 uniqid() should use better random source
 2016-10-18 09:14:48 +09:00
Yasuo Ohgaki
48f1a17886 Fix bug #47890 #73215 uniqid() should use better random source 2016-10-18 09:13:42 +09:00
Christoph M. Becker
209d4220d5 Add PHP bindings for setting and getting the image resolution 
We expose the image resolution related GD functionality to userland
by introducing `imageresolution()` as getter/setter. Given only the
image argument, it returns the current resolution as indexed array.
Given only a second argument, it sets the horizontal and vertical
resolution to this value. Given three arguments, it sets the horizontal
and vertical resolution to the given arguments, respectively.
 2016-10-18 01:53:39 +02:00
Christoph M. Becker
e147eeb4bc Merge branch 'PHP-7.1' 2016-10-18 00:02:18 +02:00
Christoph M. Becker
32123167d1 Merge branch 'PHP-7.0' into PHP-7.1 2016-10-18 00:01:32 +02:00
Yasuo Ohgaki
df845a9155 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Simply return FALSE from session_gc(). Error could be annoying because internal save handlers may return -1 when GC cannot be performed for reasons
 2016-10-18 06:54:10 +09:00
Yasuo Ohgaki
70afe4c494 Simply return FALSE from session_gc(). Error could be annoying because internal save handlers may return -1 when GC cannot be performed for reasons 2016-10-18 06:53:13 +09:00
Christoph M. Becker
0b596f81b8 Merge branch 'PHP-5.6' into PHP-7.0 
We also use ZEND_LONG_(MAX|MIN) now instead of LONG_(MAX|MIN).
 2016-10-17 23:38:28 +02:00
Christoph M. Becker
86e603a664 Fix #73333: 2147483647 is fetched as string 
We return all integers that can be represented as such by PHP as
integers, and only those that exceed the possible range as strings.
On builds which represent integers with 64 bits, the range check is
unnecessary and might cause code checkers to complain, so we skip this
special casing via the preprocessor according to
<http://git.php.net/?p=php-src.git;a=commit;h=99d087e5>.
 2016-10-17 23:34:41 +02:00
Yasuo Ohgaki
843f27b74d Add save handler explanations for documentation purpose 2016-10-18 06:20:03 +09:00
Adam Baratz
82fe200a3f Remove dead code 2016-10-17 17:07:10 -04:00
Dmitry Stogov
f4578d5a0e Merge branch 'PHP-7.1' 
* PHP-7.1:
  Use simple "one-pass" algorithm.
 2016-10-18 00:06:50 +03:00
Dmitry Stogov
ed3196ea35 Use simple "one-pass" algorithm. 2016-10-18 00:06:20 +03:00
Anatol Belski
451f9aa00c Merge branch 'PHP-7.1' 
* PHP-7.1:
  sync NEWS
  Merge branch 'pull-request/1817'
  Merge branch 'pull-request/1816'
  Merge branch 'pull-request/1814'
  Merge branch 'pull-request/1808'
  Merge branch 'pull-request/1817'
  Merge branch 'pull-request/1816'
  Merge branch 'pull-request/1814'
  Merge branch 'pull-request/1808'
 2016-10-17 21:28:19 +02:00
Anatol Belski
faa2a43d4b Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  sync NEWS
  Merge branch 'pull-request/1817'
  Merge branch 'pull-request/1816'
  Merge branch 'pull-request/1814'
  Merge branch 'pull-request/1808'
  Merge branch 'pull-request/2097'
  news entry for pr #2158
  Merge branch 'pull-request/2158'
 2016-10-17 21:27:32 +02:00
Anatol Belski
f85cc6aead sync NEWS 2016-10-17 21:26:34 +02:00
Andrey Hristov
0b7ecd6f10 Merge branch 'PHP-7.1' 2016-10-17 19:31:43 +03:00
Andrey Hristov
47993d0c59 Merge branch 'PHP-7.0' into PHP-7.1 2016-10-17 19:31:29 +03:00
Andrey Hristov
2b047617af Merge branch 'PHP-5.6' into PHP-7.0 2016-10-17 19:30:08 +03:00
Andrey Hristov
543cc08a75 Lower the value to 24 hours from 1 year, which due to a overflow in 
php_tvtoto (bug#71507) is just 17 days.
 2016-10-17 19:25:01 +03:00
Andrey Hristov
d8ede80c7a Merge branch 'master' of git.php.net:php-src 2016-10-17 19:12:56 +03:00
Andrey Hristov
23f500191d Merge branch 'PHP-7.1' 2016-10-17 19:12:33 +03:00
Andrey Hristov
7108db3022 Merge branch 'PHP-7.0' into PHP-7.1 2016-10-17 19:11:54 +03:00
Joe Watkins
dcae3ce1e6 Merge branch 'pull-request/1817' 2016-10-17 17:02:22 +01:00
Joe Watkins
4dfd5f4403 Merge branch 'pull-request/1816' 2016-10-17 17:02:19 +01:00
Joe Watkins
d6fb5a1f1e Merge branch 'pull-request/1814' 2016-10-17 17:02:13 +01:00
Joe Watkins
b274be5d9d Merge branch 'pull-request/1808' 2016-10-17 17:02:07 +01:00
Joe Watkins
39ee3184ee Merge branch 'pull-request/1817' 2016-10-17 17:01:39 +01:00
Joe Watkins
5eb84337a6 Merge branch 'pull-request/1816' 2016-10-17 17:01:28 +01:00
Andrey Hristov
66d4a2e13f Merge branch 'PHP-5.6' into PHP-7.0 2016-10-17 19:01:12 +03:00
Joe Watkins
522e4f1174 Merge branch 'pull-request/1814' 2016-10-17 17:01:10 +01:00
Joe Watkins
6806a41e7f Merge branch 'pull-request/1808' 2016-10-17 17:00:50 +01:00
Andrey Hristov
9594e364ed This is a very very old thing dated back to year 2009. 
MYSQL_OPT_READ_TIMEOUT was never a macro in mysqlnd but an enum value.
So this never actually worked correctly. mysqlnd provides these so it is
safe to have them when mysqlnd used.
 2016-10-17 18:58:14 +03:00
Joe Watkins
d6a4e11f9d Merge branch 'pull-request/1808' 2016-10-17 16:53:04 +01:00
Joe Watkins
068f6bf938 Merge branch 'pull-request/1814' 2016-10-17 16:50:53 +01:00
Joe Watkins
acefa44014 Merge branch 'pull-request/1816' 2016-10-17 16:50:12 +01:00
Joe Watkins
f9beeacc25 Merge branch 'pull-request/1817' 2016-10-17 16:49:24 +01:00
Joe Watkins
caa9ed28cc Merge branch 'pull-request/2097' 2016-10-17 16:05:32 +01:00
Joe Watkins
96ed946b2b Merge branch 'pull-request/2097' 2016-10-17 16:03:12 +01:00
Joe Watkins
63166412a2 Merge branch 'pull-request/2097' 2016-10-17 16:02:51 +01:00
Joe Watkins
bd6bce888a news entry for pr #2158 2016-10-17 15:50:59 +01:00
Joe Watkins
8d6cc00cbd Merge branch 'pull-request/2158' 2016-10-17 15:48:32 +01:00
Andrea Faulds
858531661b NEWS and UPGRADING for utf8_encode() and utf8_decode() move 2016-10-17 15:45:01 +01:00
Andrea Faulds
1a512eed44 Move utf8_encode and utf8_decode to ext/standard 2016-10-17 15:39:02 +01:00
Joe Watkins
cc80ca9b84 news entry for pr #2158 2016-10-17 14:47:08 +01:00