clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-29 22:06:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
93,225 Commits 494 Branches 1,367 Tags 790 MiB
8052df8110
Commit Graph

93225 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yasuo Ohgaki
8052df8110 Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0 
* 'PHP-7.0' of git.php.net:php-src:
  Remove unnecessary warning by warning reorder.
 2016-01-17 17:14:15 +09:00
Yasuo Ohgaki
3b2d98a625 Fixed bug #71394 (session_regenerate_id() must close opened session on errors) 2016-01-17 17:11:47 +09:00
Yasuo Ohgaki
00eaaca18a Remove unnecessary warning by warning reorder. 2016-01-17 17:08:44 +09:00
Yasuo Ohgaki
dbba4418d8 Remove unnecessary warning by warning reorder. 2016-01-17 16:21:01 +09:00
Yasuo Ohgaki
9f2240963f Add test for Bug #70133 (Extended SessionHandler::read is ignoring $session_id when calling parent) 2016-01-16 05:29:19 +09:00
Anatol Belski
93db2dac48 PS(id) is zend_string *, use appropriate API 2016-01-15 15:47:09 +01:00
Yasuo Ohgaki
925aea7e1b Update NEWS 2016-01-15 17:05:58 +09:00
Anatol Belski
348dd1a018 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix header file include
 2016-01-15 08:43:56 +01:00
Jason Young
d1401f6059 Fix header file include 2016-01-15 08:43:00 +01:00
Yasuo Ohgaki
34ff7bbeb1 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fixed bug #69111 (Crash in SessionHandler::read()). Made session save handler abuse much harder than before.
 2016-01-15 16:24:22 +09:00
Yasuo Ohgaki
bfb9307b2d Fixed bug #69111 (Crash in SessionHandler::read()). 
Made session save handler abuse much harder than before.
 2016-01-15 15:50:14 +09:00
Yasuo Ohgaki
d7f8d9e3a9 Fix typo 2016-01-15 15:21:18 +09:00
Yasuo Ohgaki
31ae802736 Fix uninitialized read in rfc1867 handler reported by valgrind. Only in PHP 5.6. 
This commit fixes initialized read, but calling php_session_initialize() directly
is problematic because configuration could be invalid. Invalid config may result
in segfault. This will be addressed later.
 2016-01-15 15:18:00 +09:00
Yasuo Ohgaki
132d919c85 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Improved fix for bug #68063 (Empty session IDs do still start sessions).
 2016-01-15 10:19:01 +09:00
Yasuo Ohgaki
8c37a086c7 Improved fix for bug #68063 (Empty session IDs do still start sessions). 2016-01-15 09:45:08 +09:00
Anatol Belski
4ab7d6a5e1 update NEWS 2016-01-14 18:42:13 +01:00
Anatol Belski
33cc42d8a5 port 4308c868f9 to 7.0 2016-01-14 18:38:30 +01:00
Anatol Belski
b05eb52c35 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  update NEWS
  Fixed bug #70979 crash with bad soap request
  Update NEWS
 2016-01-14 17:48:33 +01:00
Anatol Belski
c126725a7f update NEWS 2016-01-14 17:47:17 +01:00
Anatol Belski
4308c868f9 Fixed bug #70979 crash with bad soap request 
The error handler is overloaded with the SOAP one. However the SOAP
handler eventually wants to access some of its globals. This won't
work as long as the SOAP globals aren't initialized. The use case
is when an error is thrown before RINIT went through. As the call
order is arbitrary, the safest is to wait when all the modules
called their RINIT.
 2016-01-14 17:42:28 +01:00
Anatol Belski
12eff055da update NEWS 2016-01-14 09:02:54 +01:00
Xinchen Hui
ad85cce1bc Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0 
* 'PHP-7.0' of git.php.net:/php-src:
  Avoid incomplete zend_internal_function initialization.
 2016-01-14 14:49:57 +08:00
Xinchen Hui
262f09d678 Fixed macro name 2016-01-14 14:49:23 +08:00
Dmitry Stogov
6a2621e3a5 Avoid incomplete zend_internal_function initialization. 2016-01-13 15:06:17 +03:00
Xinchen Hui
39f0950746 Fixed bug #71336 (Wrong is_ref on properties as exposed via get_object_vars()) 2016-01-13 17:38:18 +08:00
Dmitry Stogov
50be2c89be Fixed bug #71248 (Wrong interface is enforced) 2016-01-13 11:41:57 +03:00
Yasuo Ohgaki
c3c6ab08fe Update NEWS 2016-01-13 06:40:28 +09:00
Yasuo Ohgaki
1f513805dc Update NEWS 2016-01-13 06:40:11 +09:00
Bogdan Padalko
2b4625d687 Remove obj handlers ptr value from spl_object_hash() 
We still keep the same output length, for people who rely on the
return value having a specific format. The handler part will now
simply be always the same (it was the same nearly always anyway).

The motivation behind this change is to avoid breaking
spl_object_hash() and SplObjectStorage if an extension changes the
handlers table of an object. This has come up, for example, in
weakref implementations.
 2016-01-12 16:47:21 +01:00
Julien Pauli
bec0aec116 Trigger op_array_handler() if HAVE_OP_ARRAY_HANDLER is set 2016-01-12 15:19:14 +01:00
Remi Collet
af3f3be0c1 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix the fix for bug #70976 (imagerotate)
  Use php_session_abort()
 2016-01-12 13:54:23 +01:00
Remi Collet
14e4d393cf fix the fix for bug #70976 (imagerotate) 2016-01-12 13:52:27 +01:00
Yasuo Ohgaki
63c77ee4b1 Use php_session_abort() 2016-01-12 20:39:33 +09:00
Yasuo Ohgaki
224aaf94af Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fixed Bug #71038 session_start() returns TRUE on failure
 2016-01-12 19:52:54 +09:00
Yasuo Ohgaki
a15e9ccba8 Fixed Bug #71038 session_start() returns TRUE on failure 2016-01-12 19:09:49 +09:00
Anatol Belski
4e7cb057a0 partial test fixes, only obvious mistaking parts 2016-01-12 10:44:55 +01:00
Anatol Belski
d8e2b8424f remove the unnecessary condition part 2016-01-12 10:22:10 +01:00
Anatol Belski
8e7c469f82 fix possible buffer overrun in the errmsg string 2016-01-12 10:17:32 +01:00
Anatol Belski
b54739e68d integrate tsrmls cache 2016-01-12 09:42:38 +01:00
Anatol Belski
391b73b484 update NEWS for fixed bug #71132, fixed bug #71197 2016-01-12 08:34:35 +01:00
Thomas Punt
3bbcd84e2f re-apply patch for github PR #1695 2016-01-12 07:07:51 +01:00
Anatol Belski
f53a5dcca3 Revert "update NEWS" 
This reverts commit 7954e5dc2a.
 2016-01-11 22:03:39 +01:00
Anatol Belski
66d10fe085 Revert "patch for github PR #1695" 
This reverts commit 58dd956b63.

crashes on travis
 2016-01-11 22:03:36 +01:00
Anatol Belski
3bbbd3ebcd update NEWS 2016-01-11 21:44:23 +01:00
Anatol Belski
e509144714 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  update NEWS
 2016-01-11 21:43:52 +01:00
Anatol Belski
ba7736729e update NEWS 2016-01-11 21:42:31 +01:00
Anatol Belski
ce568f98bf Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Simplify code per Anatol.
  Insert bug number.
  Use strtoll() when apr_off_t is 64 bits.
 2016-01-11 21:39:31 +01:00
Adam Harvey
f301a0b23c Simplify code per Anatol. 2016-01-11 21:36:55 +01:00
Adam Harvey
3217c033a5 Insert bug number. 2016-01-11 21:36:53 +01:00
Adam Harvey
c895dc5b5b Use strtoll() when apr_off_t is 64 bits. 2016-01-11 21:36:51 +01:00