cvs commit: apache-1.3/src/main http_core.c
dougm 98/05/07 15:42:06
Modified:src/main http_core.c
Log:
`bool' is #define'd as a type here, can't build with that clash,
so change to `flag'
Revision ChangesPath
1.195 +2 -2 apache-1.3/src/main/http_core.c
Index: http_core.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_core.c,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- http_core.c 1998/05/07 12:24:25 1.194
+++ http_core.c 1998/05/07 22:42:05 1.195
@@ -1892,9 +1892,9 @@
*/
static const char *enable_platform_announcement(cmd_parms *cmd, void
*mconfig,
- int bool)
+ int flag)
{
-ap_note_platform = bool;
+ap_note_platform = flag;
return NULL;
}
cvs commit: apache-devsite mmn.txt
coar98/05/07 09:12:15 Modified:.mmn.txt Log: Note the passing of SERVER_SUBVERSION. Revision ChangesPath 1.20 +2 -0 apache-devsite/mmn.txt Index: mmn.txt === RCS file: /export/home/cvs/apache-devsite/mmn.txt,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- mmn.txt 1998/04/13 18:22:16 1.19 +++ mmn.txt 1998/05/07 16:12:15 1.20 @@ -52,3 +52,5 @@ 19980413 (1.3b6-dev) - The BIG SYMBOL RENAMING: general ap_ prefix (see src/include/compat.h for more details) - ap_vformatter() API, see src/include/ap.h +19980507 (1.3b7-dev) - addition of ap_add_version_component() and +discontinuation of -DSERVER_SUBVERSION support
cvs commit: apache-1.3/src/include http_config.h
coar98/05/07 09:09:01 Modified:src/include http_config.h Log: Foo, forgot to update MMN due to addition of ap_add_version_component and discontinuation of SERVER_SUBVERSION support. (Which still needs to be ripped out of Configure, et alia loci). Revision ChangesPath 1.84 +1 -1 apache-1.3/src/include/http_config.h Index: http_config.h === RCS file: /export/home/cvs/apache-1.3/src/include/http_config.h,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- http_config.h 1998/05/06 15:18:01 1.83 +++ http_config.h 1998/05/07 16:09:00 1.84 @@ -275,7 +275,7 @@ * handle it back-compatibly, or at least signal an error). */ -#define MODULE_MAGIC_NUMBER 19980413 +#define MODULE_MAGIC_NUMBER 19980507 #define STANDARD_MODULE_STUFF MODULE_MAGIC_NUMBER, -1, __FILE__, NULL, NULL /* Generic accessors for other modules to get at their own module-specific
cvs commit: apache-1.3/src/helpers mkshadow.sh
rse 98/05/07 08:24:44
Modified:src CHANGES
..cvsignore Makefile.tmpl configure
src/helpers mkshadow.sh
Log:
Cleanup of the `configure --shadow' process:
- make sure the configure script creates its temporary files in the
shadow tree to avoid conflicts with parallel configure runs
- removed unnecessary option "-r" from "rm" call for Makefiles
- make sure the configure scripts creates the shadow-wrapper Makefile
only when no shadow trees already exists
- make sure "make distclean" removes the shadow-wrapper Makefile but only
when no more shadow trees exists
- overhauled mkshadow.sh script: now its more IFS-safe and approx. twice
as fast (in the past it needed 70sec, now it runs just 38sec)
- make sure CVS does not complain about the created files
Makefille. and directories src.
Revision ChangesPath
1.833 +14 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.832
retrieving revision 1.833
diff -u -r1.832 -r1.833
--- CHANGES 1998/05/07 15:04:14 1.832
+++ CHANGES 1998/05/07 15:24:41 1.833
@@ -1,5 +1,19 @@
Changes with Apache 1.3b7
+ *) Cleanup of the `configure --shadow' process:
+ - make sure the configure script creates its temporary files in the
+ shadow tree to avoid conflicts with parallel configure runs
+ - removed unnecessary option "-r" from "rm" call for Makefiles
+ - make sure the configure scripts creates the shadow-wrapper Makefile
+ only when no shadow trees already exists
+ - make sure "make distclean" removes the shadow-wrapper Makefile but
only
+ when no more shadow trees exists
+ - overhauled mkshadow.sh script: now its more IFS-safe and approx. twice
+ as fast (in the past it needed 70sec, now it runs just 38sec)
+ - make sure CVS does not complain about the created files
+ Makefille. and directories src.
+ [Ralf S. Engelschall]
+
*) Added the AddVersionComponent and AddVersionPlatform core directives.
The first allows the addition of arbitrary text to the Server-Version
response header field value, augmenting the SERVER_SUBVERSION define in
1.2 +2 -0 apache-1.3/.cvsignore
Index: .cvsignore
===
RCS file: /export/home/cvs/apache-1.3/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore1998/03/29 12:27:27 1.1
+++ .cvsignore1998/05/07 15:24:42 1.2
@@ -1 +1,3 @@
Makefile
+Makefile.*
+src.*
1.33 +5 -1 apache-1.3/Makefile.tmpl
Index: Makefile.tmpl
===
RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- Makefile.tmpl 1998/05/06 15:17:57 1.32
+++ Makefile.tmpl 1998/05/07 15:24:43 1.33
@@ -453,5 +453,9 @@
distclean-shadow:
$(RM) -r $(SRC)
- $(RM) -r $(MKF)
+ $(RM) $(MKF)
+ [EMAIL PROTECTED] [ ".`ls $(TOP)/src.* 2>/dev/null`" = . ]; then \
+ echo "$(RM) Makefile"; \
+ $(RM) Makefile; \
+ fi
1.23 +21 -14apache-1.3/configure
Index: configure
===
RCS file: /export/home/cvs/apache-1.3/configure,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- configure 1998/04/27 13:00:59 1.22
+++ configure 1998/05/07 15:24:43 1.23
@@ -73,7 +73,6 @@
mkf=Makefile
src=src
aux=src/helpers
-
sedsubst=src/.apaci.sedsubst
addconf=src/.apaci.addconf
@@ -265,34 +264,42 @@
--shadow)
# determine GNU platform triple
gnutriple=`$aux/GuessOS | awk '{ printf("%s",$1); }' | sed -e
's:/:-:g'`
-# create Makefile wrapper
-if [ .$quiet = .no ]; then
-echo " + creating Makefile (shadow wrapper)"
+# create Makefile wrapper (the first time only)
+if [ ".`ls $top/src.* 2>/dev/null`" = . ]; then
+if [ .$quiet = .no ]; then
+echo " + creating Makefile (shadow wrapper)"
+fi
+echo "##" > Makefile
+echo "## Apache Makefile (shadow wrapper)" >> Makefile
+echo "##" >> Makefile
+echo "" >> Makefile
+echo "GNUTRIPLE=\`$aux/GuessOS | awk '{
printf(\"%s\",\$\$1); }' | sed -e 's:/:-:g'\`" >> Makefile
+echo "" >> Makefile
+echo "all build in
cvs commit: apache-1.3/src CHANGES
jim 98/05/07 08:04:16 Modified:src CHANGES Log: The code still allows for SERVER_SUBVERSION Revision ChangesPath 1.832 +1 -1 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.831 retrieving revision 1.832 diff -u -r1.831 -r1.832 --- CHANGES 1998/05/07 12:24:22 1.831 +++ CHANGES 1998/05/07 15:04:14 1.832 @@ -2,7 +2,7 @@ *) Added the AddVersionComponent and AddVersionPlatform core directives. The first allows the addition of arbitrary text to the Server-Version - response header field value, replacing the SERVER_SUBVERSION define in + response header field value, augmenting the SERVER_SUBVERSION define in the Configuration file with run-time settings (more useful in a loadable-module environment). AddVersionPlatform inserts a comment such as "(UNIX)" or "(Win32)" into the server version string.
cvs commit: apache-1.3/htdocs/manual new_features_1_3.html upgrading_to_1_3.html
coar98/05/07 07:28:43 Modified:htdocs/manual new_features_1_3.html upgrading_to_1_3.html Log: Add the AddVersion* directives to the 'new for 1.3' documentation. Revision ChangesPath 1.55 +15 -0 apache-1.3/htdocs/manual/new_features_1_3.html Index: new_features_1_3.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/new_features_1_3.html,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- new_features_1_3.html 1998/04/25 16:44:30 1.54 +++ new_features_1_3.html 1998/05/07 14:28:42 1.55 @@ -638,6 +638,21 @@ sections. This is useful for folks trying to debug their virtual host configuration. + New ways to customise the server identity + + Two new directives, AddVersionComponent and + AddVersionPlatform, allow the Webmaster to change the value of + the Server-Version response header field which is sent back + to clients. AddVersionComponent replaces the + -DSERVER_SUBVERSION=\"string\" CCFLAGS mechanism + used in earlier versions of the Apache Web server, allowing the string to + be modified without having to recompile the server. And the + AddVersionPlatform directive controls whether the server will + include a non-specific note in the server identity about the type of + operating system on which the server is running. + 1.21 +8 -1 apache-1.3/htdocs/manual/upgrading_to_1_3.html Index: upgrading_to_1_3.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/upgrading_to_1_3.html,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- upgrading_to_1_3.html 1998/04/21 22:24:50 1.20 +++ upgrading_to_1_3.html 1998/05/07 14:28:42 1.21 @@ -40,7 +40,14 @@ The -DMAXIMUM_DNS definition has been obsoleted by changes to mod_access enforcing double-reverse DNS lookups when necessary. - + + The -DSERVER_SUBVERSION=\"string\" compile-time option has + been replaced with the run-time + AddVersionComponent + directive. + + mod_dir has been split into two pieces mod_autoindex, and mod_dir.
cvs commit: apache-1.3/src/os/win32/installer/installdll install.c install.mak
pcs 98/05/07 06:23:37 Modified:src/os/win32/installer apache.iwz src/os/win32/installer/installdll install.c install.mak Log: Update the installer to fix overwriting of user's already installed configuration or htdocs files. This is similar to how APACI now works. For the configuration files, the @@...@@ tokens are expanded, and the file called conf\*.conf.default. Then it is _copied_ to the corresponding conf\*.conf _only if_ that file does not exist. If it does exist, it displays a messagebox saying "Preserving file XXX", like APACI. [PR#2118] For the htdocs, the manuals are always installed into htdocs\manual(*) However htdocs\index.html and htdocs\apache_pb.gif are not installed if they already exist. So this will now not overwrite the user's index.html file. [PR#2084 -- for Unix, but applied to Win32 as well] Note: under APACI the manuals are not installed if htdocs exists. On Win32 htdocs\manuals is installed. This is because we add a menu item "Apache Documentation" which launches explorer to read the docs, so we really want them installed. (* if the installation type includes manuals, that is). A couple of other fixes: - always create cgi-bin and htdocs directories, even if the manuals are not being installed PR: 2118, 2084 Revision ChangesPath 1.6 +66 -47apache-1.3/src/os/win32/installer/apache.iwz Index: apache.iwz === RCS file: /export/home/cvs/apache-1.3/src/os/win32/installer/apache.iwz,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- apache.iwz1998/04/18 09:46:33 1.5 +++ apache.iwz1998/05/07 13:23:36 1.6 @@ -60,30 +60,30 @@ [Types] Types=3 -Type1Components=5 +Type1Components=6 Type1Name=Custom -Type1ComponentList=1 2 3 4 5 -Type2Components=4 +Type1ComponentList=1 2 3 4 5 6 +Type2Components=5 Type2Name=Typical -Type2ComponentList=1 3 4 5 -Type3Components=1 +Type2ComponentList=1 3 4 5 6 +Type3Components=2 Type3Name=Compact -Type3ComponentList=1 +Type3ComponentList=1 6 [Components] -Components=5 +Components=6 Component1Groups=5 Component1Name=Application Files Component1Description=Application files needed to run the application -Component1GroupList=1 3 24 25 26 +Component1GroupList=1 3 24 25 4 Component2Groups=14 Component2Name=Source Code Component2Description=Source code for Apache and support tools Component2GroupList=10 11 12 13 14 15 16 17 18 19 20 21 22 23 -Component3Groups=6 -Component3Name=Documentation +Component3Groups=5 +Component3Name=Apache Manual Component3Description=Apache documentation -Component3GroupList=4 5 6 7 8 9 +Component3GroupList=5 6 7 8 9 Component4Groups=1 Component4Name=Additional Modules Component4Description=Apache modules to extend the server @@ -92,10 +92,14 @@ Component5Name=Icons Component5Description=Icons for directory indexes Component5GroupList=27 +Component6Groups=4 +Component6Name=Required Directories +Component6Description= +Component6GroupList=26 28 29 30 [Groups] -Groups=27 -Group1Size=313049 +Groups=30 +Group1Size=478242 Group1Files=10 Group1Name=Program Executables Group1Dir= @@ -110,7 +114,7 @@ Group1File8=C:\Apache\README Group1File9=C:\Apache\README.NT Group1File10=C:\apache\Makefile.tmpl -Group2Size=132096 +Group2Size=258048 Group2Files=10 Group2Name=Additional Modules Group2Dir=\modules @@ -125,10 +129,10 @@ Group2File8=C:\Apache\modules\ApacheModuleStatus.dll Group2File9=C:\Apache\modules\ApacheModuleUserTrack.dll Group2File10=C:\apache\modules\ApacheModuleRewrite.dll -Group3Size=35901 +Group3Size=34849 Group3Files=6 Group3Name=Configuration Files -Group3Dir=\conf +Group3Dir=\.tmp Group3Update=0 Group3File1=C:\Apache\conf\httpd.conf-dist-win Group3File2=C:\Apache\conf\access.conf-dist-win @@ -136,17 +140,17 @@ Group3File4=C:\Apache\conf\mime.types Group3File5=C:\Apache\conf\srm.conf-dist-win Group3File6=C:\apache\conf\highperformance.conf-dist -Group4Size=3689 +Group4Size=3642 Group4Files=2 -Group4Name=Documentation -Group4Dir=\htdocs +Group4Name=Initial Document Root Files +Group4Dir=\.tmp Group4Update=0 Group4File1=C:\Apache\htdocs\apache_pb.gif Group4File2=C:\Apache\htdocs\index.html -Group5Size=226845 +Group5Size=216846 Group5Files=31 -Group5Name=manual -Group5Dir=[Documentation]\manual +Group5Name=Manual +Group5Dir=\htdocs\manual Group5Update=0 Group5File1=C:\Apache\htdocs\manual\bind.html Group5File2=C:\Apache\htdocs\manual\cgi_path.html @@ -179,10 +183,10 @@ Group5File29=C:\Apache\htdocs\manual\upgrading_to_1_3.html Group5File30=C:\Apache\htdocs\manual\windows.html Group5File31=C:\apache\htdocs\manual\ebcdic.ht
cvs commit: apache-1.3/src/ap ap_snprintf.c
jim 98/05/07 06:13:54
Modified:src/ap ap_snprintf.c
Log:
Seems silly to remove the decimal point if we
know we'll be adding it later
Revision ChangesPath
1.23 +31 -30apache-1.3/src/ap/ap_snprintf.c
Index: ap_snprintf.c
===
RCS file: /export/home/cvs/apache-1.3/src/ap/ap_snprintf.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ap_snprintf.c 1998/05/07 09:39:42 1.22
+++ ap_snprintf.c 1998/05/07 13:13:53 1.23
@@ -68,6 +68,33 @@
#include
#include
+typedef enum {
+NO = 0, YES = 1
+} boolean_e;
+
+#define FALSE0
+#define TRUE 1
+#define NUL '\0'
+#define INT_NULL ((int *)0)
+#define WIDE_INT long
+
+typedef WIDE_INT wide_int;
+typedef unsigned WIDE_INT u_wide_int;
+typedef int bool_int;
+
+#define S_NULL "(null)"
+#define S_NULL_LEN 6
+
+#define FLOAT_DIGITS 6
+#define EXPONENT_LENGTH 10
+
+/*
+ * NUM_BUF_SIZE is the size of the buffer used for arithmetic conversions
+ *
+ * XXX: this is a magic number; do not decrease it
+ */
+#define NUM_BUF_SIZE 512
+
/*
* cvt.c - IEEE floating point formatting routines for FreeBSD
* from GNU libc-4.6.27. Modified to be thread safe.
@@ -171,7 +198,7 @@
* minimal length string
*/
-static char *ap_gcvt(double number, int ndigit, char *buf)
+static char *ap_gcvt(double number, int ndigit, char *buf, boolean_e altform)
{
int sign, decpt;
register char *p1, *p2;
@@ -224,39 +251,12 @@
*p2++ = '.';
}
}
-if (p2[-1] == '.')
+if (p2[-1] == '.' && !altform)
p2--;
*p2 = '\0';
return (buf);
}
-typedef enum {
-NO = 0, YES = 1
-} boolean_e;
-
-#define FALSE0
-#define TRUE 1
-#define NUL '\0'
-#define INT_NULL ((int *)0)
-#define WIDE_INT long
-
-typedef WIDE_INT wide_int;
-typedef unsigned WIDE_INT u_wide_int;
-typedef int bool_int;
-
-#define S_NULL "(null)"
-#define S_NULL_LEN 6
-
-#define FLOAT_DIGITS 6
-#define EXPONENT_LENGTH 10
-
-/*
- * NUM_BUF_SIZE is the size of the buffer used for arithmetic conversions
- *
- * XXX: this is a magic number; do not decrease it
- */
-#define NUM_BUF_SIZE 512
-
/*
* The INS_CHAR macro inserts a character in the buffer and writes
* the buffer back to disk if necessary
@@ -799,7 +799,8 @@
/*
* * We use &num_buf[ 1 ], so that we have room for the sign
*/
- s = ap_gcvt(va_arg(ap, double), precision, &num_buf[1]);
+ s = ap_gcvt(va_arg(ap, double), precision, &num_buf[1],
+ alternate_form);
if (*s == '-')
prefix_char = *s++;
else if (print_sign)
cvs commit: apache-1.3/src/os/win32 os.h
coar98/05/07 05:24:31 Modified:.STATUS htdocs/manual/mod core.html src CHANGES buildmark.c src/include http_conf_globals.h httpd.h src/main http_core.c http_main.c src/os/bs2000 os.h src/os/emx os.h src/os/unix os.h src/os/win32 os.h Log: Add the core AddVersionComponent and AddVersionPlatform directives, which make the SERVER_SUBVERSION functionality a runtime thing and allow adding OS identity to the Server-Version string respectively. PR: 2056 Reviewed by: Jim Jagielski, Martin Kraemer, Brian Behlendorf Revision ChangesPath 1.381 +1 -7 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.380 retrieving revision 1.381 diff -u -r1.380 -r1.381 --- STATUS1998/05/07 02:48:22 1.380 +++ STATUS1998/05/07 12:24:20 1.381 @@ -56,12 +56,6 @@ Available Patches: -* Ken's Adding the OS Type Patch - <[EMAIL PROTECTED]> - Status: Ken +1, Jim +1 (with Brian's suggested changes), - Martin +1, Brian +1 (change 'add_component' and - 'add_platform' to something a bit more clear) - * Ed Korthof's patch to fix protocol issues surrounding 400, 408, and 414 responses. <[EMAIL PROTECTED]> @@ -132,7 +126,7 @@ (feb98 archives) Jim: I thought that we decided "default", although Ken thought it ugly - Ken: I just don't like using "Add" when reverting something; no -1 + Ken: I just don't like using "Add" when reverting something; not a -1 * proxy_*_canon routines use r->proxyreq incorrectly. See <[EMAIL PROTECTED]> 1.113 +101 -1apache-1.3/htdocs/manual/mod/core.html Index: core.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/core.html,v retrieving revision 1.112 retrieving revision 1.113 diff -u -r1.112 -r1.113 --- core.html 1998/05/06 11:04:36 1.112 +++ core.html 1998/05/07 12:24:21 1.113 @@ -24,6 +24,8 @@ AccessConfig AccessFileName AddModule +AddVersionComponent +AddVersionPlatform AllowOverride AuthName AuthType @@ -178,6 +180,101 @@ be cleared with the ClearModuleList directive. +AddVersionComponent directive + +Syntax: AddVersionComponent string +Context: server config +Status: core +Compatibility: AddVersionComponent is only available + in Apache 1.3 and later + + +Use this directive to add a string to the Server-Version +response header field which is sent back to clients. This field identifies +the server software as the Apache Web server, and can also list additional +information. This directive may occur multiple times, and the results are +cumulative. In each case the string should take one of the following forms: + + + AddVersionComponent "(some comment within parentheses)" + + or + + + AddVersionComponent "component-name/major.minor" + + + +that is, the string should either be arbitrary text enclosed in parentheses, +or else a specific component token and version number (such as "mymod/1.0"). + + +This setting applies to the entire server, and cannot be enabled or +disabled on a virtualhost-by-virtualhost basis. + + +This directive replaces the SERVER_SUBVERSION setting +that was available in earlier versions of the Apache Web server. + + +AddVersionPlatform directive + +Syntax: AddVersionPlatform On|Off +Context: server config +Status: core +Compatibility: AddVersionPlatform is only available + in Apache 1.3 and later + + +This directive controls whether the server's operating system platform +will be identified in the Server-Version response header +field which is sent back to clients. If enabled, a non-specific platform +designation will be added to the identity string, as shown below: + + + AddVersionPlatform Off + + Server sends: Server-Version: Apache/1.3.0 + + AddVersionPlatform On + + Server sends: Server-Version: Apache/1.3.0 (UNIX) + + + +This setting applies to the entire server, and cannot be enabled or +disabled on a virtualhost-by-virtualhost basis. + + +By default, this information is not included in the server +identity string. + + + AllowOverride directive Status: core -Compatibility: BS2000AuthFile is only available for BS2000 machines, as of Apache 1.3 and later. +Compatibility: BS2000AuthFile is only available for BS2000 machines, as of Apache 1.3 and later. The BS2000AuthFile directive is available for BS2000 hosts only. It must be used to define the p
cvs commit: apache-1.3/src/ap ap_snprintf.c
rse 98/05/07 02:39:43
Modified:src/ap ap_snprintf.c
Log:
Fix Martin's comitted "s != S_NULL & s != char_buf" to "s != S_NULL && s !=
char_buf" which is what he wanted to use but not typed.
Revision ChangesPath
1.22 +1 -1 apache-1.3/src/ap/ap_snprintf.c
Index: ap_snprintf.c
===
RCS file: /export/home/cvs/apache-1.3/src/ap/ap_snprintf.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ap_snprintf.c 1998/05/07 07:47:33 1.21
+++ ap_snprintf.c 1998/05/07 09:39:42 1.22
@@ -940,7 +940,7 @@
break;
}
- if (prefix_char != NUL && s != S_NULL & s != char_buf) {
+ if (prefix_char != NUL && s != S_NULL && s != char_buf) {
*--s = prefix_char;
s_len++;
}
cvs commit: apache-1.3/src CHANGES
martin 98/05/07 00:52:50 Modified:src CHANGES Log: Note ap_snprintf tweaks Revision ChangesPath 1.830 +3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.829 retrieving revision 1.830 diff -u -u -r1.829 -r1.830 --- CHANGES 1998/05/07 01:21:15 1.829 +++ CHANGES 1998/05/07 07:52:48 1.830 @@ -1,5 +1,8 @@ Changes with Apache 1.3b7 + *) Minor stability tweaks to avoid core dumps in ap_snprintf. + [Martin Kraemer] + *) Emit the "Accept-Range" header for the default handler. [Brian Behlendorf] PR#1464
cvs commit: apache-1.3/src/ap ap_snprintf.c
martin 98/05/07 00:47:34
Modified:src/ap ap_snprintf.c
Log:
Avoid core dumps for bogus ap_snprintf() format strings by using more
defensive approach: never allow patching a prefix char in front of
a constant string (or in front of char_buf); delimit strchr() to not
scan past the generated string;
Add 'h' modifier for compatibility reasons with other printf()s.
Revision ChangesPath
1.21 +15 -6 apache-1.3/src/ap/ap_snprintf.c
Index: ap_snprintf.c
===
RCS file: /home/cvs/apache-1.3/src/ap/ap_snprintf.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -u -r1.20 -r1.21
--- ap_snprintf.c 1998/05/06 19:49:46 1.20
+++ ap_snprintf.c 1998/05/07 07:47:33 1.21
@@ -677,8 +677,11 @@
is_long = YES;
fmt++;
}
- else
+ else {
+ if (*fmt == 'h') /* "short" backward compatibility */
+ ++fmt;
is_long = NO;
+ }
/*
* Argument extraction and printing.
@@ -772,7 +775,9 @@
case 'e':
case 'E':
fp_num = va_arg(ap, double);
-
+ /*
+ * * We use &num_buf[ 1 ], so that we have room for the sign
+ */
s = conv_fp(*fmt, fp_num, alternate_form,
(adjust_precision == NO) ? FLOAT_DIGITS : precision,
&is_negative, &num_buf[1], &s_len);
@@ -804,8 +809,10 @@
s_len = strlen(s);
- if (alternate_form && (q = strchr(s, '.')) == NULL)
+ if (alternate_form && (q = strchr(s, '.')) == NULL) {
s[s_len++] = '.';
+ s[s_len] = '\0'; /* delimit for following strchr() */
+ }
if (*fmt == 'G' && (q = strchr(s, 'e')) != NULL)
*q = 'E';
break;
@@ -851,6 +858,7 @@
else {
s = "%p";
s_len = 2;
+ prefix_char = NUL;
}
pad_char = ' ';
break;
@@ -900,6 +908,7 @@
default:
s = "bogus %p";
s_len = 8;
+ prefix_char = NUL;
break;
}
break;
@@ -931,15 +940,15 @@
break;
}
- if (prefix_char != NUL) {
+ if (prefix_char != NUL && s != S_NULL & s != char_buf) {
*--s = prefix_char;
s_len++;
}
if (adjust_width && adjust == RIGHT && min_width > s_len) {
if (pad_char == '0' && prefix_char != NUL) {
- INS_CHAR(*s, sp, bep, cc)
- s++;
+ INS_CHAR(*s, sp, bep, cc);
+ s++;
s_len--;
min_width--;
}
cvs commit: apache-1.3 STATUS
jim 98/05/06 19:48:24 Modified:.STATUS Log: Add Ken's patch Revision ChangesPath 1.380 +6 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.379 retrieving revision 1.380 diff -u -r1.379 -r1.380 --- STATUS1998/05/06 15:17:56 1.379 +++ STATUS1998/05/07 02:48:22 1.380 @@ -56,6 +56,12 @@ Available Patches: +* Ken's Adding the OS Type Patch + <[EMAIL PROTECTED]> + Status: Ken +1, Jim +1 (with Brian's suggested changes), + Martin +1, Brian +1 (change 'add_component' and + 'add_platform' to something a bit more clear) + * Ed Korthof's patch to fix protocol issues surrounding 400, 408, and 414 responses. <[EMAIL PROTECTED]>
cvs commit: apache-1.3/src/main http_protocol.c http_core.c
brian 98/05/06 18:21:23
Modified:src CHANGES
src/main http_protocol.c http_core.c
Log:
PR: 1464
Emit the Accept-Ranges header for every response from the default handler,
instead of just for those that don't emit a "Range" request.
Revision ChangesPath
1.829 +3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.828
retrieving revision 1.829
diff -u -r1.828 -r1.829
--- CHANGES 1998/05/06 21:16:03 1.828
+++ CHANGES 1998/05/07 01:21:15 1.829
@@ -1,5 +1,8 @@
Changes with Apache 1.3b7
+ *) Emit the "Accept-Range" header for the default handler.
+ [Brian Behlendorf] PR#1464
+
*) Add a note to httpd.conf-dist that apache will on some systems fail
to start when the Group # is set to a negative or large positive value.
[Martin Kraemer]
1.213 +0 -1 apache-1.3/src/main/http_protocol.c
Index: http_protocol.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_protocol.c,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213
--- http_protocol.c 1998/04/27 06:59:35 1.212
+++ http_protocol.c 1998/05/07 01:21:22 1.213
@@ -141,7 +141,6 @@
range = ap_table_get(r->headers_in, "Request-Range");
if (!range || strncasecmp(range, "bytes=", 6)) {
-ap_table_setn(r->headers_out, "Accept-Ranges", "bytes");
return 0;
}
1.193 +1 -0 apache-1.3/src/main/http_core.c
Index: http_core.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_core.c,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- http_core.c 1998/05/05 04:48:05 1.192
+++ http_core.c 1998/05/07 01:21:22 1.193
@@ -2120,6 +2120,7 @@
ap_update_mtime (r, r->finfo.st_mtime);
ap_set_last_modified(r);
ap_set_etag(r);
+ap_table_setn(r->headers_out, "Accept-Ranges", "bytes");
if (((errstatus = ap_meets_conditions(r)) != OK)
|| (errstatus = ap_set_content_length (r, r->finfo.st_size))) {
return errstatus;
