Sorry, presuming lazy concensus, but that probably isn't fair this
close to the release. This is a side effect of vetting the recent apr
changes to apr_dir_read() and digging in to SVNs bug (that is
already solved.)
Please look at the fields used and explain why the existing code
was correct. I'm happy to revert if anyone sees an issue.
Bill
At 06:36 PM 12/23/2002, Bill Stoddard wrote:
>I don't recall seeing a vote on this...
>
>Bill
>
>> wrowe 2002/12/23 01:10:15
>>
>> Modified: modules/ssl Tag: APACHE_2_0_BRANCH ssl_engine_init.c
>> ssl_util_ssl.c
>> Log:
>> All we want is type and name, so ask for type and name.
>>
>> Revision Changes Path
>> No revision
>>
>>
>> No revision
>>
>>
>> 1.106.2.1 +1 -1 httpd-2.0/modules/ssl/ssl_engine_init.c
>>
>> Index: ssl_engine_init.c
>> ===================================================================
>> RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_init.c,v
>> retrieving revision 1.106
>> retrieving revision 1.106.2.1
>> diff -u -r1.106 -r1.106.2.1
>> --- ssl_engine_init.c 11 Nov 2002 13:16:17 -0000 1.106
>> +++ ssl_engine_init.c 23 Dec 2002 09:10:15 -0000 1.106.2.1
>> @@ -1143,7 +1143,7 @@
>> if (ca_path) {
>> apr_dir_t *dir;
>> apr_finfo_t direntry;
>> - apr_int32_t finfo_flags = APR_FINFO_MIN|APR_FINFO_NAME;
>> + apr_int32_t finfo_flags = APR_FINFO_TYPE|APR_FINFO_NAME;
>> apr_status_t rv;
>>
>> if ((rv = apr_dir_open(&dir, ca_path, ptemp)) != APR_SUCCESS) {
>>
>>
>>
>> 1.23.2.1 +1 -1 httpd-2.0/modules/ssl/ssl_util_ssl.c
>>
>> Index: ssl_util_ssl.c
>> ===================================================================
>> RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_util_ssl.c,v
>> retrieving revision 1.23
>> retrieving revision 1.23.2.1
>> diff -u -r1.23 -r1.23.2.1
>> --- ssl_util_ssl.c 25 Oct 2002 22:03:52 -0000 1.23
>> +++ ssl_util_ssl.c 23 Dec 2002 09:10:15 -0000 1.23.2.1
>> @@ -454,7 +454,7 @@
>> */
>> apr_dir_t *dir;
>> apr_finfo_t dirent;
>> - apr_int32_t finfo_flags = APR_FINFO_MIN|APR_FINFO_NAME;
>> + apr_int32_t finfo_flags = APR_FINFO_TYPE|APR_FINFO_NAME;
>> const char *fullname;
>> BOOL ok = FALSE;
>>
>>
>>
>>
