diff options
| author | Thomas E. Dickey <dickey@invisible-island.net> | 2009-04-07 22:45:42 -0400 |
|---|---|---|
| committer | Thomas E. Dickey <dickey@invisible-island.net> | 2009-04-07 22:45:42 -0400 |
| commit | 7b0f5c3465fd2b45c4eeab192e09261f9569a930 (patch) | |
| tree | 23a6933bd656877448d1e4aa7e5ca95da3e8758f /WWW | |
| parent | c8d562f7d42dcd247955a83cb8bdf1fd1b0a7f82 (diff) | |
| download | lynx-snapshots-7b0f5c3465fd2b45c4eeab192e09261f9569a930.tar.gz | |
snapshot of project "lynx", label v2-8-7pre_1a
Diffstat (limited to 'WWW')
| -rw-r--r-- | WWW/Library/Implementation/HTTP.c | 17 | ||||
| -rw-r--r-- | WWW/Library/Implementation/HTTP.h | 10 |
2 files changed, 17 insertions, 10 deletions
diff --git a/WWW/Library/Implementation/HTTP.c b/WWW/Library/Implementation/HTTP.c index 3d87d441..7d8e8601 100644 --- a/WWW/Library/Implementation/HTTP.c +++ b/WWW/Library/Implementation/HTTP.c @@ -1,5 +1,5 @@ /* - * $LynxId: HTTP.c,v 1.106 2009/03/10 15:31:22 tom Exp $ + * $LynxId: HTTP.c,v 1.107 2009/04/07 22:45:42 tom Exp $ * * HyperText Tranfer Protocol - Client implementation HTTP.c * ========================== @@ -59,7 +59,7 @@ struct _HTStream { HTStreamClass *isa; }; -BOOL reloading = FALSE; /* Reloading => send no-cache pragma to proxy */ +BOOLEAN reloading = FALSE; /* Reloading => send no-cache pragma to proxy */ char *redirecting_url = NULL; /* Location: value. */ BOOL permanent_redirection = FALSE; /* Got 301 status? */ BOOL redirect_post_content = FALSE; /* Don't convert to GET? */ @@ -661,10 +661,18 @@ static int HTLoadHTTP(const char *arg, if (did_connect || !strncmp(url, "https", 5)) { SSL_handle = handle = HTGetSSLHandle(); SSL_set_fd(handle, s); + /* get host we're connecting to */ + ssl_host = HTParse(url, "", PARSE_HOST); + ssl_host = StripIpv6Brackets(ssl_host); #if SSLEAY_VERSION_NUMBER >= 0x0900 #ifndef USE_NSS_COMPAT_INCL - if (!try_tls) + if (!try_tls) { handle->options |= SSL_OP_NO_TLSv1; +#if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT) + } else { + SSL_set_tlsext_host_name(handle, ssl_host); +#endif + } #endif #endif /* SSLEAY_VERSION_NUMBER >= 0x0900 */ HTSSLInitPRNG(); @@ -777,9 +785,6 @@ static int HTLoadHTTP(const char *arg, /* initialise status information */ status_sslcertcheck = 0; /* 0 = no CN found in DN */ ssl_dn_start = ssl_dn; - /* get host we're connecting to */ - ssl_host = HTParse(url, "", PARSE_HOST); - ssl_host = StripIpv6Brackets(ssl_host); /* validate all CNs found in DN */ CTRACE((tfp, "Validating CNs in '%s'\n", ssl_dn_start)); diff --git a/WWW/Library/Implementation/HTTP.h b/WWW/Library/Implementation/HTTP.h index 1d570322..f10c2fce 100644 --- a/WWW/Library/Implementation/HTTP.h +++ b/WWW/Library/Implementation/HTTP.h @@ -1,6 +1,8 @@ -/* /Net/dxcern/userd/timbl/hypertext/WWW/Library/Implementation/HTTP.html - HYPERTEXT TRANFER PROTOCOL - +/* + * $LynxId: HTTP.h,v 1.10 2009/04/07 22:44:50 tom Exp $ + * + * /Net/dxcern/userd/timbl/hypertext/WWW/Library/Implementation/HTTP.html + * HYPERTEXT TRANFER PROTOCOL */ #ifndef HTTP_H #define HTTP_H @@ -24,7 +26,7 @@ extern "C" { #define URL_MAIL_METHOD 3 extern int ws_read_per_sec; - extern BOOL reloading; + extern BOOLEAN reloading; extern char *redirecting_url; extern BOOL permanent_redirection; extern BOOL redirect_post_content; |