Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit e87fbcc

Browse filesBrowse files
committed
MFH: implement FR #53447 (Cannot disable SessionTicket extension for servers
that do not support it). Includes Tony's subsequent commit to fix a segfault.
1 parent 75de05c commit e87fbcc
Copy full SHA for e87fbcc

2 files changed

+17Lines changed: 17 additions & 0 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎NEWS‎

Copy file name to clipboardExpand all lines: NEWS
+5Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@
2727
. Fixed bug #53425 (mysqli_real_connect() ignores client flags when built to
2828
call libmysql). (Kalle, tre-php-net at crushedhat dot com)
2929

30+
- OpenSSL extension:
31+
. Implemented FR #53447 (Cannot disable SessionTicket extension for servers
32+
that do not support it) by adding a no_ticket SSL context option. (Adam,
33+
Tony)
34+
3035
- PDO Oracle driver:
3136
. Fixed bug #39199 (Cannot load Lob data with more than 4000 bytes on
3237
ORACLE 10). (spatar at mail dot nnov dot ru)
Collapse file

‎ext/openssl/xp_ssl.c‎

Copy file name to clipboardExpand all lines: ext/openssl/xp_ssl.c
+12Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,18 @@ static inline int php_openssl_setup_crypto(php_stream *stream,
369369

370370
SSL_CTX_set_options(sslsock->ctx, SSL_OP_ALL);
371371

372+
#if OPENSSL_VERSION_NUMBER >= 0x0090806fL
373+
{
374+
zval **val;
375+
376+
if (stream->context && SUCCESS == php_stream_context_get_option(
377+
stream->context, "ssl", "no_ticket", &val) &&
378+
zval_is_true(*val)) {
379+
SSL_CTX_set_options(sslsock->ctx, SSL_OP_NO_TICKET);
380+
}
381+
}
382+
#endif
383+
372384
sslsock->ssl_handle = php_SSL_new_from_context(sslsock->ctx, stream TSRMLS_CC);
373385
if (sslsock->ssl_handle == NULL) {
374386
php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed to create an SSL handle");

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.