You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@apache.org on 2010/06/02 19:55:51 UTC

svn commit: r950693 - /httpd/mod_fcgid/trunk/configure.apxs

Author: covener
Date: Wed Jun  2 17:55:51 2010
New Revision: 950693

URL: http://svn.apache.org/viewvc?rev=950693&view=rev
Log:
instead of adding another escape, protect the backrefs as they're passed to sed.

/bin/dash on debian/ubuntu was getting 0x01 instead of the backref passed to sed:
  > fcgid_config.h:4:9: error: macro names must be identifiers

Tested on /bin/dash, /bin/bash on Linux and /bin/sh, /usr/xpg4/bin/sh on Solaris.

Submitted by: Eric Covener, Igor Galić
Reviewed by: Eric Covener


Modified:
    httpd/mod_fcgid/trunk/configure.apxs

Modified: httpd/mod_fcgid/trunk/configure.apxs
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/configure.apxs?rev=950693&r1=950692&r2=950693&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/configure.apxs (original)
+++ httpd/mod_fcgid/trunk/configure.apxs Wed Jun  2 17:55:51 2010
@@ -104,8 +104,7 @@ cd ..
 if test "x$found_features" = "x"; then
   cp modules/fcgid/fcgid_config.h.in modules/fcgid/fcgid_config.h
 else
-  found_features="`echo \"$found_features\" | sed -e '#s*/#*\\$/#g;'`"
-  eval sed $found_features < modules/fcgid/fcgid_config.h.in \
+  eval sed "$found_features" < modules/fcgid/fcgid_config.h.in \
                            > modules/fcgid/fcgid_config.h
 fi
 



Re: svn commit: r950693 - /httpd/mod_fcgid/trunk/configure.apxs

Posted by Eric Covener <co...@gmail.com>.
> You might want to apply changes to mod_ftp/trunk/configure.apxs in sync. The
> build files for mod_ftp and mod_fcgi are currently very close to each other.

Thanks for the catch


-- 
Eric Covener
covener@gmail.com

Re: svn commit: r950693 - /httpd/mod_fcgid/trunk/configure.apxs

Posted by Rainer Jung <ra...@kippdata.de>.
On 02.06.2010 19:55, covener@apache.org wrote:
> Author: covener
> Date: Wed Jun  2 17:55:51 2010
> New Revision: 950693
>
> URL: http://svn.apache.org/viewvc?rev=950693&view=rev
> Log:
> instead of adding another escape, protect the backrefs as they're passed to sed.
>
> /bin/dash on debian/ubuntu was getting 0x01 instead of the backref passed to sed:
>    >  fcgid_config.h:4:9: error: macro names must be identifiers
>
> Tested on /bin/dash, /bin/bash on Linux and /bin/sh, /usr/xpg4/bin/sh on Solaris.
>
> Submitted by: Eric Covener, Igor Galić
> Reviewed by: Eric Covener
>
>
> Modified:
>      httpd/mod_fcgid/trunk/configure.apxs
>
> Modified: httpd/mod_fcgid/trunk/configure.apxs
> URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/configure.apxs?rev=950693&r1=950692&r2=950693&view=diff
> ==============================================================================
> --- httpd/mod_fcgid/trunk/configure.apxs (original)
> +++ httpd/mod_fcgid/trunk/configure.apxs Wed Jun  2 17:55:51 2010
> @@ -104,8 +104,7 @@ cd ..
>   if test "x$found_features" = "x"; then
>     cp modules/fcgid/fcgid_config.h.in modules/fcgid/fcgid_config.h
>   else
> -  found_features="`echo \"$found_features\" | sed -e '#s*/#*\\$/#g;'`"
> -  eval sed $found_features<  modules/fcgid/fcgid_config.h.in \
> +  eval sed "$found_features"<  modules/fcgid/fcgid_config.h.in \
>                              >  modules/fcgid/fcgid_config.h
>   fi

You might want to apply changes to mod_ftp/trunk/configure.apxs in sync. 
The build files for mod_ftp and mod_fcgi are currently very close to 
each other.

Regards,

Rainer