You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ma...@hyperreal.org on 1998/05/08 11:51:55 UTC
cvs commit: apache-1.3/src/os/bs2000 Makefile.tmpl os.c
martin 98/05/08 02:51:54
Modified: src/os/bs2000 Makefile.tmpl os.c
Log:
Add file to Makefile, tweak text file detection
Revision Changes Path
1.7 +1 -1 apache-1.3/src/os/bs2000/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /home/cvs/apache-1.3/src/os/bs2000/Makefile.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -u -r1.6 -r1.7
--- Makefile.tmpl 1998/04/09 10:22:53 1.6
+++ Makefile.tmpl 1998/05/08 09:51:54 1.7
@@ -3,7 +3,7 @@
INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
-OBJS= os.o os-inline.o ebcdic.o
+OBJS= os.o os-inline.o ebcdic.o bs2login.o
LIB= libos.a
1.8 +3 -1 apache-1.3/src/os/bs2000/os.c
Index: os.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/os/bs2000/os.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -u -r1.7 -r1.8
--- os.c 1998/04/13 10:32:25 1.7
+++ os.c 1998/05/08 09:51:54 1.8
@@ -80,7 +80,9 @@
convert_to_ascii = (r->content_type == NULL);
/* Conversion is applied to text/ files only, if ever. */
- if (r->content_type && strncmp(r->content_type, "text/", 5)==0) {
+ if (r->content_type &&
+ (strncmp(r->content_type, "text/", 5) == 0
+ || strncmp(r->content_type, "message/", 8) == 0)) {
if (strncmp(r->content_type, ASCIITEXT_MAGIC_TYPE_PREFIX,
sizeof(ASCIITEXT_MAGIC_TYPE_PREFIX)-1) == 0)
r->content_type = ap_pstrcat(r->pool, "text/",