jim 00/02/20 07:05:01
Modified: . STATUS
src CHANGES
src/main util.c
Log:
The 't' option is only valid and needed for OS/2.
PR:5760
Submitted by: Ian Turner <[EMAIL PROTECTED]>
Reviewed by: Jim Jagielski
Revision Changes Path
1.810 +6 -6 apache-1.3/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/apache-1.3/STATUS,v
retrieving revision 1.809
retrieving revision 1.810
diff -u -r1.809 -r1.810
--- STATUS 2000/02/20 01:35:26 1.809
+++ STATUS 2000/02/20 15:04:59 1.810
@@ -1,13 +1,13 @@
1.3 STATUS:
- Last modified at [$Date: 2000/02/20 01:35:26 $]
+ Last modified at [$Date: 2000/02/20 15:04:59 $]
Release:
- 1.3.12-dev: In development with a plan to RELEASE on Feb. 18, 2000.
+ 1.3.12-dev: In development with a plan to RELEASE on Feb. 25, 2000.
Jim offers to be RM.
- Feb. 15: Freeze CVS tree
- Feb. 16: tag and roll tarball
- Feb. 18: Announce and release
+ Feb. 22: Freeze CVS tree
+ Feb. 23: tag and roll tarball
+ Feb. 25: Announce and release
1.3.11: Tagged and rolled Jan. 19, 2000. Released and
announced on the 21st.
1.3.10: Not released. Pulled at "last minute" due to
@@ -27,7 +27,7 @@
RELEASE SHOWSTOPPERS:
- general/5760: Use of text type "t" in fopen call...
+ * None at present
RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP:
1.1514 +4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1513
retrieving revision 1.1514
diff -u -r1.1513 -r1.1514
--- CHANGES 2000/02/20 01:35:26 1.1513
+++ CHANGES 2000/02/20 15:04:59 1.1514
@@ -1,5 +1,9 @@
Changes with Apache 1.3.12
+ *) Only OS/2 requires the addition "t" flag for ap_pfopen()
+ (as therefore fopen() as well). [Ian Turner <[EMAIL PROTECTED]>]
+ PR#5760
+
*) The default charset is only added, when enabled, for those
Content-types which require it (text/plain, text/html).
[Jim Jagielski] PR#5766
1.179 +4 -0 apache-1.3/src/main/util.c
Index: util.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/main/util.c,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- util.c 2000/02/20 01:14:48 1.178
+++ util.c 2000/02/20 15:05:00 1.179
@@ -841,7 +841,11 @@
return NULL;
}
+#ifdef OS2
file = ap_pfopen(p, name, "rt");
+#else
+ file = ap_pfopen(p, name, "r");
+#endif
#ifdef DEBUG
saved_errno = errno;
ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, NULL,
