You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ta...@apache.org on 2014/06/13 14:30:13 UTC
svn commit: r1602409 - /httpd/httpd/trunk/server/mpm/event/event.c
Author: takashi
Date: Fri Jun 13 12:30:12 2014
New Revision: 1602409
URL: http://svn.apache.org/r1602409
Log:
eventMPM:
fix SEGV in the case socket callback was registered
and no timeout function was registered.
Modified:
httpd/httpd/trunk/server/mpm/event/event.c
Modified: httpd/httpd/trunk/server/mpm/event/event.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/event/event.c?rev=1602409&r1=1602408&r2=1602409&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/event/event.c (original)
+++ httpd/httpd/trunk/server/mpm/event/event.c Fri Jun 13 12:30:12 2014
@@ -1974,7 +1974,9 @@ static void * APR_THREAD_FUNC listener_t
timer_event_t *te;
int i = 0;
socket_callback_baton_t *baton = (socket_callback_baton_t *) pt->baton;
- baton->cancel_event->canceled = 1;
+ if(baton->cancel_event){
+ baton->cancel_event->canceled = 1;
+ }
/* We only signal once per N sockets with this baton */
if (!(baton->signaled)) {
Re: svn commit: r1602409 - /httpd/httpd/trunk/server/mpm/event/event.c
Posted by Takashi Sato <ta...@tks.st>.
>> - baton->cancel_event->canceled = 1;
>> + if(baton->cancel_event){
>
>
> Hi there,
>
> You need to add a space between "if" and "(" and between ")" and "{" ;)
>
> Thanks!
I forgot the coding style rule.
Fixed in r1602544. thanks.
Re: svn commit: r1602409 - /httpd/httpd/trunk/server/mpm/event/event.c
Posted by Jeff Trawick <tr...@gmail.com>.
On Fri, Jun 13, 2014 at 8:30 AM, <ta...@apache.org> wrote:
> Author: takashi
> Date: Fri Jun 13 12:30:12 2014
> New Revision: 1602409
>
> URL: http://svn.apache.org/r1602409
> Log:
> eventMPM:
> fix SEGV in the case socket callback was registered
> and no timeout function was registered.
>
> Modified:
> httpd/httpd/trunk/server/mpm/event/event.c
>
> Modified: httpd/httpd/trunk/server/mpm/event/event.c
> URL:
> http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/event/event.c?rev=1602409&r1=1602408&r2=1602409&view=diff
>
> ==============================================================================
> --- httpd/httpd/trunk/server/mpm/event/event.c (original)
> +++ httpd/httpd/trunk/server/mpm/event/event.c Fri Jun 13 12:30:12 2014
> @@ -1974,7 +1974,9 @@ static void * APR_THREAD_FUNC listener_t
> timer_event_t *te;
> int i = 0;
> socket_callback_baton_t *baton = (socket_callback_baton_t
> *) pt->baton;
> - baton->cancel_event->canceled = 1;
> + if(baton->cancel_event){
>
Hi there,
You need to add a space between "if" and "(" and between ")" and "{" ;)
Thanks!
> + baton->cancel_event->canceled = 1;
> + }
>
> /* We only signal once per N sockets with this baton */
> if (!(baton->signaled)) {
>
>
>
--
Born in Roswell... married an alien...
http://emptyhammock.com/
http://edjective.org/