httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "William A. Rowe, Jr." <wr...@lnd.com>
Subject RE: cvs commit: apache-2.0/src/modules/mpm/winnt mpm_winnt.c registry.c service.c
Date Tue, 25 Jul 2000 01:28:13 GMT
Just highlighting potential problems...

> wrowe       00/07/24 17:58:23
> 
>   Modified:    src/os/win32 mod_isapi.c util_win32.c
>                src/modules/standard mod_so.c mod_auth_digest.c
>                         mod_cern_meta.c mod_expires.c mod_file_cache.c
>                         mod_rewrite.c mod_speling.c mod_usertrack.c
>                src/modules/mpm/winnt mpm_winnt.c registry.c service.c
>   Log:
>     Missing apr_strings.h - hope this wasn't destined for 
> some global header.
>   
>   Revision  Changes    Path
>   1.13      +142 -77   apache-2.0/src/os/win32/mod_isapi.c
>   
>   Index: mod_isapi.c
>   ===================================================================

Sorry, ignore this mess (other than the apr_strings.h), I will finish
the patch so it is functionally equiv. to the original.  I'm setting in
all the placeholders for missing 5.0 functionallity and adding comments
on how they might be implemented.  Existing tabs didn't help this commit
either :(  The net codepath change by tommorow night will be null, and 
will be a good place to start working from.


>   1.23      +2 -1      apache-2.0/src/modules/standard/mod_so.c
>   
>   Index: mod_so.c
>   ===================================================================
>   RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_so.c,v
>   retrieving revision 1.22
>   retrieving revision 1.23
>   diff -u -r1.22 -r1.23
>   --- mod_so.c	2000/07/15 01:07:42	1.22
>   +++ mod_so.c	2000/07/25 00:58:20	1.23
>   @@ -257,7 +258,7 @@
>    
>            return ap_pstrcat(cmd->pool, "Cannot load ", szModuleFile,
>    			  " into server: ",
>   -			  ap_dso_error(modhandle, my_error, sizeof(my_error)),
>   +			  ap_strerror(status, my_error, sizeof(my_error)),
>    			  NULL);
>        }

Sorry, a quick fix.  Is this reasonable or should I retract it?

>   1.21      +2 -1      
> apache-2.0/src/modules/standard/mod_auth_digest.c
>   
>   Index: mod_auth_digest.c
>   ===================================================================
>   RCS file: 
> /home/cvs/apache-2.0/src/modules/standard/mod_auth_digest.c,v
>   retrieving revision 1.20
>   retrieving revision 1.21
>   diff -u -r1.20 -r1.21
>   --- mod_auth_digest.c	2000/06/24 17:34:02	1.20
>   +++ mod_auth_digest.c	2000/07/25 00:58:20	1.21
>   @@ -498,7 +499,7 @@
>    static const char *set_qop(cmd_parms *cmd, void *config, const char *op)
>    {
>        digest_config_rec *conf = (digest_config_rec *) config;
>   -    const char **tmp;
>   +    char **tmp;
>        int cnt;

Was causing constness errors, as I recall, but it can be retracted.

>   1.34      +8 -7      apache-2.0/src/modules/standard/mod_rewrite.c
>   
>   Index: mod_rewrite.c
>   ===================================================================
>   RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_rewrite.c,v
>   retrieving revision 1.33
>   retrieving revision 1.34
>   diff -u -r1.33 -r1.34
>   --- mod_rewrite.c	2000/07/14 20:03:09	1.33
>   +++ mod_rewrite.c	2000/07/25 00:58:21	1.34
>   @@ -442,7 +443,7 @@
>        }
>        else {
>            return ap_pstrcat(p, "RewriteOptions: unknown option '",
>   -                          name, "'\n", NULL);
>   +                          name, "'", NULL);

etc... this is returned and blatted into the log, but it didn't appear
to need any newline delimiter at all (given that we don't pass trailing
newlines to the log fn's.)

Otherwise just a few /n redactions from the log function calls.  Sorry,
those were ment for the following commit.

Mime
View raw message