| Index: net/third_party/nss/ssl/sslsock.c
|
| diff --git a/net/third_party/nss/ssl/sslsock.c b/net/third_party/nss/ssl/sslsock.c
|
| index c61ab440ead4b7fb456038e115c3e599853236a0..3bd11d2ded9129343ef7d8734ef3a4602dc2a3fa 100644
|
| --- a/net/third_party/nss/ssl/sslsock.c
|
| +++ b/net/third_party/nss/ssl/sslsock.c
|
| @@ -2903,6 +2903,13 @@ ssl_SetDefaultsFromEnvironment(void)
|
| ssl_trace = atoi(ev);
|
| SSL_TRACE(("SSL: tracing set to %d", ssl_trace));
|
| }
|
| +#endif /* TRACE */
|
| + ev = getenv("SSLDEBUG");
|
| + if (ev && ev[0]) {
|
| + ssl_debug = atoi(ev);
|
| + SSL_TRACE(("SSL: debugging set to %d", ssl_debug));
|
| + }
|
| +#endif /* DEBUG */
|
| ev = getenv("SSLKEYLOGFILE");
|
| if (ev && ev[0]) {
|
| ssl_keylog_iob = fopen(ev, "a");
|
| @@ -2912,13 +2919,6 @@ ssl_SetDefaultsFromEnvironment(void)
|
| }
|
| SSL_TRACE(("SSL: logging pre-master secrets to %s", ev));
|
| }
|
| -#endif /* TRACE */
|
| - ev = getenv("SSLDEBUG");
|
| - if (ev && ev[0]) {
|
| - ssl_debug = atoi(ev);
|
| - SSL_TRACE(("SSL: debugging set to %d", ssl_debug));
|
| - }
|
| -#endif /* DEBUG */
|
| ev = getenv("SSLBYPASS");
|
| if (ev && ev[0]) {
|
| ssl_defaults.bypassPKCS11 = (ev[0] == '1');
|
|
|