com php-src: Merge branch 'PHP-7.1': ext/session/session.c

Commit: 71a42477ca07f6c6ec0621b06c1cea318a05b97a Author: Joe Watkins <krakjoe@php.net> Thu, 19 Jan 2017 10:49:09 +0000 Parents: 0311dc86978ac3d20a7a8d7e502e2e0b6fd6dc46 631861e1fa93b19788def94cf456d2993551c17f Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=71a42477ca07f6c6ec0621b06c1cea318a05b97a Log: Merge branch 'PHP-7.1' * PHP-7.1: Update comment, incorrect since 224aaf94 Changed paths: MM ext/session/session.c Diff: diff --cc ext/session/session.c index 6323020,d672b0c..02f8d8d --- a/ext/session/session.c +++ b/ext/session/session.c @@@ -435,10 -425,9 +435,9 @@@ static int php_session_initialize(void php_session_track_init(); if (PS(mod)->s_read(&PS(mod_data), PS(id), &val, PS(gc_maxlifetime)) == FAILURE) { php_session_abort(); - /* Some broken save handler implementation returns FAILURE for non-existent session ID */ - /* It's better to raise error for this, but disabled error for better compatibility */ + /* FYI: Some broken save handlers return FAILURE for non-existent session ID, this is incorrect */ php_error_docref(NULL, E_WARNING, "Failed to read session data: %s (path: %s)", PS(mod)->s_name, PS(save_path)); - return; + return FAILURE; } /* GC must be done after read */