3.0.STABLE14
This commit is contained in:
parent
6bfebb0d2e
commit
7a3988b9fd
@ -1 +1 @@
|
|||||||
squid-3.0.STABLE13.tar.bz2
|
squid-3.0.STABLE14.tar.bz2
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
37c89c97743a81e5178fbd5d5888b7e2 squid-3.0.STABLE13.tar.bz2
|
7aaff2319d2263404d788a82a10c8633 squid-3.0.STABLE14.tar.bz2
|
||||||
|
@ -1,35 +0,0 @@
|
|||||||
diff -up squid-3.0.STABLE13/src/logfile.cc.b9443 squid-3.0.STABLE13/src/logfile.cc
|
|
||||||
--- squid-3.0.STABLE13/src/logfile.cc.b9443 2009-02-03 02:36:22.000000000 +0100
|
|
||||||
+++ squid-3.0.STABLE13/src/logfile.cc 2009-03-06 15:50:43.000000000 +0100
|
|
||||||
@@ -102,21 +102,16 @@ logfileOpen(const char *path, size_t buf
|
|
||||||
|
|
||||||
if (path[6] != '\0') {
|
|
||||||
path += 7;
|
|
||||||
- char* delim = strchr(path, '.');
|
|
||||||
-
|
|
||||||
- if (!delim)
|
|
||||||
- delim = strchr(path, '|');
|
|
||||||
-
|
|
||||||
- if (delim != NULL)
|
|
||||||
- *delim = '\0';
|
|
||||||
-
|
|
||||||
- lf->syslog_priority = syslog_ntoa(path);
|
|
||||||
-
|
|
||||||
- if (delim != NULL)
|
|
||||||
- lf->syslog_priority |= syslog_ntoa(delim+1);
|
|
||||||
-
|
|
||||||
- if (0 == (lf->syslog_priority & PRIORITY_MASK))
|
|
||||||
- lf->syslog_priority |= LOG_INFO;
|
|
||||||
+ char *priority = xstrdup(path);
|
|
||||||
+ char *facility = (char *) strchr(priority, '.');
|
|
||||||
+ if (!facility)
|
|
||||||
+ facility = (char *) strchr(priority, '|');
|
|
||||||
+ if (facility) {
|
|
||||||
+ *facility++ = '\0';
|
|
||||||
+ lf->syslog_priority |= syslog_ntoa(facility);
|
|
||||||
+ }
|
|
||||||
+ lf->syslog_priority |= syslog_ntoa(priority);
|
|
||||||
+ xfree(priority);
|
|
||||||
}
|
|
||||||
} else
|
|
||||||
#endif
|
|
@ -58,7 +58,6 @@ lookup program (dnsserver), a program for retrieving FTP data
|
|||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
|
||||||
%patch001 -p1 -b .logfile
|
|
||||||
%patch201 -p1 -b .config
|
%patch201 -p1 -b .config
|
||||||
%patch202 -p1 -b .location
|
%patch202 -p1 -b .location
|
||||||
%patch203 -p1 -b .build
|
%patch203 -p1 -b .build
|
||||||
|
Loading…
Reference in New Issue
Block a user