httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@covalent.net
Subject Re: Beta rolls tomorrow.
Date Wed, 20 Dec 2000 14:18:39 GMT

Go for it.  If this isn't committed before I roll, I'll commit it
myself.  :-)

I consider this a major fix that needs to be in before we roll.  Thanks, I
never said my AWK skills were up to par, glad to see yours are.  :-)

Ryan

On Wed, 20 Dec 2000, Brian Havard wrote:

> The recent exports stuff caused some breakage for me (doesn't work with 
> multi-part or negative #ifdefs). I have a patch to fix it though. Mind if I 
> commit this? Note that the last file is in apr.
> 
> 
> 
> Index: build/buildexports.awk
> ===================================================================
> RCS file: /home/cvs/httpd-2.0/build/buildexports.awk,v
> retrieving revision 1.5
> diff -u -r1.5 buildexports.awk
> --- build/buildexports.awk	2000/12/19 17:05:11	1.5
> +++ build/buildexports.awk	2000/12/20 08:24:56
> @@ -1,3 +1,3 @@
> -/^(APR?_|defined)/     { print "#if", $1 }
> +/^(APR?_|!?defined)/     { print "#if", $0 }
>  /^\t*apr?_/ { print "const void *ap_hack_" $1 " = (const void *)" $1 ";" }
> -/^\/(APR?_|defined)/   { print "#endif /*", substr($1,2), "*/" }
> +/^\/(APR?_|!?defined)/   { print "#endif /*", substr($0,2), "*/" }
> Index: include/ap_listen.h
> ===================================================================
> RCS file: /home/cvs/httpd-2.0/include/ap_listen.h,v
> retrieving revision 1.23
> diff -u -r1.23 ap_listen.h
> --- include/ap_listen.h	2000/12/19 17:05:11	1.23
> +++ include/ap_listen.h	2000/12/20 08:25:00
> @@ -58,6 +58,7 @@
>  #include "apr_network_io.h"
>  #include "httpd.h"
>  #include "http_config.h"
> +#include "mpm.h"
>  
>  /**
>   * @package Apache Listeners Library
> Index: helpers/make_export.awk
> ===================================================================
> RCS file: /home/cvs/apr/helpers/make_export.awk,v
> retrieving revision 1.2
> diff -u -r1.2 make_export.awk
> --- helpers/make_export.awk	2000/12/19 17:05:28	1.2
> +++ helpers/make_export.awk	2000/12/20 08:31:04
> @@ -1,6 +1,6 @@
>  # Based on Ryan Bloom's make_export.pl
>  
> -/^#[ \t]*if(def)? (APR?_|defined).*/ {
> +/^#[ \t]*if(def)? (APR?_|!?defined).*/ {
>  	if (old_filename != FILENAME) {
>  		if (old_filename != "") printf("%s", line)
>  		macro_no = 0
> @@ -10,7 +10,7 @@
>  		line = ""
>  	}
>  	macro_stack[macro_no++] = macro
> -	macro = $2
> +	macro = substr($0, length($1)+2)
>  	found++
>  	count++
>  	line = line macro "\n"
> 
> -- 
>  ______________________________________________________________________________
>  |  Brian Havard                 |  "He is not the messiah!                   |
>  |  brianh@kheldar.apana.org.au  |  He's a very naughty boy!" - Life of Brian |
>  ------------------------------------------------------------------------------
> 
> 


_______________________________________________________________________________
Ryan Bloom                        	rbb@apache.org
406 29th St.
San Francisco, CA 94131
-------------------------------------------------------------------------------


Mime
View raw message