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
94,177 Commits 494 Branches 1,367 Tags 790 MiB
5b18b2182d
Commit Graph

94177 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yasuo Ohgaki
5b18b2182d Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #69111 (Crash in SessionHandler::read()). Made session save handler abuse much harder than before.
 2016-01-15 16:25:33 +09: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
Andrey Hristov
7e9a6f7202 Move cleanup code to a separate function and export it. Export also 
other functions that can be of use for plugins
 2016-01-15 03:08:02 +01:00
Yasuo Ohgaki
07849e8006 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Improved fix for bug #68063 (Empty session IDs do still start sessions).
 2016-01-15 10:19:29 +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
aa7aaeb7a0 Merge branch 'PHP-7.0' 
* PHP-7.0:
  update NEWS
 2016-01-14 18:42:37 +01:00
Anatol Belski
4ab7d6a5e1 update NEWS 2016-01-14 18:42:13 +01:00
Anatol Belski
242775a19b Merge branch 'PHP-7.0' 
* PHP-7.0:
  port 4308c868f9 to 7.0
 2016-01-14 18:41:22 +01:00
Anatol Belski
33cc42d8a5 port 4308c868f9 to 7.0 2016-01-14 18:38:30 +01:00
Anatol Belski
1497e4babc Merge branch 'PHP-7.0' 
* PHP-7.0:
  update NEWS
  Fixed bug #70979 crash with bad soap request
  Update NEWS
 2016-01-14 17:48:59 +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
Andrey Hristov
bcf7172258 Forgot to add const-ness to the macro 2016-01-14 14:55:23 +01:00
Andrey Hristov
c69c23ba2f Convenience macros 2016-01-14 12:58:41 +01:00
Anatol Belski
ca7b33e247 Merge branch 'PHP-7.0' 
* PHP-7.0:
  update NEWS
 2016-01-14 09:04:16 +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
5449095c4f Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed macro name
 2016-01-14 14:49:34 +08:00
Xinchen Hui
262f09d678 Fixed macro name 2016-01-14 14:49:23 +08:00
Xinchen Hui
55b0a392a6 Merge branch 'patch-1' of https://github.com/JHGitty/php-src 
* 'patch-1' of https://github.com/JHGitty/php-src:
  Fix typo
 2016-01-14 11:53:26 +08:00
Xinchen Hui
da658f28bb Merge branch 'patch' of https://github.com/jakkdu/php-src 
* 'patch' of https://github.com/jakkdu/php-src:
  phpdbg: fix potential format string bug
 2016-01-14 11:51:53 +08:00
Anatol Belski
092a87c9d8 implement FCGI children automatic restart and cleanup 2016-01-13 21:32:38 +01:00
Anatol Belski
5b91658365 Basic implementation for FCGI to respect PHP_FCGI_CHILDREN on Windows 
PHP_FCGI_CHILDREN number of children processes will be spawned, sharing
same TCP socket. To implement yet

- children cleanup on exit
- automatic children re-spawning
 2016-01-13 21:32:36 +01:00
Andrey Hristov
4e8988b45a commit 597db443cd 
Author: John Bafford <john@bafford.com>
Date:   Mon Jan 11 17:17:44 2016 -0500

    MYSQLND_METHOD(mysqlnd_conn_data, get_scheme) should take socket_or_pipe by reference to allow modifications

    Fixes a read-from-null crash in mnd_pestrdup when trying to duplicate the socket filename. (Fixes regression in e81ecc80c)
 2016-01-13 16:30:23 +01:00
Dmitry Stogov
8e5cf2e186 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Avoid incomplete zend_internal_function initialization.
 2016-01-13 15:06:50 +03:00
Dmitry Stogov
6a2621e3a5 Avoid incomplete zend_internal_function initialization. 2016-01-13 15:06:17 +03:00
Xinchen Hui
86883b793b Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #71336 (Wrong is_ref on properties as exposed via get_object_vars())
 2016-01-13 17:38:36 +08: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
d47285648c Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #71248 (Wrong interface is enforced)
  Update NEWS
 2016-01-13 11:42:50 +03: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
Nikita Popov
bef124513e Merge branch 'PHP-7.0' 2016-01-12 16:48:44 +01: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
Nikita Popov
35662c9bd3 Forbid double use() and use() of param 
Also commit a test I forgot to add for forbidden use() of
auto-globals.
 2016-01-12 15:37:39 +01:00
Julien Pauli
65e592e477 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Trigger op_array_handler() if HAVE_OP_ARRAY_HANDLER is set
 2016-01-12 15:19:39 +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
ad57a71aa4 Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix the fix for bug #70976 (imagerotate)
  Use php_session_abort()
 2016-01-12 13:54:52 +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
c200e8e1a2 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed Bug #71038 session_start() returns TRUE on failure
 2016-01-12 19:53:14 +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
5e99d19df5 Merge branch 'PHP-7.0' 
* PHP-7.0:
  partial test fixes, only obvious mistaking parts
 2016-01-12 10:45:57 +01:00