I am uploading a NMU to DELAYED/10 in order to fix this.
The debdiff is attached.
diff -Nru cntlm-0.92.3/debian/changelog cntlm-0.92.3/debian/changelog
--- cntlm-0.92.3/debian/changelog 2024-02-18 17:09:07.000000000 +0000
+++ cntlm-0.92.3/debian/changelog 2024-02-18 16:59:48.000000000 +0000
@@ -1,3 +1,11 @@
+cntlm (0.92.3-1.3) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Convert to source format 3.0. Closes: #683640.
+ * d/copyright: Convert to machine-readable format.
+
+ -- Bastian Germann <b...@debian.org> Sun, 18 Feb 2024 16:59:48 +0000
+
cntlm (0.92.3-1.2) unstable; urgency=medium
[ Gianfranco Costamagna ]
@@ -61,7 +69,7 @@
-- David Watson <dwat...@debian.org> Tue, 08 Jan 2008 23:34:29 +0000
-cntlm (0.35.1-1) unstable; urgency=low
+cntlm (0.35.1-1) unstable; urgency=low
[ David Kubicek ]
* New upstream release
@@ -147,4 +155,3 @@
* Makefile adjustments regarding installation directories
-- David Kubicek <d...@awk.cz> Fri, 01 Jun 2007 17:36:34 +0200
-
diff -Nru cntlm-0.92.3/debian/copyright cntlm-0.92.3/debian/copyright
--- cntlm-0.92.3/debian/copyright 2024-02-18 17:09:07.000000000 +0000
+++ cntlm-0.92.3/debian/copyright 2024-02-18 16:59:48.000000000 +0000
@@ -1,32 +1,36 @@
-This package was debianized by David Kubicek <d...@awk.cz> on
-Fri, 01 Jun 2007 10:46:26 +0200.
-
-The current Debian maintainer is David Watson <dwat...@debian.org>
-
-It was downloaded from <http://svn.awk.cz/cntlm>
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Comment:
+ This package was debianized by David Kubicek <d...@awk.cz> on
+ Fri, 01 Jun 2007 10:46:26 +0200.
+ .
+ The current Debian maintainer is David Watson <dwat...@debian.org>
+Source:
+ <http://svn.awk.cz/cntlm>
+Files: *
Copyright:
-
Copyright (C) 2007 David Kubicek
-
-License:
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License (version 2) as published
-by the Free Software Foundation; either version 2 of the License.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License with
-the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL-2;
-if not, write to the Free Software Foundation, Inc., 51 Franklin St,
-Fifth Floor, Boston, MA 02110-1301, USA.
-
-On Debian systems, the complete text of the GNU General Public
-License, version 2, can be found in /usr/share/common-licenses/GPL-2.
-
-The Debian packaging is Copyright (C) 2007, David Kubicek <d...@awk.cz> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'.
+License: GPL-2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License (version 2) as published
+ by the Free Software Foundation; either version 2 of the License,
+ or (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License with
+ the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL-2;
+ if not, write to the Free Software Foundation, Inc., 51 Franklin St,
+ Fifth Floor, Boston, MA 02110-1301, USA.
+Comment:
+ On Debian systems, the complete text of the GNU General Public
+ License, version 2, can be found in /usr/share/common-licenses/GPL-2.
+
+Files: debian/*
+Copyright: (C) 2007, David Kubicek <d...@awk.cz>
+License: GPL-2
+ The Debian packaging is licensed under the GPL,
+ see `/usr/share/common-licenses/GPL-2'.
diff -Nru cntlm-0.92.3/debian/patches/debian.patch
cntlm-0.92.3/debian/patches/debian.patch
--- cntlm-0.92.3/debian/patches/debian.patch 1970-01-01 00:00:00.000000000
+0000
+++ cntlm-0.92.3/debian/patches/debian.patch 2024-02-18 16:59:48.000000000
+0000
@@ -0,0 +1,226 @@
+--- cntlm-0.92.3.orig/direct.c
++++ cntlm-0.92.3/direct.c
+@@ -282,8 +282,19 @@ rr_data_t direct_request(void *cdata, rr
+ data[0]->url = strdup(data[0]->rel_url);
+ }
+
+- data[0]->headers = hlist_mod(data[0]->headers,
"Connection", "keep-alive", 1);
+- data[0]->headers = hlist_del(data[0]->headers,
"Proxy-Authorization");
++ /*
++ * Force proxy keep-alive if the client can
handle it (HTTP >= 1.1)
++ */
++ if (data[0]->http_version >= 11)
++ data[0]->headers =
hlist_mod(data[0]->headers, "Connection", "keep-alive", 1);
++
++ /*
++ * Also remove runaway P-A from the client
(e.g. Basic from N-t-B), which might
++ * cause some ISAs to deny us, even if the
connection is already auth'd.
++ */
++ while (hlist_get(data[loop]->headers,
"Proxy-Authorization")) {
++ data[loop]->headers =
hlist_del(data[loop]->headers, "Proxy-Authorization");
++ }
+
+ /*
+ * Try to get auth from client if present
+@@ -373,18 +384,25 @@ rr_data_t direct_request(void *cdata, rr
+ */
+ if (loop == 1) {
+ conn_alive = !hlist_subcmp(data[1]->headers,
"Connection", "close")
+- && http_has_body(data[0], data[1]) !=
-1;
++ && http_has_body(data[0], data[1]) != -1
++ && data[0]->http_version >= 11;
+ if (conn_alive) {
+ data[1]->headers =
hlist_mod(data[1]->headers, "Proxy-Connection", "keep-alive", 1);
+ data[1]->headers =
hlist_mod(data[1]->headers, "Connection", "keep-alive", 1);
+ } else {
+ data[1]->headers =
hlist_mod(data[1]->headers, "Proxy-Connection", "close", 1);
++ data[1]->headers =
hlist_mod(data[1]->headers, "Connection", "close", 1);
+ rc = (void *)-1;
+ }
+ }
+
+- if (debug)
++ if (debug) {
+ printf("Sending headers (%d)...\n",
*wsocket[loop]);
++ if (loop == 0) {
++ printf("HEAD: %s %s %s\n",
data[loop]->method, data[loop]->url, data[loop]->http);
++ hlist_dump(data[loop]->headers);
++ }
++ }
+
+ /*
+ * Send headers
+--- cntlm-0.92.3.orig/doc/cntlm.1
++++ cntlm-0.92.3/doc/cntlm.1
+@@ -124,7 +124,7 @@ username in the password dialog: "domain
+ .B -c <filename>
+ Configuration file. Command-line options, if used, override its single
options or are added at the top of the
+ list for multi options (tunnels, parent proxies, etc) with the exception of
ACLs, which are completely
+-overriden. Use \fI/dev/null\fP to disable any config file.
++overridden. Use \fI/dev/null\fP to disable any config file.
+
+ .TP
+ .B -D IP/mask\ \ \ \ (Deny)
+@@ -191,7 +191,7 @@ password prompt is issued. Use this opti
+ .TP
+ .B -L [<saddr>:]<lport>:<rhost>:<rport>\ \ \ \ (Tunnel)
+ Tunnel definition. The syntax is the same as in OpenSSH's local forwarding
(\fB-L\fP), with a new optional
+-prefix, \fIsaddr\fP - the source IP address to bind the \fIlport\fP to.
\fBCntlm\fP will listen for incomming
++prefix, \fIsaddr\fP - the source IP address to bind the \fIlport\fP to.
\fBCntlm\fP will listen for incoming
+ connections on the local port \fIlport\fP, forwarding every new connection
through the parent proxy to the
+ \fIrhost\fP:\fIrport\fP (authenticating on the go). This option can be used
multiple times for unlimited
+ number of tunnels, with or without the \fIsaddr\fP option. See \fB-g\fP for
the details concerning local port
+--- cntlm-0.92.3.orig/forward.c
++++ cntlm-0.92.3/forward.c
+@@ -446,7 +446,9 @@ beginning:
+ && strcasecmp(hostname,
data[0]->hostname)) {
+ if (debug)
+ printf("\n******* F RETURN: %s
*******\n", data[0]->url);
+- if (authok)
++ if (authok && data[0]->http_version >= 11
++ &&
(hlist_subcmp(data[0]->headers, "Proxy-Connection", "keep-alive")
++ ||
hlist_subcmp(data[0]->headers, "Connection", "keep-alive")))
+ proxy_alive = 1;
+
+ rc = dup_rr_data(data[0]);
+@@ -465,7 +467,7 @@ shortcut:
+ /*
+ * Modify request headers.
+ *
+- * Try to request keep-alive for every connection. We
keep them in a pool
++ * Try to request keep-alive for every client
supporting HTTP/1.1+. We keep them in a pool
+ * for future reuse.
+ */
+ if (loop == 0 && data[0]->req) {
+@@ -499,13 +501,14 @@ shortcut:
+ }
+
+ /*
+- * Also remove runaway P-A from the client
(e.g. Basic from N-t-B), which might
+- * cause some ISAs to deny us, even if the
connection is already auth'd.
++ * Force proxy keep-alive if the client can
handle it (HTTP >= 1.1)
+ */
+- data[0]->headers = hlist_mod(data[0]->headers,
"Proxy-Connection", "keep-alive", 1);
++ if (data[0]->http_version >= 11)
++ data[0]->headers =
hlist_mod(data[0]->headers, "Proxy-Connection", "keep-alive", 1);
+
+ /*
+- * Remove all Proxy-Authorization headers from
client
++ * Also remove runaway P-A from the client
(e.g. Basic from N-t-B), which might
++ * cause some ISAs to deny us, even if the
connection is already auth'd.
+ */
+ while (hlist_get(data[loop]->headers,
"Proxy-Authorization")) {
+ data[loop]->headers =
hlist_del(data[loop]->headers, "Proxy-Authorization");
+@@ -672,8 +675,14 @@ shortcut:
+ * This way, we also tell our caller that proxy
keep-alive is impossible.
+ */
+ if (loop == 1) {
+- proxy_alive = hlist_subcmp(data[loop]->headers,
"Proxy-Connection", "keep-alive");
+- if (!proxy_alive) {
++ proxy_alive = hlist_subcmp(data[1]->headers,
"Proxy-Connection", "keep-alive")
++ && data[0]->http_version >= 11;
++ if (proxy_alive) {
++ data[1]->headers =
hlist_mod(data[1]->headers, "Proxy-Connection", "keep-alive", 1);
++ data[1]->headers =
hlist_mod(data[1]->headers, "Connection", "keep-alive", 1);
++ } else {
++ data[1]->headers =
hlist_mod(data[1]->headers, "Proxy-Connection", "close", 1);
++ data[1]->headers =
hlist_mod(data[1]->headers, "Connection", "close", 1);
+ if (debug)
+ printf("PROXY CLOSING
CONNECTION\n");
+ rc = (void *)-1;
+--- cntlm-0.92.3.orig/http.c
++++ cntlm-0.92.3/http.c
+@@ -84,7 +84,7 @@ char *get_http_header_value(const char *
+ */
+ int headers_recv(int fd, rr_data_t data) {
+ int i, bsize;
+- int len;
++ int len, is_http = 0;
+ char *buf;
+ char *tok, *s3 = 0;
+ char *orig = NULL;
+@@ -108,12 +108,22 @@ int headers_recv(int fd, rr_data_t data)
+ orig = strdup(buf);
+ len = strlen(buf);
+ tok = strtok_r(buf, " ", &s3);
+- if (tok && (!strncasecmp(buf, "HTTP/", 5) || !strncasecmp(tok, "ICY",
3))) {
++ if (tok && ((is_http = !strncasecmp(tok, "HTTP/", 5)) ||
!strncasecmp(tok, "ICY", 3))) {
+ data->req = 0;
+ data->empty = 0;
+ data->http = strdup(tok);
+ data->msg = NULL;
+
++ /*
++ * Let's find out the numeric version of the HTTP version: 09,
10, 11.
++ * Set to -1 if header is misformatted.
++ */
++ if (is_http && (tok = strchr(data->http, '/')) && strlen(tok)
>= 4 && isdigit(tok[1]) && isdigit(tok[3])) {
++ data->http_version = (tok[1] - 0x30) * 10 + (tok[3] -
0x30);
++ } else {
++ data->http_version = -1;
++ }
++
+ tok = strtok_r(NULL, " ", &s3);
+ if (tok) {
+ ccode = strdup(tok);
+@@ -156,6 +166,16 @@ int headers_recv(int fd, rr_data_t data)
+ goto bailout;
+ }
+
++ /*
++ * Let's find out the numeric version of the HTTP version: 09,
10, 11.
++ * Set to -1 if header is misformatted.
++ */
++ if ((tok = strchr(data->http, '/')) && strlen(tok) >= 4 &&
isdigit(tok[1]) && isdigit(tok[3])) {
++ data->http_version = (tok[1] - 0x30) * 10 + (tok[3] -
0x30);
++ } else {
++ data->http_version = -1;
++ }
++
+ if ((tok = strstr(data->url, "://"))) {
+ tok += 3;
+ } else {
+--- cntlm-0.92.3.orig/utils.c
++++ cntlm-0.92.3/utils.c
+@@ -508,6 +508,7 @@ rr_data_t new_rr_data(void) {
+ data->body_len = 0;
+ data->empty = 1;
+ data->port = 0;
++ data->http_version = -1;
+ data->headers = NULL;
+ data->method = NULL;
+ data->url = NULL;
+@@ -535,6 +536,7 @@ rr_data_t copy_rr_data(rr_data_t dst, rr
+ dst->body_len = src->body_len;
+ dst->empty = src->empty;
+ dst->port = src->port;
++ dst->http_version = src->http_version;
+
+ if (src->headers)
+ dst->headers = hlist_dup(src->headers);
+@@ -584,6 +586,7 @@ rr_data_t reset_rr_data(rr_data_t data)
+ data->body_len = 0;
+ data->empty = 1;
+ data->port = 0;
++ data->http_version = -1;
+
+ if (data->headers) hlist_free(data->headers);
+ if (data->method) free(data->method);
+@@ -623,6 +626,7 @@ void free_rr_data(rr_data_t data) {
+ if (data->http) free(data->http);
+ if (data->msg) free(data->msg);
+ if (data->body) free(data->body);
++ memset(data, 0, sizeof(struct rr_data_s));
+ free(data);
+ }
+
+--- cntlm-0.92.3.orig/utils.h
++++ cntlm-0.92.3/utils.h
+@@ -89,6 +89,7 @@ struct rr_data_s {
+ int body_len;
+ int empty;
+ int port;
++ int http_version;
+ char *method;
+ char *url;
+ char *rel_url;
diff -Nru cntlm-0.92.3/debian/patches/series cntlm-0.92.3/debian/patches/series
--- cntlm-0.92.3/debian/patches/series 1970-01-01 00:00:00.000000000 +0000
+++ cntlm-0.92.3/debian/patches/series 2024-02-18 16:59:48.000000000 +0000
@@ -0,0 +1 @@
+debian.patch
diff -Nru cntlm-0.92.3/debian/source/format cntlm-0.92.3/debian/source/format
--- cntlm-0.92.3/debian/source/format 2024-02-18 17:09:07.000000000 +0000
+++ cntlm-0.92.3/debian/source/format 2024-02-18 16:59:48.000000000 +0000
@@ -1 +1 @@
-1.0
+3.0 (quilt)
diff -Nru cntlm-0.92.3/direct.c cntlm-0.92.3/direct.c
--- cntlm-0.92.3/direct.c 2024-02-18 17:09:07.000000000 +0000
+++ cntlm-0.92.3/direct.c 2011-11-28 13:55:15.000000000 +0000
@@ -282,19 +282,8 @@
data[0]->url = strdup(data[0]->rel_url);
}
- /*
- * Force proxy keep-alive if the client can
handle it (HTTP >= 1.1)
- */
- if (data[0]->http_version >= 11)
- data[0]->headers =
hlist_mod(data[0]->headers, "Connection", "keep-alive", 1);
-
- /*
- * Also remove runaway P-A from the client
(e.g. Basic from N-t-B), which might
- * cause some ISAs to deny us, even if the
connection is already auth'd.
- */
- while (hlist_get(data[loop]->headers,
"Proxy-Authorization")) {
- data[loop]->headers =
hlist_del(data[loop]->headers, "Proxy-Authorization");
- }
+ data[0]->headers = hlist_mod(data[0]->headers,
"Connection", "keep-alive", 1);
+ data[0]->headers = hlist_del(data[0]->headers,
"Proxy-Authorization");
/*
* Try to get auth from client if present
@@ -384,25 +373,18 @@
*/
if (loop == 1) {
conn_alive = !hlist_subcmp(data[1]->headers,
"Connection", "close")
- && http_has_body(data[0], data[1]) != -1
- && data[0]->http_version >= 11;
+ && http_has_body(data[0], data[1]) !=
-1;
if (conn_alive) {
data[1]->headers =
hlist_mod(data[1]->headers, "Proxy-Connection", "keep-alive", 1);
data[1]->headers =
hlist_mod(data[1]->headers, "Connection", "keep-alive", 1);
} else {
data[1]->headers =
hlist_mod(data[1]->headers, "Proxy-Connection", "close", 1);
- data[1]->headers =
hlist_mod(data[1]->headers, "Connection", "close", 1);
rc = (void *)-1;
}
}
- if (debug) {
+ if (debug)
printf("Sending headers (%d)...\n",
*wsocket[loop]);
- if (loop == 0) {
- printf("HEAD: %s %s %s\n",
data[loop]->method, data[loop]->url, data[loop]->http);
- hlist_dump(data[loop]->headers);
- }
- }
/*
* Send headers
diff -Nru cntlm-0.92.3/doc/cntlm.1 cntlm-0.92.3/doc/cntlm.1
--- cntlm-0.92.3/doc/cntlm.1 2024-02-18 17:09:07.000000000 +0000
+++ cntlm-0.92.3/doc/cntlm.1 2012-02-08 15:28:25.000000000 +0000
@@ -124,7 +124,7 @@
.B -c <filename>
Configuration file. Command-line options, if used, override its single options
or are added at the top of the
list for multi options (tunnels, parent proxies, etc) with the exception of
ACLs, which are completely
-overridden. Use \fI/dev/null\fP to disable any config file.
+overriden. Use \fI/dev/null\fP to disable any config file.
.TP
.B -D IP/mask\ \ \ \ (Deny)
@@ -191,7 +191,7 @@
.TP
.B -L [<saddr>:]<lport>:<rhost>:<rport>\ \ \ \ (Tunnel)
Tunnel definition. The syntax is the same as in OpenSSH's local forwarding
(\fB-L\fP), with a new optional
-prefix, \fIsaddr\fP - the source IP address to bind the \fIlport\fP to.
\fBCntlm\fP will listen for incoming
+prefix, \fIsaddr\fP - the source IP address to bind the \fIlport\fP to.
\fBCntlm\fP will listen for incomming
connections on the local port \fIlport\fP, forwarding every new connection
through the parent proxy to the
\fIrhost\fP:\fIrport\fP (authenticating on the go). This option can be used
multiple times for unlimited
number of tunnels, with or without the \fIsaddr\fP option. See \fB-g\fP for
the details concerning local port
diff -Nru cntlm-0.92.3/forward.c cntlm-0.92.3/forward.c
--- cntlm-0.92.3/forward.c 2024-02-18 17:09:07.000000000 +0000
+++ cntlm-0.92.3/forward.c 2012-03-02 00:15:03.000000000 +0000
@@ -446,9 +446,7 @@
&& strcasecmp(hostname,
data[0]->hostname)) {
if (debug)
printf("\n******* F RETURN: %s
*******\n", data[0]->url);
- if (authok && data[0]->http_version >= 11
- &&
(hlist_subcmp(data[0]->headers, "Proxy-Connection", "keep-alive")
- ||
hlist_subcmp(data[0]->headers, "Connection", "keep-alive")))
+ if (authok)
proxy_alive = 1;
rc = dup_rr_data(data[0]);
@@ -467,7 +465,7 @@
/*
* Modify request headers.
*
- * Try to request keep-alive for every client
supporting HTTP/1.1+. We keep them in a pool
+ * Try to request keep-alive for every connection. We
keep them in a pool
* for future reuse.
*/
if (loop == 0 && data[0]->req) {
@@ -501,14 +499,13 @@
}
/*
- * Force proxy keep-alive if the client can
handle it (HTTP >= 1.1)
+ * Also remove runaway P-A from the client
(e.g. Basic from N-t-B), which might
+ * cause some ISAs to deny us, even if the
connection is already auth'd.
*/
- if (data[0]->http_version >= 11)
- data[0]->headers =
hlist_mod(data[0]->headers, "Proxy-Connection", "keep-alive", 1);
+ data[0]->headers = hlist_mod(data[0]->headers,
"Proxy-Connection", "keep-alive", 1);
/*
- * Also remove runaway P-A from the client
(e.g. Basic from N-t-B), which might
- * cause some ISAs to deny us, even if the
connection is already auth'd.
+ * Remove all Proxy-Authorization headers from
client
*/
while (hlist_get(data[loop]->headers,
"Proxy-Authorization")) {
data[loop]->headers =
hlist_del(data[loop]->headers, "Proxy-Authorization");
@@ -675,14 +672,8 @@
* This way, we also tell our caller that proxy
keep-alive is impossible.
*/
if (loop == 1) {
- proxy_alive = hlist_subcmp(data[1]->headers,
"Proxy-Connection", "keep-alive")
- && data[0]->http_version >= 11;
- if (proxy_alive) {
- data[1]->headers =
hlist_mod(data[1]->headers, "Proxy-Connection", "keep-alive", 1);
- data[1]->headers =
hlist_mod(data[1]->headers, "Connection", "keep-alive", 1);
- } else {
- data[1]->headers =
hlist_mod(data[1]->headers, "Proxy-Connection", "close", 1);
- data[1]->headers =
hlist_mod(data[1]->headers, "Connection", "close", 1);
+ proxy_alive = hlist_subcmp(data[loop]->headers,
"Proxy-Connection", "keep-alive");
+ if (!proxy_alive) {
if (debug)
printf("PROXY CLOSING
CONNECTION\n");
rc = (void *)-1;
diff -Nru cntlm-0.92.3/http.c cntlm-0.92.3/http.c
--- cntlm-0.92.3/http.c 2024-02-18 17:09:07.000000000 +0000
+++ cntlm-0.92.3/http.c 2011-12-10 17:26:43.000000000 +0000
@@ -84,7 +84,7 @@
*/
int headers_recv(int fd, rr_data_t data) {
int i, bsize;
- int len, is_http = 0;
+ int len;
char *buf;
char *tok, *s3 = 0;
char *orig = NULL;
@@ -108,22 +108,12 @@
orig = strdup(buf);
len = strlen(buf);
tok = strtok_r(buf, " ", &s3);
- if (tok && ((is_http = !strncasecmp(tok, "HTTP/", 5)) ||
!strncasecmp(tok, "ICY", 3))) {
+ if (tok && (!strncasecmp(buf, "HTTP/", 5) || !strncasecmp(tok, "ICY",
3))) {
data->req = 0;
data->empty = 0;
data->http = strdup(tok);
data->msg = NULL;
- /*
- * Let's find out the numeric version of the HTTP version: 09,
10, 11.
- * Set to -1 if header is misformatted.
- */
- if (is_http && (tok = strchr(data->http, '/')) && strlen(tok)
>= 4 && isdigit(tok[1]) && isdigit(tok[3])) {
- data->http_version = (tok[1] - 0x30) * 10 + (tok[3] -
0x30);
- } else {
- data->http_version = -1;
- }
-
tok = strtok_r(NULL, " ", &s3);
if (tok) {
ccode = strdup(tok);
@@ -166,16 +156,6 @@
goto bailout;
}
- /*
- * Let's find out the numeric version of the HTTP version: 09,
10, 11.
- * Set to -1 if header is misformatted.
- */
- if ((tok = strchr(data->http, '/')) && strlen(tok) >= 4 &&
isdigit(tok[1]) && isdigit(tok[3])) {
- data->http_version = (tok[1] - 0x30) * 10 + (tok[3] -
0x30);
- } else {
- data->http_version = -1;
- }
-
if ((tok = strstr(data->url, "://"))) {
tok += 3;
} else {
diff -Nru cntlm-0.92.3/utils.c cntlm-0.92.3/utils.c
--- cntlm-0.92.3/utils.c 2024-02-18 17:09:07.000000000 +0000
+++ cntlm-0.92.3/utils.c 2011-11-28 13:55:15.000000000 +0000
@@ -508,7 +508,6 @@
data->body_len = 0;
data->empty = 1;
data->port = 0;
- data->http_version = -1;
data->headers = NULL;
data->method = NULL;
data->url = NULL;
@@ -536,7 +535,6 @@
dst->body_len = src->body_len;
dst->empty = src->empty;
dst->port = src->port;
- dst->http_version = src->http_version;
if (src->headers)
dst->headers = hlist_dup(src->headers);
@@ -586,7 +584,6 @@
data->body_len = 0;
data->empty = 1;
data->port = 0;
- data->http_version = -1;
if (data->headers) hlist_free(data->headers);
if (data->method) free(data->method);
@@ -626,7 +623,6 @@
if (data->http) free(data->http);
if (data->msg) free(data->msg);
if (data->body) free(data->body);
- memset(data, 0, sizeof(struct rr_data_s));
free(data);
}
diff -Nru cntlm-0.92.3/utils.h cntlm-0.92.3/utils.h
--- cntlm-0.92.3/utils.h 2024-02-18 17:09:07.000000000 +0000
+++ cntlm-0.92.3/utils.h 2011-10-14 11:45:26.000000000 +0000
@@ -89,7 +89,6 @@
int body_len;
int empty;
int port;
- int http_version;
char *method;
char *url;
char *rel_url;
