Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove unneeded md5 hashing from PHP-5.6 branch. | Yasuo Ohgaki | 2014-11-12 | 1 | -7/+0 |
| | | | | It's removed from master already by my previous commit. | ||||
* | Fixed bug #68331 - This was partial patch for ↵ | Yasuo Ohgaki | 2014-11-06 | 2 | -16/+2 |
| | | | | https://wiki.php.net/rfc/session-lock-ini | ||||
* | Merge branch 'PHP-5.5' into PHP-5.6 | Adam Harvey | 2014-09-08 | 2 | -0/+12 |
|\ | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Fix bug #67972 (SessionHandler Invalid memory read create_sid()). Update LSAPI to 6.7, added support for 'filter_input'. Fixed a crash in CLI mode. 5.5.18 now Conflicts: configure.in main/php_version.h | ||||
| * | Fix bug #67972 (SessionHandler Invalid memory read create_sid()). | Adam Harvey | 2014-09-08 | 2 | -0/+12 |
| | | | | | | | | | | SessionHandler::create_sid() didn't check if PS(default_mod) was initialised before attempting to call its create_sid() handler. | ||||
* | | Fixed #67694: Regression in session_regenerate_id() | Tjerk Meesters | 2014-08-23 | 2 | -1/+42 |
| | | |||||
* | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2014-07-28 | 1 | -1/+2 |
|\ \ | |/ | | | | | | | | | | | | | * PHP-5.5: Fix missing type checks in various functions Conflicts: ext/openssl/openssl.c | ||||
| * | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2014-07-28 | 1 | -1/+2 |
| |\ | | | | | | | | | | | | | * PHP-5.4: Fix missing type checks in various functions | ||||
| | * | Fix missing type checks in various functions | Stanislav Malyshev | 2014-07-27 | 1 | -1/+2 |
| | | | |||||
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Xinchen Hui | 2014-07-19 | 2 | -9/+25 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Yasuo Ohgaki | 2014-07-19 | 2 | -9/+25 |
| |\ \ | | |/ | | | | | | | | | | * PHP-5.4: Fixed bug #66827 Session raises E_NOTICE when session name variable is array | ||||
| | * | Fixed bug #66827 Session raises E_NOTICE when session name variable is array | Yasuo Ohgaki | 2014-07-19 | 2 | -9/+25 |
| | | | |||||
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Ferenc Kovacs | 2014-05-07 | 1 | -0/+1 |
|\ \ \ | |/ / | | | | | | | | | | * PHP-5.5: Fixed test (it requires ext/hash) | ||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Ferenc Kovacs | 2014-05-07 | 1 | -0/+1 |
| |\ \ | | |/ | | | | | | | | | | * PHP-5.4: Fixed test (it requires ext/hash) | ||||
| | * | Fixed test (it requires ext/hash) | Dmitry Stogov | 2014-05-07 | 1 | -0/+1 |
| | | | |||||
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Ferenc Kovacs | 2014-05-07 | 2 | -0/+2 |
|\ \ \ | |/ / | | | | | | | | | | | | | * PHP-5.5: Fixed tests (they might fail from time to time because of session GC) Fix author name on the #63228 patch. | ||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Ferenc Kovacs | 2014-05-07 | 2 | -0/+2 |
| |\ \ | | |/ | | | | | | | | | | | | | * PHP-5.4: Fixed tests (they might fail from time to time because of session GC) Fix author name on the #63228 patch. | ||||
| | * | Fixed tests (they might fail from time to time because of session GC) | Dmitry Stogov | 2014-05-07 | 2 | -0/+2 |
| | | | |||||
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Anatol Belski | 2014-04-14 | 1 | -1/+7 |
|\ \ \ | |/ / | | | | | | | | | | * PHP-5.5: fix windows build | ||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Anatol Belski | 2014-04-14 | 1 | -1/+7 |
| |\ \ | | |/ | | | | | | | | | | * PHP-5.4: fix windows build | ||||
| | * | fix windows build | Anatol Belski | 2014-04-14 | 1 | -1/+7 |
| | | | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2014-04-14 | 1 | -12/+12 |
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Fix #66942: openssl_seal() memory leak ws fix Conflicts: ext/openssl/openssl.c | ||||
| | * | ws fix | Stanislav Malyshev | 2014-04-14 | 1 | -12/+12 |
| | | | |||||
| | * | Fix bug #66171: better handling of symlinks | Stanislav Malyshev | 2014-04-14 | 1 | -17/+20 |
| | | | |||||
| * | | Fix bug #66171: better handling of symlinks | Stanislav Malyshev | 2014-04-14 | 1 | -17/+20 |
| | | | |||||
* | | | ws fix | Stanislav Malyshev | 2014-04-14 | 1 | -12/+12 |
| | | | |||||
* | | | Fix bug #66171: better handling of symlinks | Stanislav Malyshev | 2014-04-14 | 1 | -17/+20 |
| | | | |||||
* | | | Remove unneeded test | Yasuo Ohgaki | 2014-03-13 | 1 | -37/+0 |
| | | | |||||
* | | | Revert "Implement Bug #54649 Create session_serializer_name()" | Yasuo Ohgaki | 2014-03-13 | 2 | -86/+0 |
| | | | | | | | | | | | | | | | | | | | | | This reverts commit 678ec306557f61bf54b6df454387e7d9c3f50de5. Conflicts: ext/session/tests/session_serializer_name_basic.phpt | ||||
* | | | Revert "Implemented Request #11100 (session_gc() function)." | Yasuo Ohgaki | 2014-03-13 | 1 | -38/+0 |
| | | | | | | | | | | | | | | | | | | | | | This reverts commit 54a42f0d0cf85fe0c032009b1f601427ae1c8566. Conflicts: ext/session/tests/session_gc_basic.phpt | ||||
* | | | primitive test fixes | Anatol Belski | 2014-02-28 | 4 | -4/+4 |
| | | | |||||
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Yasuo Ohgaki | 2014-01-30 | 1 | -0/+2 |
|\ \ \ | |/ / | | | | | | | | | | * PHP-5.5: Fixed bug data->fd not set to -1 for open_basedir failure. | ||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Yasuo Ohgaki | 2014-01-30 | 1 | -0/+2 |
| |\ \ | | |/ | | | | | | | | | | * PHP-5.4: Fixed bug data->fd not set to -1 for open_basedir failure. | ||||
| | * | Fixed bug data->fd not set to -1 for open_basedir failure. | Yasuo Ohgaki | 2014-01-30 | 1 | -0/+2 |
| | | | |||||
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Anatol Belski | 2014-01-22 | 1 | -0/+1 |
|\ \ \ | |/ / | | | | | | | | | | | | | * PHP-5.5: refixed that test for 5.5+ 5.5.10 next | ||||
| * | | refixed that test for 5.5+ | Anatol Belski | 2014-01-22 | 1 | -0/+1 |
| | | | |||||
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Anatol Belski | 2014-01-22 | 1 | -1/+0 |
|\ \ \ | |/ / | | | | | | | | | | * PHP-5.5: fixed test | ||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Anatol Belski | 2014-01-22 | 1 | -1/+0 |
| |\ \ | | |/ | | | | | | | | | | * PHP-5.4: fixed test | ||||
| | * | fixed test | Anatol Belski | 2014-01-22 | 1 | -1/+0 |
| | | | |||||
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Anatol Belski | 2014-01-22 | 1 | -2/+2 |
|\ \ \ | |/ / | | | | | | | | | | * PHP-5.5: fix zts | ||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Anatol Belski | 2014-01-22 | 1 | -2/+2 |
| |\ \ | | |/ | | | | | | | | | | * PHP-5.4: fix zts | ||||
| | * | fix zts | Anatol Belski | 2014-01-22 | 1 | -2/+2 |
| | | | |||||
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Yasuo Ohgaki | 2014-01-22 | 1 | -1/+45 |
|\ \ \ | |/ / | | | | | | | | | | | | | * PHP-5.5: Fixed previous commit may delete unwanted cookies. Re-fixed bug #66469 | ||||
| * | | Fixed previous commit may delete unwanted cookies. | Yasuo Ohgaki | 2014-01-22 | 1 | -1/+45 |
| |\ \ | | |/ | |||||
| | * | Fixed previous commit may delete unwanted cookies. Sync tests from upper ↵ | Yasuo Ohgaki | 2014-01-22 | 4 | -6/+52 |
| | | | | | | | | | | | | branches. | ||||
| | * | Re-fixed bug #66469 | Yasuo Ohgaki | 2014-01-22 | 6 | -13/+14 |
| | | | |||||
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Yasuo Ohgaki | 2014-01-22 | 3 | -3/+3 |
|\ \ \ | |/ / | | | | | | | | | | * PHP-5.5: Re-fixed bug #66469 | ||||
| * | | Re-fixed bug #66469 | Yasuo Ohgaki | 2014-01-22 | 3 | -3/+3 |
| | | | |||||
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Anatol Belski | 2014-01-17 | 2 | -0/+18 |
|\ \ \ | |/ / | | | | | | | | | | * PHP-5.5: forked the test for bug #66481 | ||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Anatol Belski | 2014-01-17 | 2 | -0/+18 |
| |\ \ | | |/ | | | | | | | | | | * PHP-5.4: forked the test for bug #66481 | ||||
| | * | forked the test for bug #66481 | Anatol Belski | 2014-01-17 | 2 | -0/+18 |
| | | |