jim 00/02/23 04:44:57
Modified: src CHANGES
src/include ap_config.h
src/main util.c
Log:
Are we ready ??
Revision Changes Path
1.1515 +3 -2 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1514
retrieving revision 1.1515
diff -u -r1.1514 -r1.1515
--- CHANGES 2000/02/20 15:04:59 1.1514
+++ CHANGES 2000/02/23 12:44:55 1.1515
@@ -1,8 +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
+ (as therefore fopen() as well). This is handled by the
+ FOPEN_REQUIRES_T macro. [Ian Turner <[EMAIL PROTECTED]>,
+ Jim Jagielski] PR#5760
*) The default charset is only added, when enabled, for those
Content-types which require it (text/plain, text/html).
1.282 +1 -0 apache-1.3/src/include/ap_config.h
Index: ap_config.h
===================================================================
RCS file: /home/cvs/apache-1.3/src/include/ap_config.h,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -r1.281 -r1.282
--- ap_config.h 1999/12/15 22:13:33 1.281
+++ ap_config.h 2000/02/23 12:44:56 1.282
@@ -812,6 +812,7 @@
#define NO_RELIABLE_PIPED_LOGS
#define USE_OS2SEM_SERIALIZED_ACCEPT
#define SINGLE_LISTEN_UNSERIALIZED_ACCEPT
+#define FOPEN_REQUIRES_T
#elif defined(__MACHTEN__)
typedef int rlim_t;
1.180 +1 -1 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.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- util.c 2000/02/20 15:05:00 1.179
+++ util.c 2000/02/23 12:44:57 1.180
@@ -841,7 +841,7 @@
return NULL;
}
-#ifdef OS2
+#ifdef FOPEN_REQUIRES_T
file = ap_pfopen(p, name, "rt");
#else
file = ap_pfopen(p, name, "r");
