Commit Graph

97989 Commits

Author SHA1 Message Date
Nikita Popov
51a564e505 Merge branch 'PHP-7.0' into PHP-7.1 2016-08-30 10:56:06 +02:00
Nikita Popov
07cc6a6ba2 Fix bug #72971 2016-08-30 10:54:31 +02:00
Yasuo Ohgaki
4a12450de2 Update NEWS 2016-08-30 16:05:49 +09:00
Yasuo Ohgaki
f5cd6e5710 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fixed bug #72940 SID always return "name=ID", even if session cookie exist
2016-08-30 15:58:55 +09:00
Yasuo Ohgaki
b5f2f6fbd8 Fixed bug #72940 SID always return "name=ID", even if session cookie exist 2016-08-30 15:58:25 +09:00
Christoph M. Becker
38a7c0e0f7 Merge branch 'PHP-7.0' into PHP-7.1 2016-08-30 02:24:43 +02:00
Christoph M. Becker
65f0c163f9 Merge branch 'PHP-5.6' into PHP-7.0 2016-08-30 02:13:48 +02:00
Christoph M. Becker
207dab585a Fix #71882: Negative ftruncate() on php://memory exhausts memory
We must not pass negative sizes to a size_t parameter.
2016-08-30 02:05:45 +02:00
Christoph M. Becker
ec8bbba9c6 Merge branch 'PHP-7.0' into PHP-7.1 2016-08-30 01:18:59 +02:00
Christoph M. Becker
4b45c0a9a7 Merge branch 'pull-request/2043' into PHP-7.0 2016-08-30 01:16:45 +02:00
Anatol Belski
2bfe926eb1 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  fix HANDLE leak
2016-08-29 21:48:50 +02:00
Anatol Belski
1b227de970 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  fix HANDLE leak
2016-08-29 21:47:54 +02:00
Anatol Belski
c7b4cd1a51 fix HANDLE leak 2016-08-29 21:45:39 +02:00
Anatol Belski
6bb5b6e8a3 update NEWS 2016-08-29 21:26:13 +02:00
Anatol Belski
2b9670512b Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  update NEWS
  update NEWS
2016-08-29 21:24:08 +02:00
Anatol Belski
5bcae9d586 update NEWS 2016-08-29 21:23:20 +02:00
Anatol Belski
b6b7696114 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  update NEWS
2016-08-29 21:22:43 +02:00
Anatol Belski
ae81e8fc32 update NEWS 2016-08-29 21:20:36 +02:00
Anatol Belski
c560678c14 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  ensure null termination
2016-08-29 21:15:55 +02:00
Anatol Belski
2004585d03 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  ensure null termination
2016-08-29 21:13:39 +02:00
Anatol Belski
d787b0ea13 ensure null termination 2016-08-29 21:03:03 +02:00
Anatol Belski
22a825db85 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fixed bug #72703 Out of bounds global memory read in BF_crypt triggered by password_verify
2016-08-29 20:34:44 +02:00
Anatol Belski
946335ba70 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Fixed bug #72703 Out of bounds global memory read in BF_crypt triggered by password_verify
2016-08-29 20:32:55 +02:00
Anatol Belski
295303b590 Fixed bug #72703 Out of bounds global memory read in BF_crypt triggered by password_verify 2016-08-29 20:25:34 +02:00
Dmitry Stogov
722783c2c6 Merge branch 'PHP-7.1' of git.php.net:php-src into PHP-7.1
* 'PHP-7.1' of git.php.net:php-src:
  fix double free
2016-08-29 20:37:01 +03:00
Dmitry Stogov
94fbcbe172 Allow optional splitting of basic blocks at RECV/RECV_INIT opcodes. 2016-08-29 20:35:17 +03:00
Anatol Belski
a349afd26b Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  fix double free
2016-08-29 19:34:19 +02:00
Anatol Belski
3437dbfa00 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  fix double free
2016-08-29 19:33:22 +02:00
Anatol Belski
1a840b9af0 fix double free 2016-08-29 19:27:47 +02:00
Anatol Belski
5c8aa478da Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  fix double free
2016-08-29 18:57:50 +02:00
Anatol Belski
1d93086937 fix double free 2016-08-29 18:56:25 +02:00
Anatol Belski
3196ea195b add note to UPGRADING.INTERNALS 2016-08-29 18:37:35 +02:00
Anatol Belski
78401a7f01 extend help message 2016-08-29 18:25:00 +02:00
Anatol Belski
78c15e2744 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  fix leak
2016-08-29 18:08:17 +02:00
Anatol Belski
ca4eeedd36 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  fix leak
2016-08-29 18:05:47 +02:00
Anatol Belski
e2609a38d9 fix leak 2016-08-29 18:01:21 +02:00
Anatol Belski
faccbeb588 fix search path 2016-08-29 17:44:37 +02:00
Anatol Belski
3ab2a58753 support also cppcheck for static analyze 2016-08-29 17:44:37 +02:00
Anatol Belski
201f90a8cc add error check and fix leak 2016-08-29 17:25:46 +02:00
Anatol Belski
7ecfb4b954 fix leak 2016-08-29 17:25:13 +02:00
Jakub Zelenka
c4961fa8b6 Bump PHP_JSON_VERSION to 1.5.0 2016-08-29 15:18:00 +01:00
Jakub Zelenka
ab65665a0e Merge branch 'json_encode_fail_return' into PHP-7.1 2016-08-29 15:01:00 +01:00
Jakub Zelenka
f5b4aae7ac Update NEWS with info about a json_encode fail return 2016-08-29 14:59:44 +01:00
Jakub Zelenka
27acbcf4df Add test for fixed bug #68992 2016-08-29 14:49:40 +01:00
Jakub Zelenka
df05dbb3df Fix recursion and protection in the failed JSON encoding 2016-08-29 14:49:40 +01:00
Jakub Zelenka
12a8c3f6e7 Add initial failure checking for json_encode 2016-08-29 14:49:40 +01:00
Anatol Belski
50c5d13d26 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  fix leak
2016-08-29 15:44:13 +02:00
Anatol Belski
d80a317c0b fix leak 2016-08-29 15:43:10 +02:00
Anatol Belski
a747578497 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  fix possible memory leak
2016-08-29 15:29:52 +02:00
Anatol Belski
1d7ec685c1 fix possible memory leak 2016-08-29 15:28:09 +02:00