Skip to content

Commit

Permalink
Restored ngx_event_aio_t layout for debug logging.
Browse files Browse the repository at this point in the history
The "fd" field should be after 3 pointers for ngx_event_ident() to use it.
This was broken by ccad84a174e0.  While it does not seem to be currently used
for aio-related events, it should be a good idea to preserve the correct
layout nevertheless.
  • Loading branch information
mdounin committed Aug 10, 2017
1 parent 0f841fc commit dd5ab4a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/event/ngx_event.h
Original file line number Diff line number Diff line change
Expand Up @@ -152,12 +152,12 @@ struct ngx_event_aio_s {
ngx_event_handler_pt handler;
ngx_file_t *file;

ngx_fd_t fd;

#if (NGX_HAVE_AIO_SENDFILE || NGX_COMPAT)
ssize_t (*preload_handler)(ngx_buf_t *file);
#endif

ngx_fd_t fd;

#if (NGX_HAVE_EVENTFD)
int64_t res;
#endif
Expand Down

0 comments on commit dd5ab4a

Please sign in to comment.