You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rj...@apache.org on 2015/01/19 11:32:51 UTC
svn commit: r1652955 - /httpd/httpd/trunk/Makefile.in
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
@@ -58,6 +58,16 @@ install-conf:
-e 's#@@SSLPort@@#$(SSLPORT)#g' \
-e 'p' \
< $$i; \
+ if echo " $(DSO_MODULES) "|$(EGREP) " cgi " > /dev/null ; then \
+ have_cgi="1"; \
+ else \
+ have_cgi="0"; \
+ fi; \
+ if echo " $(DSO_MODULES) "|$(EGREP) " cgid " > /dev/null ; then \
+ have_cgid="1"; \
+ else \
+ have_cgid="0"; \
+ fi; \
for j in $(DSO_MODULES) "^EOL^"; do \
if test $$j != "^EOL^"; then \
if echo ",$(ENABLED_DSO_MODULES),"|$(EGREP) ",$$j," > /dev/null ; then \
@@ -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; \
done; \
sed -e '1,/@@LoadModule@@/d' \
Re: svn commit: r1652955 - /httpd/httpd/trunk/Makefile.in
Posted by Yann Ylavic <yl...@gmail.com>.
On Mon, Jan 19, 2015 at 1:45 PM, Rainer Jung <ra...@kippdata.de> wrote:
>
> Note that the file also contains quite a few other (old) places where
> continuation lines start with space instead of tabs.
Indeed, but not an issue since they are all continuation lines, the
first line has the leading tab and that's what matters.
(Actually I didn't notice the continuation marks, so this wasn't an
issue either with r1652955...).
Thanks for taking care of those cases.
>
> Regards,
>
> Rainer
Re: svn commit: r1652955 - /httpd/httpd/trunk/Makefile.in
Posted by Rainer Jung <ra...@kippdata.de>.
Am 19.01.2015 um 13:25 schrieb Yann Ylavic:
> Hi Rainer,
>
> On Mon, Jan 19, 2015 at 11:32 AM, <rj...@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
> Indentation looks incorrect here (it should at least start with a tab).
Fixed by using only tabs for the new lines and added to proposal.
Note that the file also contains quite a few other (old) places where
continuation lines start with space instead of tabs.
Regards,
Rainer
Re: svn commit: r1652955 - /httpd/httpd/trunk/Makefile.in
Posted by Yann Ylavic <yl...@gmail.com>.
Hi Rainer,
On Mon, Jan 19, 2015 at 11:32 AM, <rj...@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.