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

99637 commits

This branch
This branch
All branches
Author SHA1 Message Date
Christoph M. Becker
ec09c790c5 Merge branch 'PHP-7.1' 2016-09-11 00:19:05 +02:00
Christoph M. Becker
625e43caa8 Merge branch 'PHP-7.0' into PHP-7.1 2016-09-11 00:14:49 +02:00
Christoph M. Becker
8753356eb0 Merge branch 'PHP-5.6' into PHP-7.0 2016-09-11 00:09:23 +02:00
Christoph M. Becker
326a4e38fb Add regression test for bug #73053 
The test succeeds with libxml < 2.9.4, and is supposed to succeed with
libxml > 2.9.4. Unfortunately, we can't conditionally mark a test case
as XFAIL, so we're simply skipping the test for libxml 2.9.4 instead.
 2016-09-11 00:06:45 +02:00
Anatol Belski
6f793669b7 Merge branch 'PHP-7.1' 
* PHP-7.1:
  update NEWS
  update NEWS
  update NEWS
 2016-09-10 11:05:19 +02:00
Anatol Belski
aa5abe113b update NEWS 2016-09-10 11:04:57 +02:00
Anatol Belski
6e1d8d9c71 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  update NEWS
  update NEWS
 2016-09-10 11:04:38 +02:00
Anatol Belski
1ed07676e6 update NEWS 2016-09-10 11:04:00 +02:00
Anatol Belski
1c789dba7b Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  update NEWS
 2016-09-10 11:03:39 +02:00
Anatol Belski
6c9d37d059 update NEWS 2016-09-10 11:02:17 +02:00
Anatol Belski
7eb38de04b Merge branch 'PHP-7.1' 
* PHP-7.1:
  Bug #73058 crypt broken when salt is 'too' long
 2016-09-10 02:50:12 +02:00
Anatol Belski
435048935e Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Bug #73058 crypt broken when salt is 'too' long
 2016-09-10 02:49:30 +02:00
Anatol Belski
e539ea439b Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Bug #73058 crypt broken when salt is 'too' long
 2016-09-10 02:44:21 +02:00
Anatol Belski
669fda00b7 Bug #73058 crypt broken when salt is 'too' long 2016-09-10 02:39:28 +02:00
Nikita Popov
9a0bb40670 Remove handling for defined() and strlen() in opcache 
These are converted by the compiler into DEFINED and STRLEN, no
need to handle the function forms.
 2016-09-09 17:11:25 +02:00
Xinchen Hui
3a9d45a12b Merge branch 'master' of git.php.net:/php-src 
* 'master' of git.php.net:/php-src:
 2016-09-09 22:41:42 +08:00
Xinchen Hui
9862c8d847 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Don't optimize (string) cast on arrays
 2016-09-09 22:41:17 +08:00
Xinchen Hui
a90e438af3 Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1 
* 'PHP-7.1' of git.php.net:/php-src:
  Don't optimize (string) cast on arrays
 2016-09-09 22:40:53 +08:00
Xinchen Hui
1ecdca1f3a Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed function info
 2016-09-09 22:40:26 +08:00
Xinchen Hui
2a3b75a0eb Fixed function info 2016-09-09 22:40:08 +08:00
Nikita Popov
c7f83223bb Merge branch 'PHP-7.1' 2016-09-09 16:39:06 +02:00
Nikita Popov
1d4b831d63 Merge branch 'PHP-7.0' into PHP-7.1 2016-09-09 16:38:42 +02:00
Nikita Popov
e3c08de08a Don't optimize (string) cast on arrays 
Otherwise we throw a notice during pass1_5 optimization.
 2016-09-09 16:38:26 +02:00
Christoph M. Becker
04fb35172b Merge branch 'PHP-7.1' 2016-09-09 16:33:17 +02:00
Christoph M. Becker
7d80b64ac8 Merge branch 'PHP-7.0' into PHP-7.1 2016-09-09 16:32:27 +02:00
Christoph M. Becker
7a90fc96d8 Merge branch 'PHP-5.6' into PHP-7.0 2016-09-09 16:30:26 +02:00
Christoph M. Becker
c42a7f2f3f Remove ignored --FAIL-- section from test case 
This is just confusing.
 2016-09-09 16:27:50 +02:00
Nikita Popov
d1535da7e6 Merge branch 'PHP-7.1' 2016-09-09 16:03:21 +02:00
Nikita Popov
766264f8d2 Merge branch 'PHP-7.0' into PHP-7.1 2016-09-09 16:02:59 +02:00
Nikita Popov
bbcf77c309 Fix some block_pass bugs 2016-09-09 15:58:36 +02:00
Nikita Popov
a499cfc9cc Merge branch 'PHP-7.1' 2016-09-09 15:47:04 +02:00
Nikita Popov
30af80610e Compile intval() etc to casts 2016-09-09 15:45:46 +02:00
Nikita Popov
53b3ef54d2 Merge branch 'PHP-7.1' 2016-09-09 15:31:54 +02:00
Nikita Popov
b4213f0d0b Add fast paths for bitwise operators 2016-09-09 15:30:41 +02:00
Christoph M. Becker
9c7ba794cf Merge branch 'PHP-7.1' 2016-09-09 14:48:27 +02:00
Christoph M. Becker
e8e41aa8cd Merge branch 'PHP-7.0' into PHP-7.1 2016-09-09 14:43:16 +02:00
Christoph M. Becker
1a30a7a422 Merge branch 'PHP-5.6' into PHP-7.0 2016-09-09 14:34:11 +02:00
Christoph M. Becker
23e721fc93 Fix #73054: default option ignored when object passed to int filter 
If an object that can't be converted to string is validated, we must not
bail out early, but rather check for a requested default value.
 2016-09-09 14:30:24 +02:00
Christoph M. Becker
6baaa2bb1b Merge branch 'PHP-7.1' 2016-09-09 12:58:14 +02:00
Christoph M. Becker
e5ff8b2f31 Merge branch 'PHP-7.0' into PHP-7.1 2016-09-09 12:53:35 +02:00
Christoph M. Becker
807c49e6be Merge branch 'PHP-5.6' into PHP-7.0 2016-09-09 12:49:02 +02:00
Levi Morrison
cb91a51b00 Partially fix bug #67167 - Wrong return value... 
...from FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE

The remainer of the fix would require the filter functions to only
convert to string when it makes sense for that particular filter.

(cherry picked from commit 432dc527ad)
 2016-09-09 12:45:46 +02:00
Yasuo Ohgaki
ce61f5e5d4 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Update NEWS
  Fixed Bug #68015 Session does not report invalid uid for files save handler
 2016-09-09 11:40:25 +09:00
Yasuo Ohgaki
17dbb916fc Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Update NEWS
  Fixed Bug #68015 Session does not report invalid uid for files save handler
 2016-09-09 11:39:40 +09:00
Yasuo Ohgaki
fb9444e053 Update NEWS 2016-09-09 11:34:34 +09:00
Yasuo Ohgaki
0e3b30fad1 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fixed Bug #68015 Session does not report invalid uid for files save handler
 2016-09-09 11:32:20 +09:00
Yasuo Ohgaki
38553e853b Fixed Bug #68015 Session does not report invalid uid for files save handler 2016-09-09 11:31:54 +09:00
Christoph M. Becker
fd5f0e49cf Fix broken test case 
Patch provided by Charles R. Portwood II.
 2016-09-08 20:04:10 +02:00
Christoph M. Becker
8bea911f79 Update UPGRADING wrt. [RFC]: Add Argon2 to password_* 2016-09-08 19:59:21 +02:00
Christoph M. Becker
6cd06d34d8 Fix skip messages 2016-09-08 18:55:40 +02:00