On 02/12/2009 02:26 PM, [email protected] wrote: > Author: mturk > Date: Thu Feb 12 13:26:11 2009 > New Revision: 743730 > > URL: http://svn.apache.org/viewvc?rev=743730&view=rev > Log: > Fix core on win32 when using wakeable pollset > > Modified: > apr/apr/branches/1.4.x/CHANGES > apr/apr/branches/1.4.x/file_io/win32/pipe.c > apr/apr/branches/1.4.x/poll/unix/select.c >
> Modified: apr/apr/branches/1.4.x/poll/unix/select.c > URL: > http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/poll/unix/select.c?rev=743730&r1=743729&r2=743730&view=diff > ============================================================================== > --- apr/apr/branches/1.4.x/poll/unix/select.c (original) > +++ apr/apr/branches/1.4.x/poll/unix/select.c Thu Feb 12 13:26:11 2009 This whole change is NOT in trunk. So how does it get in 1.4.x? > @@ -195,6 +195,9 @@ > apr_file_t **out, > apr_pool_t *p); > > +extern apr_status_t > +apr_file_socket_pipe_close(apr_file_t *file); Why this when you define it later as static? > + > /* Create a dummy wakeup socket pipe for interrupting the poller > */ > static apr_status_t create_wakeup_pipe(apr_pollset_t *pollset) > @@ -218,6 +221,12 @@ > { > return APR_ENOTIMPL; > } > + > +static apr_status_t apr_file_socket_pipe_close(apr_file_t *file) > +{ > + return APR_ENOTIMPL; > +} > + > #endif /* WIN32 */ > #else /* APR_FILES_AS_SOCKETS */ > > @@ -265,11 +274,19 @@ > if (pollset->flags & APR_POLLSET_WAKEABLE) { > /* Close both sides of the wakeup pipe */ > if (pollset->wakeup_pipe[0]) { > +#if APR_FILES_AS_SOCKETS > apr_file_close(pollset->wakeup_pipe[0]); > +#else > + apr_file_socket_pipe_close(pollset->wakeup_pipe[0]); > +#endif > pollset->wakeup_pipe[0] = NULL; > } > if (pollset->wakeup_pipe[1]) { > +#if APR_FILES_AS_SOCKETS > apr_file_close(pollset->wakeup_pipe[1]); > +#else > + apr_file_socket_pipe_close(pollset->wakeup_pipe[1]); > +#endif > pollset->wakeup_pipe[1] = NULL; > } > } > > > Regards Rüdiger
