Commit8dada17

authored and

committed

Add an INI setting returning 5.x legacy behavior -- readonly session on lock failure

1 parent152fdda commit8dada17Copy full SHA for 8dada17

File tree

-3

lines changed

-3

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -114,6 +114,7 @@ PHP_INI_BEGIN()`
`114`	`114`	`PHP_INI_ENTRY("redis.session.lock_expire","0",PHP_INI_ALL,NULL)`
`115`	`115`	`PHP_INI_ENTRY("redis.session.lock_retries","100",PHP_INI_ALL,NULL)`
`116`	`116`	`PHP_INI_ENTRY("redis.session.lock_wait_time","20000",PHP_INI_ALL,NULL)`
	`117`	`+PHP_INI_ENTRY("redis.session.lock_failure_readonly","0",PHP_INI_ALL,NULL)`
`117`	`118`	`PHP_INI_ENTRY("redis.session.early_refresh","0",PHP_INI_ALL,NULL)`
`118`	`119`	`PHP_INI_ENTRY("redis.session.compression","none",PHP_INI_ALL,NULL)`
`119`	`120`	`PHP_INI_ENTRY("redis.session.compression_level","3",PHP_INI_ALL,NULL)`

Lines changed: 8 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -777,9 +777,14 @@ PS_READ_FUNC(redis)`
`777`	`777`	`}`
`778`	`778`
`779`	`779`	`if (lock_acquire(redis_sock,&pool->lock_status)!=SUCCESS) {`
`780`		`-php_error_docref(NULL,E_WARNING,"Failed to acquire session lock");`
`781`		`-efree(cmd);`
`782`		`-returnFAILURE;`
	`780`	`+if (INI_INT("redis.session.lock_failure_readonly")) {`
	`781`	`+// opt-in legacy behavior: readonly session`
	`782`	`+php_error_docref(NULL,E_WARNING,"Failed to acquire session lock, session will be read only");`
	`783`	`+ }else {`
	`784`	`+php_error_docref(NULL,E_WARNING,"Failed to acquire session lock");`
	`785`	`+efree(cmd);`
	`786`	`+returnFAILURE;`
	`787`	`+ }`
`783`	`788`	`}`
`784`	`789`
`785`	`790`	`if (redis_sock_write(redis_sock,cmd,cmd_len)<0) {`

Comments

(0)