httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Yann Ylavic <ylavic....@gmail.com>
Subject Re: svn commit: r1652955 - /httpd/httpd/trunk/Makefile.in
Date Mon, 19 Jan 2015 12:25:22 GMT
Hi Rainer,

On Mon, Jan 19, 2015 at 11:32 AM,  <rjung@apache.org> wrote:
> Author: rjung
> Date: Mon Jan 19 10:32:51 2015
> New Revision: 1652955
>
> URL: http://svn.apache.org/r1652955
> Log:
> PR 57379: If mod_cgi and mod_cgid get installed,
> use IfModule for MPM to choose mod_cgi for
> prefork and mod_cgid in all other cases.
>
> Previously when combined with --enable-load-all-modules
> both modules were loaded and it was undefined
> which one actually handled cgi requests.
>
> Modified:
>     httpd/httpd/trunk/Makefile.in
>
> Modified: httpd/httpd/trunk/Makefile.in
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/Makefile.in?rev=1652955&r1=1652954&r2=1652955&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/Makefile.in (original)
> +++ httpd/httpd/trunk/Makefile.in Mon Jan 19 10:32:51 2015
[...]
> @@ -68,7 +78,17 @@ install-conf:
>                                                 if test "$(LOAD_ALL_MODULES)" = "yes";
then \
>                                                         loading_disabled=""; \
>                                                 fi; \
> +                                               if test $$j == "cgid" -a "$$have_cgi"
== "1"; then \
> +                                               echo "<IfModule !mpm_prefork_module>";
\
> +                                               echo "    $${loading_disabled}LoadModule
$${j}_module $(rel_libexecdir)/mod_$${j}.so"; \
> +                                               echo "</IfModule>"; \
> +                                               elif test $$j == "cgi" -a "$$have_cgid"
== "1"; then \
> +                                               echo "<IfModule mpm_prefork_module>";
\
> +                                               echo "    $${loading_disabled}LoadModule
$${j}_module $(rel_libexecdir)/mod_$${j}.so"; \
> +                                               echo "</IfModule>"; \
> +                                               else \
>                                                 echo "$${loading_disabled}LoadModule
$${j}_module $(rel_libexecdir)/mod_$${j}.so"; \
> +                                               fi; \
>                                         fi; \

Indentation looks incorrect here (it should at least start with a tab).

>                                 done; \
>                                 sed -e '1,/@@LoadModule@@/d' \
>
>

Regards,
Yann.

Mime
View raw message