]> git.pld-linux.org Git - packages/squid.git/commitdiff
- patches with bugfixes from squid site.
authorPaweł Gołaszewski <blues@pld-linux.org>
Mon, 3 Dec 2001 18:31:29 +0000 (18:31 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    squid-2.4.STABLE2-CONNECT_miss_access_core.patch -> 1.1
    squid-2.4.STABLE2-aufs_fd_leak.patch -> 1.1
    squid-2.4.STABLE2-ldap_auth_password_spaces.patch -> 1.1
    squid-2.4.STABLE2-snmpwalk_coredump.patch -> 1.1
    squid-2.4.STABLE2-statHistDump_prototype.patch -> 1.1
    squid-2.4.STABLE2-swap_meta.patch -> 1.1

squid-2.4.STABLE2-CONNECT_miss_access_core.patch [new file with mode: 0644]
squid-2.4.STABLE2-aufs_fd_leak.patch [new file with mode: 0644]
squid-2.4.STABLE2-ldap_auth_password_spaces.patch [new file with mode: 0644]
squid-2.4.STABLE2-snmpwalk_coredump.patch [new file with mode: 0644]
squid-2.4.STABLE2-statHistDump_prototype.patch [new file with mode: 0644]
squid-2.4.STABLE2-swap_meta.patch [new file with mode: 0644]

diff --git a/squid-2.4.STABLE2-CONNECT_miss_access_core.patch b/squid-2.4.STABLE2-CONNECT_miss_access_core.patch
new file mode 100644 (file)
index 0000000..a5b4c31
--- /dev/null
@@ -0,0 +1,18 @@
+Index: src/ssl.c
+===================================================================
+RCS file: /server/cvs-server/squid/squid/src/ssl.c,v
+retrieving revision 1.108.2.1
+retrieving revision 1.108.2.2
+diff -c -r1.108.2.1 -r1.108.2.2
+*** src/ssl.c  2001/01/12 00:51:52     1.108.2.1
+--- src/ssl.c  2001/10/25 19:52:14     1.108.2.2
+***************
+*** 455,461 ****
+       answer = aclCheckFast(Config.accessList.miss, &ch);
+       if (answer == 0) {
+           err = errorCon(ERR_FORWARDING_DENIED, HTTP_FORBIDDEN);
+-          *sslState->status_ptr = HTTP_FORBIDDEN;
+           err->request = requestLink(request);
+           err->src_addr = request->client_addr;
+           errorSend(fd, err);
+--- 455,460 ----
diff --git a/squid-2.4.STABLE2-aufs_fd_leak.patch b/squid-2.4.STABLE2-aufs_fd_leak.patch
new file mode 100644 (file)
index 0000000..40759e8
--- /dev/null
@@ -0,0 +1,18 @@
+2001-09-07 02:51  Duane Wessels <wessels@squid-cache.org>
+
+        Bugzilla #229:
+        storeAufsOpenDone filedescriptor leak
+
+Index: squid/src/fs/aufs/store_io_aufs.c
+diff -u squid/src/fs/aufs/store_io_aufs.c:1.5.2.1 squid/src/fs/aufs/store_io_aufs.c:1.5.2.2
+--- squid/src/fs/aufs/store_io_aufs.c:1.5.2.1  Thu Jan  4 17:30:39 2001
++++ squid/src/fs/aufs/store_io_aufs.c  Thu Sep  6 18:51:49 2001
+@@ -296,6 +296,8 @@
+       storeAufsKickWriteQueue(sio);
+     else if (sio->mode == O_RDONLY)
+       storeAufsKickReadQueue(sio);
++    if (aiostate->flags.close_request)
++      storeAufsIOCallback(sio, errflag);
+     debug(78, 3) ("storeAufsOpenDone: exiting\n");
+ }
diff --git a/squid-2.4.STABLE2-ldap_auth_password_spaces.patch b/squid-2.4.STABLE2-ldap_auth_password_spaces.patch
new file mode 100644 (file)
index 0000000..79c940c
--- /dev/null
@@ -0,0 +1,50 @@
+2001-10-06 00:06  Henrik Nordstrom <hno@squid-cache.org>
+
+        Bugzilla #243
+               LDAP and spaces in passwords
+
+Index: squid/auth_modules/LDAP/squid_ldap_auth.c
+diff -u squid/auth_modules/LDAP/squid_ldap_auth.c:1.1.4.3 squid/auth_modules/LDAP/squid_ldap_auth.c:1.1.4.4
+--- squid/auth_modules/LDAP/squid_ldap_auth.c:1.1.4.3  Wed May  2 07:20:28 2001
++++ squid/auth_modules/LDAP/squid_ldap_auth.c  Fri Oct  5 16:06:05 2001
+@@ -23,6 +22,10 @@
+  * or (at your option) any later version.
+  *
+  * Changes:
++ * 2001-10-04: Henrik Nordstrom <hno@squid-cache.org>
++ *             - Be consistent with the other helpers in how
++ *             spaces are managed. If there is space characters
++ *             then these are assumed to be part of the password
+  * 2001-05-02: Henrik Nordstrom <hno@squid-cache.org>
+  *             - Support newer OpenLDAP 2.x libraries using the
+  *             revised Internet Draft API which unfortunately
+@@ -101,7 +104,7 @@
+ main(int argc, char **argv)
+ {
+     char buf[256];
+-    char *user, *passwd, *p;
++    char *user, *passwd;
+     char *ldapServer;
+     LDAP *ld = NULL;
+     int tryagain;
+@@ -200,17 +203,13 @@
+     ldapServer = (char *) argv[1];
+     while (fgets(buf, 256, stdin) != NULL) {
+-      if ((p = strchr(buf, '\n')) != NULL)
+-          *p = '\0';          /* strip \n */
+-      if ((p = strchr(buf, '\r')) != NULL)
+-          *p = '\0';          /* strip \r */
++      user = strtok(buf, " \r\n");
++      passwd = strtok(NULL, "\r\n");
+-      user = buf;
+-      if ((passwd = strrchr(buf, ' ')) == NULL) {
++      if (!user || !passwd || !passwd[0]) {
+           printf("ERR\n");
+           continue;
+       }
+-      *passwd++ = '\0';       /* Cut in username,password */
+       tryagain = 1;
+ recover:
+       if (ld == NULL) {
diff --git a/squid-2.4.STABLE2-snmpwalk_coredump.patch b/squid-2.4.STABLE2-snmpwalk_coredump.patch
new file mode 100644 (file)
index 0000000..06a46b5
--- /dev/null
@@ -0,0 +1,22 @@
+2001-08-30 12:07  Henrik Nordstrom <hno@squid-cache.org>
+
+        BUGFIX: potential coredump condition on snmpwalk of empty tables.
+       If the indexing function did not return a new OID, make sure the
+       parsing function is forgotten as well.
+
+Index: squid/src/snmp_core.c
+diff -u squid/src/snmp_core.c:1.45.2.2 squid/src/snmp_core.c:1.45.2.3
+--- squid/src/snmp_core.c:1.45.2.2     Sun May 27 17:52:21 2001
++++ squid/src/snmp_core.c      Thu Aug 30 04:07:28 2001
+@@ -731,7 +731,10 @@
+       *NextLen = mibTreeEntry->len;
+       *Next = (*mibTreeEntry->instancefunction) (mibTreeEntry->name, NextLen, mibTreeEntry, &Fn);
+     }
+-    return (Fn);
++    if (*Next)
++      return (Fn);
++    else
++      return NULL;
+ }
+ static oid *
diff --git a/squid-2.4.STABLE2-statHistDump_prototype.patch b/squid-2.4.STABLE2-statHistDump_prototype.patch
new file mode 100644 (file)
index 0000000..cb7e60b
--- /dev/null
@@ -0,0 +1,17 @@
+2001-09-09 21:59  Henrik Nordstrom <hno@squid-cache.org>
+
+        statHistDump prototype mismatch
+
+Index: squid/src/protos.h
+diff -u squid/src/protos.h:1.387.2.6 squid/src/protos.h:1.387.2.7
+--- squid/src/protos.h:1.387.2.6       Sat May 19 18:09:59 2001
++++ squid/src/protos.h Sun Sep  9 13:59:28 2001
+@@ -745,7 +745,7 @@
+ extern void statHistCopy(StatHist * Dest, const StatHist * Orig);
+ extern void statHistSafeCopy(StatHist * Dest, const StatHist * Orig);
+ extern double statHistDeltaMedian(const StatHist * A, const StatHist * B);
+-extern void statHistDump(const StatHist * H, StoreEntry * sentry, StatHistBinDumper bd);
++extern void statHistDump(const StatHist * H, StoreEntry * sentry, StatHistBinDumper * bd);
+ extern void statHistLogInit(StatHist * H, int capacity, double min, double max);
+ extern void statHistEnumInit(StatHist * H, int last_enum);
+ extern void statHistIntInit(StatHist * H, int n);
diff --git a/squid-2.4.STABLE2-swap_meta.patch b/squid-2.4.STABLE2-swap_meta.patch
new file mode 100644 (file)
index 0000000..6a45214
--- /dev/null
@@ -0,0 +1,24 @@
+2001-10-08 17:22  Henrik Nordstrom <hno@squid-cache.org>
+
+        BUGZILLA #246
+       The rearrangement of store directory/filenumbers in the StoreEntry
+       structure may cause directory rebuilds without swap.state to fail
+       or end up in an inconsistent state.
+
+Index: squid/src/structs.h
+diff -u squid/src/structs.h:1.361.2.14 squid/src/structs.h:1.361.2.15
+--- squid/src/structs.h:1.361.2.14     Wed Apr  4 01:01:12 2001
++++ squid/src/structs.h        Mon Oct  8 09:22:03 2001
+@@ -1322,10 +1322,10 @@
+     time_t expires;
+     time_t lastmod;
+     size_t swap_file_sz;
+-    sfileno swap_filen:25;
+-    sdirno swap_dirn:7;
+     u_short refcount;
+     u_short flags;
++    sfileno swap_filen:25;
++    sdirno swap_dirn:7;
+     u_short lock_count;               /* Assume < 65536! */
+     mem_status_t mem_status:3;
+     ping_status_t ping_status:3;
This page took 0.101254 seconds and 4 git commands to generate.