php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-03 14:12:38 +02:00
Code Issues Packages Projects Releases Wiki Activity
95,426 Commits 547 Branches 1,481 Tags
f63ba809a1961840407db08d0e5b59873b977366
Commit Graph

1250 Commits

Author SHA1 Message Date
Yasuo Ohgaki
dc9ae10bc4 Remove debug code 2016-04-07 17:13:05 +09:00
Yasuo Ohgaki
60b144134a Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed Bug #71974 Trans sid will always be send, even if cookies are available
 2016-04-07 10:26:32 +09:00
Yasuo Ohgaki
6467a4eb36 Fixed Bug #71974 Trans sid will always be send, even if cookies are available 2016-04-07 10:26:05 +09:00
Yasuo Ohgaki
01579ae0a6 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed Bug #71683 Null pointer dereference in zend_hash_str_find_bucket
 2016-03-12 08:33:04 +09:00
Yasuo Ohgaki
50fca7a02a Fixed Bug #71683 Null pointer dereference in zend_hash_str_find_bucket 2016-03-12 08:15:47 +09:00
Xinchen Hui
4c388004d4 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #71754 (Regression in PHP7.0: trivial script segfaults php-cgi)
  Bug #71756 (Call-by-reference widens scope to uninvolved functions when used in switch)
  tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752)
 2016-03-10 15:03:25 +08:00
Xinchen Hui
98c625a31c Fixed bug #71754 (Regression in PHP7.0: trivial script segfaults php-cgi) 2016-03-10 15:02:10 +08:00
Nikita Popov
f57c0b3249 Merge branch 'PHP-7.0' 2016-03-03 16:50:47 +01:00
Nikita Popov
1ac152938c Move semicolon into TSRMLS_CACHE_EXTERN/DEFINE 
Also re bug #71575.
 2016-03-03 16:50:01 +01:00
Nikita Popov
a4e56194d7 Fix intermixed SKIPIF and XFAIL sections in test 2016-03-03 16:38:05 +01:00
Rouven Weßling
a61029b155 Replace usage of php_int32 and php_uint32 with int32_t and uint32_t 2016-02-04 11:57:41 +01:00
Antony Dovgal
6f81e95c33 check length first, prevent out-of-bounds read 2016-02-03 14:49:16 +03:00
Antony Dovgal
64e8cfadf5 check length first, prevent out-of-bounds read 2016-02-03 14:48:38 +03:00
Anatol Belski
1df334b75c revert test to the previous master state 2016-01-29 22:37:37 +01:00
Anatol Belski
620f4169a7 Merge branch 'PHP-7.0' 
* PHP-7.0:
  yet one revert
  Revert "adjust test for 7.0"

Conflicts:
	ext/session/tests/bug69111.phpt
 2016-01-29 21:46:15 +01:00
Anatol Belski
b947aff98d yet one revert 2016-01-29 21:43:14 +01:00
Anatol Belski
ac22f71477 Revert "adjust test for 7.0" 
This reverts commit 7fdb019e66.
 2016-01-29 21:27:22 +01:00
Anatol Belski
58b2344759 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Revert "refix #69111 and one related test"
  Revert "fix yet another leak"
  add XFAIL
  Revert "refix #69111 and one related test"
  Revert "fix tests"
  Revert "fix leak in 7.0"
  add XFAIL
  Revert "fix leak in 5.6"

Conflicts:
	ext/session/tests/rfc1867_sid_invalid.phpt
 2016-01-29 21:07:19 +01:00
Anatol Belski
6891e6abdf Revert "refix #69111 and one related test" 
This reverts commit 80f7b01258.

Conflicts:
	ext/session/mod_files.c
 2016-01-29 20:59:58 +01:00
Anatol Belski
3d90531d1e Revert "fix yet another leak" 
This reverts commit 39084ccc68.
 2016-01-29 20:58:00 +01:00
Anatol Belski
d1d3c0832e add XFAIL 2016-01-29 20:57:05 +01:00
Anatol Belski
ebcfe7618d Revert "refix #69111 and one related test" 
This reverts commit 80f7b01258.
 2016-01-29 20:50:14 +01:00
Anatol Belski
7f977c13dc Revert "fix tests" 
This reverts commit d964ccba40.
 2016-01-29 20:49:52 +01:00
Anatol Belski
57d9797b6f Revert "fix leak in 7.0" 
This reverts commit ee49df011c.
 2016-01-29 20:46:47 +01:00
Anatol Belski
1a9402c6ec Merge branch 'PHP-7.0' 
* PHP-7.0:
  refix #69111 and one related test

Conflicts:
	ext/session/tests/rfc1867_sid_invalid.phpt
 2016-01-29 19:59:26 +01:00
Anatol Belski
80f7b01258 refix #69111 and one related test 
It is the least evil as the test just reduces the fail path. 5.6 seems
still broken in this regard, a backport should follow if travis is happy.
 2016-01-29 19:55:50 +01:00
Anatol Belski
6cc01882fb Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix tests
 2016-01-29 16:33:19 +01:00
Anatol Belski
d964ccba40 fix tests 2016-01-29 16:32:27 +01:00
Anatol Belski
f1dc4a4e10 Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix yet another leak
 2016-01-29 16:04:13 +01:00
Anatol Belski
39084ccc68 fix yet another leak 2016-01-29 16:03:33 +01:00
Anatol Belski
15ba618a69 Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix wrong gc sequence
 2016-01-29 15:19:40 +01:00
Anatol Belski
d2c752d7e9 fix wrong gc sequence 2016-01-29 15:18:59 +01:00
Anatol Belski
55fd320b31 Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix leak in 7.0
 2016-01-29 14:48:36 +01:00
Anatol Belski
ee49df011c fix leak in 7.0 2016-01-29 14:48:05 +01:00
Anatol Belski
d9eea2c209 revert the API string as well 2016-01-29 12:52:41 +01:00
Anatol Belski
7fdb019e66 adjust test for 7.0 2016-01-29 12:29:41 +01:00
Anatol Belski
a068047f62 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  add test for bug #69111
 2016-01-29 12:29:05 +01:00
Anatol Belski
4b0feeb8fa add test for bug #69111 2016-01-29 12:27:35 +01:00
Anatol Belski
25108babdb refix bug #69111, crash in 5.6 only 2016-01-29 11:24:19 +01:00
Anatol Belski
b858224b88 reset ext/session to the state of 7.0.2 2016-01-29 08:37:27 +01:00
Anatol Belski
ae6e139c77 reset the ext/session to the state of 5.6.17 2016-01-29 08:33:09 +01:00
Yasuo Ohgaki
99101ba310 Update error message. Missed to include in previous commit 46d4a37105 2016-01-28 15:06:55 +09:00
Mikko
46d4a37105 Session regenerate id seems to malfunction with 3rd party session handlers 
Fixed bug #71472 session_regenerate_id malfunctions with certain session handlers
 2016-01-28 13:30:10 +09:00
Yasuo Ohgaki
2dce532a90 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Use SUCCESS/FAILURE
 2016-01-18 13:35:43 +09:00
Yasuo Ohgaki
d7fc3be99e Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Use SUCCESS/FAILURE
 2016-01-18 13:35:01 +09:00
Yasuo Ohgaki
ee1dd4949a Use SUCCESS/FAILURE 2016-01-18 13:33:47 +09:00
Yasuo Ohgaki
05e87fa418 Fixed bug #71070 Custom session handler write method returns false, warning message misleading 
This is commited to master only.
If you have better error message suggestion, feel free to improve it.
 2016-01-18 12:03:41 +09:00
Yasuo Ohgaki
1277846228 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #71394 (session_regenerate_id() must close opened session on errors)
 2016-01-17 17:12:49 +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