trawick 2003/02/14 17:03:00
Modified: . Tag: APACHE_2_0_BRANCH CHANGES STATUS
modules/metadata Tag: APACHE_2_0_BRANCH mod_cern_meta.c
Log:
backport the fix for PR 12353
PR: 12353
Revision Changes Path
No revision
No revision
1.988.2.33 +8 -4 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.988.2.32
retrieving revision 1.988.2.33
diff -u -r1.988.2.32 -r1.988.2.33
--- CHANGES 7 Feb 2003 22:03:02 -0000 1.988.2.32
+++ CHANGES 15 Feb 2003 01:02:59 -0000 1.988.2.33
@@ -1,9 +1,13 @@
Changes with Apache 2.0.45
- *) Introduce debugging symbols for Win32 release builds, both .pdb
- and .dbg files (older debuggers and Dr. Watson-type utilities
- on WinNT or Win9x don't support the newer .pdb flavor.)
- [Allen Edwards, William Rowe]
+ *) Fix mod_cern_meta to not create empty metafiles when the
+ metafile searched for does not exist. PR 12353
+ [Owen Rees <owen_rees@hp.com>]
+
+ *) Introduce debugging symbols for Win32 release builds, both .pdb
+ and .dbg files (older debuggers and Dr. Watson-type utilities
+ on WinNT or Win9x don't support the newer .pdb flavor.)
+ [Allen Edwards, William Rowe]
*) Fix bug where 'Satisfy Any' without an AuthType lost all MIME
information (and more). Related to PR 9076. [André Malo]
1.751.2.86 +1 -5 httpd-2.0/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/httpd-2.0/STATUS,v
retrieving revision 1.751.2.85
retrieving revision 1.751.2.86
diff -u -r1.751.2.85 -r1.751.2.86
--- STATUS 15 Feb 2003 00:51:28 -0000 1.751.2.85
+++ STATUS 15 Feb 2003 01:02:59 -0000 1.751.2.86
@@ -100,10 +100,6 @@
[ This one is under review. Don't merge. ]
+1:
- * Fix to apr_file_open() parms in mod_cern_meta for PR 12353
- modules/metadata/mod_cern_meta.c: r1.40
- +1: trawick, nd, jerenkrantz
-
* Better report problems with piped log processes (PR 15761)
server/log.c: r1.129 and r1.130
+1: trawick, nd, jerenkrantz
No revision
No revision
1.39.2.2 +1 -1 httpd-2.0/modules/metadata/mod_cern_meta.c
Index: mod_cern_meta.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/metadata/mod_cern_meta.c,v
retrieving revision 1.39.2.1
retrieving revision 1.39.2.2
diff -u -r1.39.2.1 -r1.39.2.2
--- mod_cern_meta.c 3 Feb 2003 17:31:46 -0000 1.39.2.1
+++ mod_cern_meta.c 15 Feb 2003 01:03:00 -0000 1.39.2.2
@@ -380,7 +380,7 @@
}
ap_destroy_sub_req(rr);
- retcode = apr_file_open(&f, metafilename, APR_READ | APR_CREATE, APR_OS_DEFAULT,
r->pool);
+ retcode = apr_file_open(&f, metafilename, APR_READ, APR_OS_DEFAULT, r->pool);
if (retcode != APR_SUCCESS) {
if (APR_STATUS_IS_ENOENT(retcode)) {
return DECLINED;
|