walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge pull request #895 from nghttp2/nghttpx-rename-ssl-log-vars 

nghttpx: Rename ssl_* log variables as tls_*
This commit is contained in:
Tatsuhiro Tsujikawa 2017-04-18 22:31:44 +09:00 committed by GitHub
parent 2c5cf5a82a 03be97e437
commit 8ce8e289c9
4 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gennghttpxfun.py
View File

@ -184,6 +184,10 @@ LOGVARS = [
"ssl_protocol", "ssl_protocol",
"ssl_session_id", "ssl_session_id",
"ssl_session_reused", "ssl_session_reused",
"tls_cipher",
"tls_protocol",
"tls_session_id",
"tls_session_reused",
"backend_host", "backend_host",
"backend_port", "backend_port",
] ]

8
src/shrpx.cc
View File

@ -2447,10 +2447,10 @@ Logging:
* $alpn: ALPN identifier of the protocol which generates * $alpn: ALPN identifier of the protocol which generates
the response. For HTTP/1, ALPN is always http/1.1, the response. For HTTP/1, ALPN is always http/1.1,
regardless of minor version. regardless of minor version.
* $ssl_cipher: cipher used for SSL/TLS connection. * $tls_cipher: cipher used for SSL/TLS connection.
* $ssl_protocol: protocol for SSL/TLS connection. * $tls_protocol: protocol for SSL/TLS connection.
* $ssl_session_id: session ID for SSL/TLS connection. * $tls_session_id: session ID for SSL/TLS connection.
* $ssl_session_reused: "r" if SSL/TLS session was * $tls_session_reused: "r" if SSL/TLS session was
reused. Otherwise, "." reused. Otherwise, "."
* $backend_host: backend host used to fulfill the * $backend_host: backend host used to fulfill the
request. "-" if backend host is not available. request. "-" if backend host is not available.

12
src/shrpx_config.cc
View File

@ -419,6 +419,9 @@ LogFragmentType log_var_lookup_token(const char *name, size_t namelen) {
if (util::strieq_l("ssl_ciphe", name, 9)) { if (util::strieq_l("ssl_ciphe", name, 9)) {
return SHRPX_LOGF_SSL_CIPHER; return SHRPX_LOGF_SSL_CIPHER;
} }
if (util::strieq_l("tls_ciphe", name, 9)) {
return SHRPX_LOGF_TLS_CIPHER;
}
break; break;
} }
break; break;
@ -455,6 +458,9 @@ LogFragmentType log_var_lookup_token(const char *name, size_t namelen) {
if (util::strieq_l("ssl_protoco", name, 11)) { if (util::strieq_l("ssl_protoco", name, 11)) {
return SHRPX_LOGF_SSL_PROTOCOL; return SHRPX_LOGF_SSL_PROTOCOL;
} }
if (util::strieq_l("tls_protoco", name, 11)) {
return SHRPX_LOGF_TLS_PROTOCOL;
}
break; break;
case 't': case 't':
if (util::strieq_l("backend_hos", name, 11)) { if (util::strieq_l("backend_hos", name, 11)) {
@ -472,6 +478,9 @@ LogFragmentType log_var_lookup_token(const char *name, size_t namelen) {
if (util::strieq_l("ssl_session_i", name, 13)) { if (util::strieq_l("ssl_session_i", name, 13)) {
return SHRPX_LOGF_SSL_SESSION_ID; return SHRPX_LOGF_SSL_SESSION_ID;
} }
if (util::strieq_l("tls_session_i", name, 13)) {
return SHRPX_LOGF_TLS_SESSION_ID;
}
break; break;
} }
break; break;
@ -490,6 +499,9 @@ LogFragmentType log_var_lookup_token(const char *name, size_t namelen) {
if (util::strieq_l("ssl_session_reuse", name, 17)) { if (util::strieq_l("ssl_session_reuse", name, 17)) {
return SHRPX_LOGF_SSL_SESSION_REUSED; return SHRPX_LOGF_SSL_SESSION_REUSED;
} }
if (util::strieq_l("tls_session_reuse", name, 17)) {
return SHRPX_LOGF_TLS_SESSION_REUSED;
}
break; break;
} }
break; break;

12
src/shrpx_log.h
View File

@ -129,10 +129,14 @@ enum LogFragmentType {
SHRPX_LOGF_REQUEST_TIME, SHRPX_LOGF_REQUEST_TIME,
SHRPX_LOGF_PID, SHRPX_LOGF_PID,
SHRPX_LOGF_ALPN, SHRPX_LOGF_ALPN,
SHRPX_LOGF_SSL_CIPHER, SHRPX_LOGF_TLS_CIPHER,
SHRPX_LOGF_SSL_PROTOCOL, SHRPX_LOGF_SSL_CIPHER = SHRPX_LOGF_TLS_CIPHER,
SHRPX_LOGF_SSL_SESSION_ID, SHRPX_LOGF_TLS_PROTOCOL,
SHRPX_LOGF_SSL_SESSION_REUSED, SHRPX_LOGF_SSL_PROTOCOL = SHRPX_LOGF_TLS_PROTOCOL,
SHRPX_LOGF_TLS_SESSION_ID,
SHRPX_LOGF_SSL_SESSION_ID = SHRPX_LOGF_TLS_SESSION_ID,
SHRPX_LOGF_TLS_SESSION_REUSED,
SHRPX_LOGF_SSL_SESSION_REUSED = SHRPX_LOGF_TLS_SESSION_REUSED,
SHRPX_LOGF_BACKEND_HOST, SHRPX_LOGF_BACKEND_HOST,
SHRPX_LOGF_BACKEND_PORT, SHRPX_LOGF_BACKEND_PORT,
}; };