diff -rcN squid-2.5.PRE13/configure squid-2.5.STABLE1/configure *** squid-2.5.PRE13/configure Thu Sep 12 15:08:46 2002 --- squid-2.5.STABLE1/configure Tue Sep 24 14:00:03 2002 *************** *** 973,979 **** # Define the identity of the package. PACKAGE=squid ! VERSION=2.5.PRE13 cat >> confdefs.h <> confdefs.h <&6 echo "configure:1030: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. --- 1024,1030 ---- ! # From configure.in Revision: 1.251.2.35 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 echo "configure:1030: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. diff -rcN squid-2.5.PRE13/configure.in squid-2.5.STABLE1/configure.in *** squid-2.5.PRE13/configure.in Thu Sep 12 15:08:46 2002 --- squid-2.5.STABLE1/configure.in Tue Sep 24 14:00:03 2002 *************** *** 3,17 **** dnl dnl Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9) dnl ! dnl $Id: configure.in,v 1.251.2.34 2002/09/12 21:06:26 hno Exp $ dnl dnl dnl AC_INIT(src/main.c) AC_CONFIG_AUX_DIR(cfgaux) ! AM_INIT_AUTOMAKE(squid, 2.5.PRE13) AM_CONFIG_HEADER(include/autoconf.h) ! AC_REVISION($Revision: 1.251.2.34 $)dnl AC_PREFIX_DEFAULT(/usr/local/squid) AM_MAINTAINER_MODE --- 3,17 ---- dnl dnl Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9) dnl ! dnl $Id: configure.in,v 1.251.2.35 2002/09/24 19:54:51 hno Exp $ dnl dnl dnl AC_INIT(src/main.c) AC_CONFIG_AUX_DIR(cfgaux) ! AM_INIT_AUTOMAKE(squid, 2.5.STABLE1) AM_CONFIG_HEADER(include/autoconf.h) ! AC_REVISION($Revision: 1.251.2.35 $)dnl AC_PREFIX_DEFAULT(/usr/local/squid) AM_MAINTAINER_MODE diff -rcN squid-2.5.PRE13/include/version.h squid-2.5.STABLE1/include/version.h *** squid-2.5.PRE13/include/version.h Thu Sep 12 15:08:46 2002 --- squid-2.5.STABLE1/include/version.h Tue Sep 24 14:00:03 2002 *************** *** 9,13 **** */ #ifndef SQUID_RELEASE_TIME ! #define SQUID_RELEASE_TIME 1031864900 #endif --- 9,13 ---- */ #ifndef SQUID_RELEASE_TIME ! #define SQUID_RELEASE_TIME 1032897582 #endif diff -rcN squid-2.5.PRE13/src/HttpStatusLine.c squid-2.5.STABLE1/src/HttpStatusLine.c *** squid-2.5.PRE13/src/HttpStatusLine.c Fri Mar 9 17:55:36 2001 --- squid-2.5.STABLE1/src/HttpStatusLine.c Sun Sep 22 22:02:45 2002 *************** *** 1,6 **** /* ! * $Id: HttpStatusLine.c,v 1.24 2001/03/10 00:55:36 hno Exp $ * * DEBUG: section 57 HTTP Status-line * AUTHOR: Alex Rousskov --- 1,6 ---- /* ! * $Id: HttpStatusLine.c,v 1.24.2.1 2002/09/23 04:02:45 wessels Exp $ * * DEBUG: section 57 HTTP Status-line * AUTHOR: Alex Rousskov *************** *** 160,165 **** --- 160,168 ---- break; case HTTP_USE_PROXY: p = "Use Proxy"; + break; + case HTTP_TEMPORARY_REDIRECT: + p = "Temporary Redirect"; break; case HTTP_BAD_REQUEST: p = "Bad Request"; diff -rcN squid-2.5.PRE13/src/client_side.c squid-2.5.STABLE1/src/client_side.c *** squid-2.5.PRE13/src/client_side.c Wed Aug 28 10:11:09 2002 --- squid-2.5.STABLE1/src/client_side.c Sun Sep 22 22:04:03 2002 *************** *** 1,6 **** /* ! * $Id: client_side.c,v 1.561.2.19 2002/08/28 16:11:09 wessels Exp $ * * DEBUG: section 33 Client-side Routines * AUTHOR: Duane Wessels --- 1,6 ---- /* ! * $Id: client_side.c,v 1.561.2.20 2002/09/23 04:04:03 wessels Exp $ * * DEBUG: section 33 Client-side Routines * AUTHOR: Duane Wessels *************** *** 301,307 **** http->redirect_state = REDIRECT_DONE; if (result) { http_status status = (http_status) atoi(result); ! if (status == HTTP_MOVED_PERMANENTLY || status == HTTP_MOVED_TEMPORARILY) { char *t = result; if ((t = strchr(result, ':')) != NULL) { http->redirect.status = status; --- 301,310 ---- http->redirect_state = REDIRECT_DONE; if (result) { http_status status = (http_status) atoi(result); ! if (status == HTTP_MOVED_PERMANENTLY ! || status == HTTP_MOVED_TEMPORARILY ! || status == HTTP_SEE_OTHER ! || status == HTTP_TEMPORARY_REDIRECT) { char *t = result; if ((t = strchr(result, ':')) != NULL) { http->redirect.status = status; diff -rcN squid-2.5.PRE13/src/enums.h squid-2.5.STABLE1/src/enums.h *** squid-2.5.PRE13/src/enums.h Sun Jul 21 18:09:28 2002 --- squid-2.5.STABLE1/src/enums.h Sun Sep 22 22:02:45 2002 *************** *** 1,6 **** /* ! * $Id: enums.h,v 1.203.2.6 2002/07/22 00:09:28 hno Exp $ * * * SQUID Web Proxy Cache http://www.squid-cache.org/ --- 1,6 ---- /* ! * $Id: enums.h,v 1.203.2.7 2002/09/23 04:02:45 wessels Exp $ * * * SQUID Web Proxy Cache http://www.squid-cache.org/ *************** *** 459,464 **** --- 459,465 ---- HTTP_SEE_OTHER = 303, HTTP_NOT_MODIFIED = 304, HTTP_USE_PROXY = 305, + HTTP_TEMPORARY_REDIRECT = 307, HTTP_BAD_REQUEST = 400, HTTP_UNAUTHORIZED = 401, HTTP_PAYMENT_REQUIRED = 402, diff -rcN squid-2.5.PRE13/src/errorpage.c squid-2.5.STABLE1/src/errorpage.c *** squid-2.5.PRE13/src/errorpage.c Sat Aug 31 17:48:37 2002 --- squid-2.5.STABLE1/src/errorpage.c Fri Sep 20 04:28:53 2002 *************** *** 1,6 **** /* ! * $Id: errorpage.c,v 1.167.2.5 2002/08/31 23:48:37 hno Exp $ * * DEBUG: section 4 Error Generation * AUTHOR: Duane Wessels --- 1,6 ---- /* ! * $Id: errorpage.c,v 1.167.2.6 2002/09/20 10:28:53 hno Exp $ * * DEBUG: section 4 Error Generation * AUTHOR: Duane Wessels *************** *** 64,71 **** { ERR_SQUID_SIGNATURE, "\n
\n" ! "
\n" "Generated %T by %h (%s)\n" "\n" }, { --- 64,73 ---- { ERR_SQUID_SIGNATURE, "\n
\n" ! "
\n" ! "
\n" "Generated %T by %h (%s)\n" + "
\n" "\n" }, { *************** *** 391,397 **** /* * B - URL with FTP %2f hack x * c - Squid error code x - * d - seconds elapsed since request received x * e - errno x * E - strerror() x * f - FTP request line x --- 393,398 ----