X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=urlmatch.c;h=65f9ba4f1b63b30885eb8e15e875d86ede18fb02;hb=29907bee327168106f88c2ba0f3638312864fdff;hp=86d211be5081b55068717f99cd3afcdb255bf4de;hpb=86450e4110ee16668a49cdc9271d4c89a4c63d48;p=privoxy.git diff --git a/urlmatch.c b/urlmatch.c index 86d211be..65f9ba4f 100644 --- a/urlmatch.c +++ b/urlmatch.c @@ -1,4 +1,4 @@ -const char urlmatch_rcs[] = "$Id: urlmatch.c,v 1.44 2008/05/04 16:18:32 fabiankeil Exp $"; +const char urlmatch_rcs[] = "$Id: urlmatch.c,v 1.45 2008/06/21 21:19:18 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/urlmatch.c,v $ @@ -6,8 +6,8 @@ const char urlmatch_rcs[] = "$Id: urlmatch.c,v 1.44 2008/05/04 16:18:32 fabianke * Purpose : Declares functions to match URLs against URL * patterns. * - * Copyright : Written by and Copyright (C) 2001-2003, 2006-2008 the SourceForge - * Privoxy team. http://www.privoxy.org/ + * Copyright : Written by and Copyright (C) 2001-2009 + * the Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -33,6 +33,9 @@ const char urlmatch_rcs[] = "$Id: urlmatch.c,v 1.44 2008/05/04 16:18:32 fabianke * * Revisions : * $Log: urlmatch.c,v $ + * Revision 1.45 2008/06/21 21:19:18 fabiankeil + * Silence bogus compiler warning. + * * Revision 1.44 2008/05/04 16:18:32 fabiankeil * Provide parse_http_url() with a third parameter to specify * whether or not URLs without protocol are acceptable. @@ -675,6 +678,14 @@ jb_err parse_http_request(const char *req, return JB_ERR_PARSE; } + if (strcmpic(v[2], "HTTP/1.1") && strcmpic(v[2], "HTTP/1.0")) + { + log_error(LOG_LEVEL_ERROR, "The only supported HTTP " + "versions are 1.0 and 1.1. This rules out: %s", v[2]); + freez(buf); + return JB_ERR_PARSE; + } + http->ssl = !strcmpic(v[0], "CONNECT"); err = parse_http_url(v[1], http, !http->ssl);