You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by st...@locus.apache.org on 2000/03/20 17:50:16 UTC
cvs commit: apache-1.3/src/main http_request.c
stoddard 00/03/20 08:50:15
Modified: src CHANGES
src/include httpd.h
src/main http_request.c
Log:
Add case_preserved_filename field to the request_rec structure.
On systems with case insensitive file systems (Windows, OS/2, etc.),
r->filename is case canonicalized (folded to either lower or upper
case, depending on the specific system) to accomodate file access
checking. case_preserved_filename is the same as r->filename
except case is preserved. There is at least one instance where Apache
needs access to the case preserved filename: Java class files published
with WebDAV need to preserve filename case to make the Java compiler
happy.
Revision Changes Path
1.1528 +10 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1527
retrieving revision 1.1528
diff -u -r1.1527 -r1.1528
--- CHANGES 2000/03/16 22:05:43 1.1527
+++ CHANGES 2000/03/20 16:50:12 1.1528
@@ -1,3 +1,13 @@
+ *) Add case_preserved_filename field to the request_rec structure.
+ On systems with case insensitive file systems (Windows, OS/2, etc.),
+ r->filename is case canonicalized (folded to either lower or upper
+ case, depending on the specific system) to accomodate file access
+ checking. case_preserved_filename is the same as r->filename
+ except case is preserved. There is at least one instance where Apache
+ needs access to the case preserved filename: Java class files published
+ with WebDAV need to preserve filename case to make the Java compiler
+ happy. [Bill Stoddard]
+
*) Put in Korean and Norwegian index.html pages (2.0 and 1.3)
which where donated by Lee Kuk Hyun and Lorant Czaran [dirkx].
1.312 +11 -0 apache-1.3/src/include/httpd.h
Index: httpd.h
===================================================================
RCS file: /home/cvs/apache-1.3/src/include/httpd.h,v
retrieving revision 1.311
retrieving revision 1.312
diff -u -r1.311 -r1.312
--- httpd.h 2000/03/19 16:15:35 1.311
+++ httpd.h 2000/03/20 16:50:14 1.312
@@ -816,6 +816,17 @@
*/
const struct htaccess_result *htaccess;
+ /* On systems with case insensitive file systems (Windows, OS/2, etc.),
+ * r->filename is case canonicalized (folded to either lower or upper
+ * case, depending on the specific system) to accomodate file access
+ * checking. case_preserved_filename is the same as r->filename
+ * except case is preserved. There is at least one instance where Apache
+ * needs access to the case preserved filename: Java class files published
+ * with WebDAV need to preserve filename case to make the Java compiler
+ * happy.
+ */
+ char *case_preserved_filename;
+
/* Things placed at the end of the record to avoid breaking binary
* compatibility. It would be nice to remember to reorder the entire
* record to improve 64bit alignment the next time we need to break
1.153 +2 -0 apache-1.3/src/main/http_request.c
Index: http_request.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/main/http_request.c,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- http_request.c 2000/01/11 14:13:41 1.152
+++ http_request.c 2000/03/20 16:50:15 1.153
@@ -398,6 +398,8 @@
return res;
}
+ r->case_preserved_filename = r->filename;
+
r->filename = ap_os_canonical_filename(r->pool, r->filename);
test_filename = ap_pstrdup(r->pool, r->filename);
Re: cvs commit: apache-1.3/src/main http_request.c
Posted by Bill Stoddard <st...@raleigh.ibm.com>.
> I question if changes to the request_rec is something we want to be doing
in
> 1.3.
>
> If so, this needs a bump in the MAJOR_MODULE_MAGIC_NUMBER.
MODULE_MAGIC_NUMBER_MINOR definitely needs a bump. I added the field to the
end of request_rec so it should not break binary compatability with modules
that do not need the field, so I don't see why it is necessary to bump
MAJOR. Apache 1.3 will be around for awhile and w/o this fix, any DAV
implementation on top of Apache for Windows is useless as a repository
manager for Java source code. I am open to suggestions for other solutions.
Bill
Re: cvs commit: apache-1.3/src/main http_request.c
Posted by Rodent of Unusual Size <Ke...@Golux.Com>.
rbb@apache.org wrote:
>
> I dislike changing the request_rec in 1.3 as well. I was under the
> impression that we were going to try to keep 1.3 changes relatively
> small. I would prefer to see this fixed in 2.0.
It needs to be fixed in both places. It's going to be a looong
time before any significant fraction of Apache 1.* users move to
2.*, and things this affects (like DAV and Java) aren't going to
wait. That we don't preserve the case already is a bug, so I
consider this a bugfix rather than a feature.
--
#ken P-)}
Ken Coar <http://Golux.Com/coar/>
Apache Software Foundation <http://www.apache.org/>
"Apache Server for Dummies" <http://Apache-Server.Com/>
"Apache Server Unleashed" <http://ApacheUnleashed.Com/>
RE: cvs commit: apache-1.3/src/main http_request.c
Posted by rb...@apache.org.
I dislike changing the request_rec in 1.3 as well. I was under the
impression that we were going to try to keep 1.3 changes relatively small.
I would prefer to see this fixed in 2.0.
Ryan
On Mon, 20 Mar 2000, Randy Terbush wrote:
> I question if changes to the request_rec is something we want to be doing in
> 1.3.
>
> If so, this needs a bump in the MAJOR_MODULE_MAGIC_NUMBER.
>
> > -----Original Message-----
> > From: stoddard@locus.apache.org [mailto:stoddard@locus.apache.org]
> > Sent: Monday, March 20, 2000 8:50 AM
> > To: apache-1.3-cvs@apache.org
> > Subject: cvs commit: apache-1.3/src/main http_request.c
> >
> >
> > stoddard 00/03/20 08:50:15
> >
> > Modified: src CHANGES
> > src/include httpd.h
> > src/main http_request.c
> > Log:
> > Add case_preserved_filename field to the request_rec structure.
> > On systems with case insensitive file systems (Windows, OS/2, etc.),
> > r->filename is case canonicalized (folded to either lower or upper
> > case, depending on the specific system) to accomodate file access
> > checking. case_preserved_filename is the same as r->filename
> > except case is preserved. There is at least one instance where Apache
> > needs access to the case preserved filename: Java class files published
> > with WebDAV need to preserve filename case to make the Java compiler
> > happy.
> >
> > Revision Changes Path
> > 1.1528 +10 -0 apache-1.3/src/CHANGES
> >
> > Index: CHANGES
> > ===================================================================
> > RCS file: /home/cvs/apache-1.3/src/CHANGES,v
> > retrieving revision 1.1527
> > retrieving revision 1.1528
> > diff -u -r1.1527 -r1.1528
> > --- CHANGES 2000/03/16 22:05:43 1.1527
> > +++ CHANGES 2000/03/20 16:50:12 1.1528
> > @@ -1,3 +1,13 @@
> > + *) Add case_preserved_filename field to the request_rec structure.
> > + On systems with case insensitive file systems (Windows,
> > OS/2, etc.),
> > + r->filename is case canonicalized (folded to either lower
> > or upper
> > + case, depending on the specific system) to accomodate file access
> > + checking. case_preserved_filename is the same as r->filename
> > + except case is preserved. There is at least one instance
> > where Apache
> > + needs access to the case preserved filename: Java class
> > files published
> > + with WebDAV need to preserve filename case to make the
> > Java compiler
> > + happy. [Bill Stoddard]
> > +
> > *) Put in Korean and Norwegian index.html pages (2.0 and 1.3)
> > which where donated by Lee Kuk Hyun and Lorant Czaran [dirkx].
> >
> >
> >
> >
> > 1.312 +11 -0 apache-1.3/src/include/httpd.h
> >
> > Index: httpd.h
> > ===================================================================
> > RCS file: /home/cvs/apache-1.3/src/include/httpd.h,v
> > retrieving revision 1.311
> > retrieving revision 1.312
> > diff -u -r1.311 -r1.312
> > --- httpd.h 2000/03/19 16:15:35 1.311
> > +++ httpd.h 2000/03/20 16:50:14 1.312
> > @@ -816,6 +816,17 @@
> > */
> > const struct htaccess_result *htaccess;
> >
> > + /* On systems with case insensitive file systems (Windows,
> > OS/2, etc.),
> > + * r->filename is case canonicalized (folded to either
> > lower or upper
> > + * case, depending on the specific system) to accomodate
> > file access
> > + * checking. case_preserved_filename is the same as r->filename
> > + * except case is preserved. There is at least one
> > instance where Apache
> > + * needs access to the case preserved filename: Java class
> > files published
> > + * with WebDAV need to preserve filename case to make the
> > Java compiler
> > + * happy.
> > + */
> > + char *case_preserved_filename;
> > +
> > /* Things placed at the end of the record to avoid breaking binary
> > * compatibility. It would be nice to remember to reorder the entire
> > * record to improve 64bit alignment the next time we need to break
> >
> >
> >
> > 1.153 +2 -0 apache-1.3/src/main/http_request.c
> >
> > Index: http_request.c
> > ===================================================================
> > RCS file: /home/cvs/apache-1.3/src/main/http_request.c,v
> > retrieving revision 1.152
> > retrieving revision 1.153
> > diff -u -r1.152 -r1.153
> > --- http_request.c 2000/01/11 14:13:41 1.152
> > +++ http_request.c 2000/03/20 16:50:15 1.153
> > @@ -398,6 +398,8 @@
> > return res;
> > }
> >
> > + r->case_preserved_filename = r->filename;
> > +
> > r->filename = ap_os_canonical_filename(r->pool, r->filename);
> >
> > test_filename = ap_pstrdup(r->pool, r->filename);
> >
> >
> >
> >
>
>
_______________________________________________________________________________
Ryan Bloom rbb@apache.org
406 29th St.
San Francisco, CA 94131
-------------------------------------------------------------------------------
[Patch 1.3] Win32 Build Structure
Posted by "William A. Rowe, Jr." <wr...@lnd.com>.
apache-1.3.diffs address all of the following from the weekend:
1) makefile.nt builds within 95/98/NT
2) removes all precompiled header flags
3) builds rotatelogs and logresolve
4) fixed dirty build of htpasswd to deposit it's results
into Debug - Release directories.
5) CHANGES for this and the piped log fixes
Post cvs update steps...
1) Add attached rotatelogs/logresolve dsp/mak files
into apache-1.3/src/support
2) Rename makefile.nt to makefile.win
3) Kill makefile_win32.txt and makefile_win32_debug.txt
Todo:
1) Test logresolve.exe (builds - echos - not sure it
actually resolves anything. But it doesn't hurt
anything either).
RE: cvs commit: apache-1.3/src/main http_request.c
Posted by Randy Terbush <ra...@covalent.net>.
I question if changes to the request_rec is something we want to be doing in
1.3.
If so, this needs a bump in the MAJOR_MODULE_MAGIC_NUMBER.
> -----Original Message-----
> From: stoddard@locus.apache.org [mailto:stoddard@locus.apache.org]
> Sent: Monday, March 20, 2000 8:50 AM
> To: apache-1.3-cvs@apache.org
> Subject: cvs commit: apache-1.3/src/main http_request.c
>
>
> stoddard 00/03/20 08:50:15
>
> Modified: src CHANGES
> src/include httpd.h
> src/main http_request.c
> Log:
> Add case_preserved_filename field to the request_rec structure.
> On systems with case insensitive file systems (Windows, OS/2, etc.),
> r->filename is case canonicalized (folded to either lower or upper
> case, depending on the specific system) to accomodate file access
> checking. case_preserved_filename is the same as r->filename
> except case is preserved. There is at least one instance where Apache
> needs access to the case preserved filename: Java class files published
> with WebDAV need to preserve filename case to make the Java compiler
> happy.
>
> Revision Changes Path
> 1.1528 +10 -0 apache-1.3/src/CHANGES
>
> Index: CHANGES
> ===================================================================
> RCS file: /home/cvs/apache-1.3/src/CHANGES,v
> retrieving revision 1.1527
> retrieving revision 1.1528
> diff -u -r1.1527 -r1.1528
> --- CHANGES 2000/03/16 22:05:43 1.1527
> +++ CHANGES 2000/03/20 16:50:12 1.1528
> @@ -1,3 +1,13 @@
> + *) Add case_preserved_filename field to the request_rec structure.
> + On systems with case insensitive file systems (Windows,
> OS/2, etc.),
> + r->filename is case canonicalized (folded to either lower
> or upper
> + case, depending on the specific system) to accomodate file access
> + checking. case_preserved_filename is the same as r->filename
> + except case is preserved. There is at least one instance
> where Apache
> + needs access to the case preserved filename: Java class
> files published
> + with WebDAV need to preserve filename case to make the
> Java compiler
> + happy. [Bill Stoddard]
> +
> *) Put in Korean and Norwegian index.html pages (2.0 and 1.3)
> which where donated by Lee Kuk Hyun and Lorant Czaran [dirkx].
>
>
>
>
> 1.312 +11 -0 apache-1.3/src/include/httpd.h
>
> Index: httpd.h
> ===================================================================
> RCS file: /home/cvs/apache-1.3/src/include/httpd.h,v
> retrieving revision 1.311
> retrieving revision 1.312
> diff -u -r1.311 -r1.312
> --- httpd.h 2000/03/19 16:15:35 1.311
> +++ httpd.h 2000/03/20 16:50:14 1.312
> @@ -816,6 +816,17 @@
> */
> const struct htaccess_result *htaccess;
>
> + /* On systems with case insensitive file systems (Windows,
> OS/2, etc.),
> + * r->filename is case canonicalized (folded to either
> lower or upper
> + * case, depending on the specific system) to accomodate
> file access
> + * checking. case_preserved_filename is the same as r->filename
> + * except case is preserved. There is at least one
> instance where Apache
> + * needs access to the case preserved filename: Java class
> files published
> + * with WebDAV need to preserve filename case to make the
> Java compiler
> + * happy.
> + */
> + char *case_preserved_filename;
> +
> /* Things placed at the end of the record to avoid breaking binary
> * compatibility. It would be nice to remember to reorder the entire
> * record to improve 64bit alignment the next time we need to break
>
>
>
> 1.153 +2 -0 apache-1.3/src/main/http_request.c
>
> Index: http_request.c
> ===================================================================
> RCS file: /home/cvs/apache-1.3/src/main/http_request.c,v
> retrieving revision 1.152
> retrieving revision 1.153
> diff -u -r1.152 -r1.153
> --- http_request.c 2000/01/11 14:13:41 1.152
> +++ http_request.c 2000/03/20 16:50:15 1.153
> @@ -398,6 +398,8 @@
> return res;
> }
>
> + r->case_preserved_filename = r->filename;
> +
> r->filename = ap_os_canonical_filename(r->pool, r->filename);
>
> test_filename = ap_pstrdup(r->pool, r->filename);
>
>
>
>