File: upstream_matching_fix.patch

package info (click to toggle)
tinyproxy 1.8.2-1squeeze3
  • links: PTS, VCS
  • area: main
  • in suites: squeeze
  • size: 1,620 kB
  • ctags: 857
  • sloc: ansic: 5,641; sh: 4,067; perl: 347; makefile: 155
file content (21 lines) | stat: -rw-r--r-- 944 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
Description: Fix handling of "upstream" rules.
 The 1.8 series of tinyproxy never matches an upstream "site_spec" rule
 due to a small error in the config file handler.
Author: Daniel Piddock <dpiddock@gmail.com>
Origin: Debian, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=585075
Forwarded: https://www.banu.com/bugzilla/show_bug.cgi?id=91

diff -ru a/src/conf.c b/src/conf.c
--- a/src/conf.c	2010-06-08 03:28:02.000000000 +0100
+++ b/src/conf.c	2010-06-08 21:27:16.000000000 +0100
@@ -1022,8 +1022,8 @@
                 return -1;
         port = (int) get_long_arg (line, &match[7]);
 
-        if (match[9].rm_so != -1) {
-                domain = get_string_arg (line, &match[9]);
+        if (match[10].rm_so != -1) {
+                domain = get_string_arg (line, &match[10]);
                 if (domain) {
                         upstream_add (ip, port, domain, &conf->upstream_list);
                         safefree (domain);