Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix session issue 14694 #14759

Merged
merged 7 commits into from
Jan 23, 2020
Merged

Fix session issue 14694 #14759

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
66f1107
Lock files while writing.
ruudboon Jan 22, 2020
6281551
Wait for lock is removed
ruudboon Jan 22, 2020
34f079d
Wait for lock is removed
ruudboon Jan 22, 2020
725a53f
Fixed in storage adapter as well
ruudboon Jan 22, 2020
263980a
Updated Changelog
ruudboon Jan 22, 2020
fdaa9c3
Styling fix [ci-skip]
ruudboon Jan 22, 2020
bf85ce6
Merge branch '4.0.x' into fix-session-issue-14694
ruudboon Jan 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Wait for lock is removed
  • Loading branch information
@ruudboon
ruudboon committed Jan 22, 2020
commit 628155117882cb6472d2be601b2a2d1608fc00c5
7 changes: 6 additions & 1 deletion phalcon/Session/Adapter/Stream.zep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,12 @@ class Stream extends Noop
data = "";

if file_exists(name) {
let data = file_get_contents(name);
let pointer = fopen(name, 'r');

if(flock(pointer, LOCK_SH)) {
ruudboon marked this conversation as resolved.
Show resolved Hide resolved
let data = file_get_contents(name);
}
fclose(pointer);

if false === data {
return "";
Expand Down