projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
http_client.c: make HTTP_LINE1_MINLEN more efficient
[openssl.git]
/
crypto
/
http
/
http_client.c
diff --git
a/crypto/http/http_client.c
b/crypto/http/http_client.c
index 83bf3c18227df19f28e78b4668019afbad80e8be..1652a2c9a0e129fe4a4bf47191c5178c0117b6bc 100644
(file)
--- a/
crypto/http/http_client.c
+++ b/
crypto/http/http_client.c
@@
-29,7
+29,7
@@
#define HTTP_PREFIX_VERSION HTTP_PREFIX""HTTP_VERSION_PATT
#define HTTP_1_0 HTTP_PREFIX_VERSION"0" /* "HTTP/1.0" */
#define HTTP_VERSION_STR_LEN (strlen(HTTP_PREFIX_VERSION) + 1)
#define HTTP_PREFIX_VERSION HTTP_PREFIX""HTTP_VERSION_PATT
#define HTTP_1_0 HTTP_PREFIX_VERSION"0" /* "HTTP/1.0" */
#define HTTP_VERSION_STR_LEN (strlen(HTTP_PREFIX_VERSION) + 1)
-#define HTTP_LINE1_MINLEN (
(int)strlen(HTTP_PREFIX_VERSION "x 200\n")
)
+#define HTTP_LINE1_MINLEN (
sizeof(HTTP_PREFIX_VERSION "x 200\n") - 1
)
#define HTTP_VERSION_MAX_REDIRECTIONS 50
#define HTTP_STATUS_CODE_OK 200
#define HTTP_VERSION_MAX_REDIRECTIONS 50
#define HTTP_STATUS_CODE_OK 200
@@
-1292,7
+1292,7
@@
int OSSL_HTTP_proxy_connect(BIO *bio, const char *server, const char *port,
*/
read_len = BIO_gets(fbio, mbuf, BUF_SIZE);
/* the BIO may not block, so we must wait for the 1st line to come in */
*/
read_len = BIO_gets(fbio, mbuf, BUF_SIZE);
/* the BIO may not block, so we must wait for the 1st line to come in */
- if (read_len < HTTP_LINE1_MINLEN)
+ if (read_len <
(int)
HTTP_LINE1_MINLEN)
continue;
/* Check for HTTP/1.x */
continue;
/* Check for HTTP/1.x */