Yasuo Ohgaki
02ff308e27
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Set NULL after efree
2015-04-24 16:05:50 +09:00
Yasuo Ohgaki
4c711200b4
Set NULL after efree
2015-04-24 16:04:01 +09:00
Julien Pauli
2a50877428
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix flaws in session module
2015-03-16 16:01:12 +01:00
Julien Pauli
4dba99c226
Fix flaws in session module
2015-03-16 16:00:46 +01:00
Yasuo Ohgaki
4dd7851208
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed Bug #66623 no EINTR check on flock(LOCK_EX)
2015-02-03 14:04:03 +09:00
Yasuo Ohgaki
b41a6c6f05
Fixed Bug #66623 no EINTR check on flock(LOCK_EX)
2015-02-03 14:02:58 +09:00
Yasuo Ohgaki
2983ef3c48
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #68063 Empty session IDs do still start sessions
2015-02-03 13:41:31 +09:00
Yasuo Ohgaki
853ae39d6e
Fixed bug #68063 Empty session IDs do still start sessions
2015-02-03 13:38:49 +09:00
Yasuo Ohgaki
665997bf16
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Bug #61470 is fixed only in master
2015-02-03 12:26:25 +09:00
Yasuo Ohgaki
17beba686e
Bug #61470 is fixed only in master
2015-02-03 12:26:01 +09:00
Adam Harvey
05d591dfdf
Merge branch 'PHP-5.5' into PHP-5.6
2015-02-02 11:31:54 +00:00
Adam Harvey
9d8b1170aa
Let's not assume bash is always /bin/bash.
2015-02-02 11:31:10 +00:00
Yasuo Ohgaki
675a12bbcf
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Add test for bug #61470 . It is already fixed.
2015-02-02 18:39:48 +09:00
Yasuo Ohgaki
fb803ff819
Add test for bug #61470 . It is already fixed.
2015-02-02 18:39:07 +09:00
Yasuo Ohgaki
d9a9afa499
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed typo in comment
2015-02-01 05:14:56 +09:00
Yasuo Ohgaki
c8a12508c7
Fixed typo in comment
2015-02-01 05:14:27 +09:00
Yasuo Ohgaki
7b06cc8d22
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Use bash rather than sh
2015-01-29 15:27:08 +09:00
Yasuo Ohgaki
d463ddd3c7
Use bash rather than sh
2015-01-29 15:21:17 +09:00
Yasuo Ohgaki
5f28622e09
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed Bug #68941 mod_files.sh is a bash-script
2015-01-29 09:29:11 +09:00
Yasuo Ohgaki
abf9e2ea09
Fixed Bug #68941 mod_files.sh is a bash-script
2015-01-29 09:25:28 +09:00
Xinchen Hui
0579e8278d
bump year
2015-01-15 23:26:37 +08:00
Xinchen Hui
73c1be2653
Bump year
2015-01-15 23:26:03 +08:00
Yasuo Ohgaki
9e072d9565
Remove unneeded md5 hashing from PHP-5.6 branch.
...
It's removed from master already by my previous commit.
2014-11-12 13:43:54 +09:00
Yasuo Ohgaki
4dd3fbfcd2
Fixed bug #68331 - This was partial patch for https://wiki.php.net/rfc/session-lock-ini
2014-11-06 13:06:29 +09:00
Adam Harvey
0cbfdc9df5
Merge branch 'PHP-5.5' into PHP-5.6
...
* 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
2014-09-08 19:28:15 +00:00
Adam Harvey
bc44eb6172
Fix bug #67972 (SessionHandler Invalid memory read create_sid()).
...
SessionHandler::create_sid() didn't check if PS(default_mod) was initialised
before attempting to call its create_sid() handler.
2014-09-08 19:25:14 +00:00
Tjerk Meesters
ce9bdae33f
Fixed #67694 : Regression in session_regenerate_id()
2014-08-23 09:18:02 +08:00
Stanislav Malyshev
c41ca94824
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix missing type checks in various functions
Conflicts:
ext/openssl/openssl.c
2014-07-28 00:37:32 -07:00
Stanislav Malyshev
531be9662f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix missing type checks in various functions
2014-07-28 00:34:27 -07:00
Stanislav Malyshev
b4a4db467b
Fix missing type checks in various functions
2014-07-27 02:42:49 -07:00
Xinchen Hui
9bef96d96e
Merge branch 'PHP-5.5' into PHP-5.6
2014-07-19 13:12:36 +08:00
Yasuo Ohgaki
f83a6c33b4
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #66827 Session raises E_NOTICE when session name variable is array
2014-07-19 09:53:04 +09:00
Yasuo Ohgaki
e946de29d2
Fixed bug #66827 Session raises E_NOTICE when session name variable is array
2014-07-19 09:52:31 +09:00
Ferenc Kovacs
f63ca453e0
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed test (it requires ext/hash)
2014-05-07 01:00:01 +02:00
Ferenc Kovacs
8e2d396b52
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed test (it requires ext/hash)
2014-05-07 00:55:05 +02:00
Dmitry Stogov
8517001b25
Fixed test (it requires ext/hash)
2014-05-07 00:52:49 +02:00
Ferenc Kovacs
d2f283884f
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed tests (they might fail from time to time because of session GC)
Fix author name on the #63228 patch.
2014-05-07 00:38:57 +02:00
Ferenc Kovacs
579898e338
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed tests (they might fail from time to time because of session GC)
Fix author name on the #63228 patch.
2014-05-07 00:38:32 +02:00
Dmitry Stogov
f880013c4d
Fixed tests (they might fail from time to time because of session GC)
2014-05-07 00:37:56 +02:00
Anatol Belski
634e6b61d9
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix windows build
2014-04-14 23:34:50 +02:00
Anatol Belski
793f67e852
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix windows build
2014-04-14 23:30:14 +02:00
Anatol Belski
24b72e7a27
fix windows build
2014-04-14 23:29:38 +02:00
Stanislav Malyshev
99b01fb3d7
ws fix
2014-04-14 13:35:59 -07:00
Stanislav Malyshev
8bc82718ae
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix #66942 : openssl_seal() memory leak
ws fix
Conflicts:
ext/openssl/openssl.c
2014-04-14 13:35:24 -07:00
Stanislav Malyshev
56f9727305
ws fix
2014-04-14 13:16:53 -07:00
Stanislav Malyshev
41569b1029
Fix bug #66171 : better handling of symlinks
2014-04-14 10:51:31 -07:00
Stanislav Malyshev
7f43aeb167
Fix bug #66171 : better handling of symlinks
2014-04-14 10:46:45 -07:00
Stanislav Malyshev
40a9316dff
Fix bug #66171 : better handling of symlinks
2014-04-14 10:44:53 -07:00
Yasuo Ohgaki
973f379efc
Remove unneeded test
2014-03-13 06:54:52 +09:00
Yasuo Ohgaki
6f0ad9ea12
Revert "Implement Bug #54649 Create session_serializer_name()"
...
This reverts commit 678ec30655
.
Conflicts:
ext/session/tests/session_serializer_name_basic.phpt
2014-03-13 06:32:49 +09:00