Julien Pauli
4d3a3811a9
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix flaws in session module
Conflicts:
ext/session/session.c
2015-03-16 16:11:02 +01: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
Anatol Belski
b680ccb2b0
the test shouldn't fail when unlink failed
2015-03-13 17:33:47 +01:00
Dmitry Stogov
8633685675
Use specialized macro for string zval creation
2015-03-12 16:53:51 +03:00
Dmitry Stogov
1c94ff0595
Implement engine exceptions
...
RFC: https://wiki.php.net/rfc/engine_exceptions_for_php7
Pending changes regarding naming of BaseException and whether it
should be an interface.
2015-03-09 14:01:32 +01:00
Reeze Xia
609f05fc19
ZTS cleanup
2015-03-08 19:25:55 +08:00
Anatol Belski
af3ca74501
made ZEND_TSRMLS_CACHE_* macros look like function calls
...
which also comply with the current semantics for such macros
2015-02-16 17:19:32 +01:00
Dmitry Stogov
e10e151e9b
Merged zend_array and HashTable into the single data structure.
...
Now each HashTable is also zend_array, so it's refcounted and may be a subject for Copy on Write
zend_array_dup() was changed to allocate and return HashTable, instead of taking preallocated HashTable as argument.
2015-02-13 22:20:39 +03:00
Yasuo Ohgaki
741b5952c6
Pass maxlifetime to save handlers
2015-02-12 13:07:27 +09:00
Anatol Belski
2895912756
fix dir separator in test
2015-02-11 15:10:48 +01:00
Yasuo Ohgaki
dbb1298fdb
Fixed typos in comments
2015-02-04 05:00:03 +09:00
Yasuo Ohgaki
1aa6242dcf
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed Bug #66623 no EINTR check on flock(LOCK_EX)
Conflicts:
ext/session/mod_files.c
2015-02-03 14:07:23 +09: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
5afe554d32
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #68063 Empty session IDs do still start sessions
Conflicts:
ext/session/session.c
ext/session/tests/bug61470.phpt
2015-02-03 13:49:14 +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
Yasuo Ohgaki
e93042998a
Fixed bug #61470 - session_regenerate_id() does not create session file.
...
Made session_regenerate_id() raise error for wrong usage.
2015-02-03 12:23:00 +09:00
Yasuo Ohgaki
92576c7c49
XFAIL broken test for now.
...
Partially fixed test session.save_path difference.
2015-02-03 03:05:03 +09:00
Adam Harvey
fea4c22266
Merge branch 'PHP-5.6'
2015-02-02 11:32:03 +00: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
c7eea5a79b
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Add test for bug #61470 . It is already fixed.
2015-02-02 18:41:25 +09: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
f248df9003
Cleanup trans sid code. Behavior is unchanged.
...
Fixed possible injections. Escape values usually internal safe values.
2015-02-02 17:06:16 +09:00
Xinchen Hui
f1981365f5
Fixed #68966 (php7 make file ext/session/mod_mm.lo failed)
2015-02-02 14:24:41 +08:00
Yasuo Ohgaki
d8803d8147
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed typo in comment
2015-02-01 05:15:27 +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
Michael Wallner
330d158e93
fix warning
2015-01-30 20:11:25 +01:00
Anatol Belski
bc5686f5d2
remove unused variable
2015-01-30 10:30:45 +01:00
Yasuo Ohgaki
7f52978c67
Remove excessive macros
2015-01-29 19:48:50 +09:00
Yasuo Ohgaki
07a5dfca5b
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Use bash rather than sh
2015-01-29 15:27:24 +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
Xinchen Hui
d96eb4b0a8
reorder the branches
2015-01-29 12:50:56 +08:00
Xinchen Hui
18c647cce2
Merge branch 'master' of https://git.php.net/repository/php-src
2015-01-29 12:35:44 +08:00
Xinchen Hui
14396a3264
ppid must be IS_STRING
2015-01-29 12:35:18 +08:00
Yasuo Ohgaki
70b2d2eefa
Use proper type
2015-01-29 13:31:40 +09:00
Xinchen Hui
4da7e4de29
The argument must be not changed in session_start
2015-01-29 12:26:13 +08:00
Yasuo Ohgaki
7a97eaf25d
Cleanup session id files after test
2015-01-29 10:31:39 +09:00
Yasuo Ohgaki
f90f6108c8
Merge branch 'master' into master-rfc-session-lock4
...
Conflicts:
UPGRADING
2015-01-29 09:55:36 +09:00
Yasuo Ohgaki
14d68d3641
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed Bug #68941 mod_files.sh is a bash-script
2015-01-29 09:31:21 +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
a0cf025134
Fixed #68868 (Segfault in clean_non_persistent_constants() in SugarCRM 6.5.20)
2015-01-28 17:12:23 +08:00
