You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2014/12/05 08:57:57 UTC
svn commit: r1643179 - in /httpd/httpd/trunk/server/mpm: prefork/prefork.c
worker/worker.c
Author: ylavic
Date: Fri Dec 5 07:57:57 2014
New Revision: 1643179
URL: http://svn.apache.org/viewvc?rev=1643179&view=rev
Log:
mpm_{prefork,worker}: follow up to r1635521.
Don't crash when there is no accept mutex (one listener => apr_proc_mutex_name(NULL)).
Modified:
httpd/httpd/trunk/server/mpm/prefork/prefork.c
httpd/httpd/trunk/server/mpm/worker/worker.c
Modified: httpd/httpd/trunk/server/mpm/prefork/prefork.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/prefork/prefork.c?rev=1643179&r1=1643178&r2=1643179&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/prefork/prefork.c (original)
+++ httpd/httpd/trunk/server/mpm/prefork/prefork.c Fri Dec 5 07:57:57 2014
@@ -1037,7 +1037,9 @@ static int prefork_run(apr_pool_t *_pcon
ap_log_common(s);
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, APLOGNO(00165)
"Accept mutex: %s (default: %s)",
- apr_proc_mutex_name(all_buckets[0].mutex),
+ (all_buckets[0].mutex)
+ ? apr_proc_mutex_name(all_buckets[0].mutex)
+ : "none",
apr_proc_mutex_defname());
mpm_state = AP_MPMQ_RUNNING;
Modified: httpd/httpd/trunk/server/mpm/worker/worker.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/worker/worker.c?rev=1643179&r1=1643178&r2=1643179&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/worker/worker.c (original)
+++ httpd/httpd/trunk/server/mpm/worker/worker.c Fri Dec 5 07:57:57 2014
@@ -1869,7 +1869,9 @@ static int worker_run(apr_pool_t *_pconf
ap_log_common(s);
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, APLOGNO(00294)
"Accept mutex: %s (default: %s)",
- apr_proc_mutex_name(all_buckets[0].mutex),
+ (all_buckets[0].mutex)
+ ? apr_proc_mutex_name(all_buckets[0].mutex)
+ : "none",
apr_proc_mutex_defname());
mpm_state = AP_MPMQ_RUNNING;
Re: svn commit: r1643179 - in /httpd/httpd/trunk/server/mpm: prefork/prefork.c
worker/worker.c
Posted by Daniel Gruno <hu...@apache.org>.
All fixed now - took a bit of digging, but it works :)
On 2014-12-05 13:43, Yann Ylavic wrote:
> OK, thanks Daniel.
>
> On Fri, Dec 5, 2014 at 1:41 PM, Daniel Gruno <hu...@apache.org> wrote:
>> I'm working on that right now, Yann :)
>>
>> With regards,
>> Daniel.
>>
>> On 2014-12-05 13:40, Yann Ylavic wrote:
>>> On Fri, Dec 5, 2014 at 8:57 AM, <yl...@apache.org> wrote:
>>>> Author: ylavic
>>>> Date: Fri Dec 5 07:57:57 2014
>>>> New Revision: 1643179
>>>>
>>>> URL: http://svn.apache.org/viewvc?rev=1643179&view=rev
>>> The URL used here seems to have changed since recent upgrade (was
>>> httpd://svn.a.o/r[rev] before).
>>> The previous one looked more "generic" IMHO, less dependant on the SVN
>>> viewer (would not break if the viewer changes some day).
>>
Re: svn commit: r1643179 - in /httpd/httpd/trunk/server/mpm:
prefork/prefork.c worker/worker.c
Posted by Yann Ylavic <yl...@gmail.com>.
OK, thanks Daniel.
On Fri, Dec 5, 2014 at 1:41 PM, Daniel Gruno <hu...@apache.org> wrote:
> I'm working on that right now, Yann :)
>
> With regards,
> Daniel.
>
> On 2014-12-05 13:40, Yann Ylavic wrote:
>>
>> On Fri, Dec 5, 2014 at 8:57 AM, <yl...@apache.org> wrote:
>>>
>>> Author: ylavic
>>> Date: Fri Dec 5 07:57:57 2014
>>> New Revision: 1643179
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1643179&view=rev
>>
>> The URL used here seems to have changed since recent upgrade (was
>> httpd://svn.a.o/r[rev] before).
>> The previous one looked more "generic" IMHO, less dependant on the SVN
>> viewer (would not break if the viewer changes some day).
>
>
Re: svn commit: r1643179 - in /httpd/httpd/trunk/server/mpm: prefork/prefork.c
worker/worker.c
Posted by Daniel Gruno <hu...@apache.org>.
I'm working on that right now, Yann :)
With regards,
Daniel.
On 2014-12-05 13:40, Yann Ylavic wrote:
> On Fri, Dec 5, 2014 at 8:57 AM, <yl...@apache.org> wrote:
>> Author: ylavic
>> Date: Fri Dec 5 07:57:57 2014
>> New Revision: 1643179
>>
>> URL: http://svn.apache.org/viewvc?rev=1643179&view=rev
> The URL used here seems to have changed since recent upgrade (was
> httpd://svn.a.o/r[rev] before).
> The previous one looked more "generic" IMHO, less dependant on the SVN
> viewer (would not break if the viewer changes some day).
Re: svn commit: r1643179 - in /httpd/httpd/trunk/server/mpm:
prefork/prefork.c worker/worker.c
Posted by Yann Ylavic <yl...@gmail.com>.
On Fri, Dec 5, 2014 at 8:57 AM, <yl...@apache.org> wrote:
> Author: ylavic
> Date: Fri Dec 5 07:57:57 2014
> New Revision: 1643179
>
> URL: http://svn.apache.org/viewvc?rev=1643179&view=rev
The URL used here seems to have changed since recent upgrade (was
httpd://svn.a.o/r[rev] before).
The previous one looked more "generic" IMHO, less dependant on the SVN
viewer (would not break if the viewer changes some day).