File tree 2 files changed +8
-28
lines changed
2 files changed +8
-28
lines changed Original file line number Diff line number Diff line change @@ -295,7 +295,9 @@ ngx_rtmp_auto_push_init_process(ngx_cycle_t *cycle)
295
295
296
296
rev = c -> read ;
297
297
298
+ #if (nginx_version >= 1009013 )
298
299
c -> type = ls -> type ;
300
+ #endif
299
301
c -> log = & ls -> log ;
300
302
301
303
c -> listening = ls ;
@@ -328,38 +330,16 @@ ngx_rtmp_auto_push_init_process(ngx_cycle_t *cycle)
328
330
}
329
331
}
330
332
331
- #if (NGX_WIN32 )
332
- if (ngx_event_flags & NGX_USE_IOCP_EVENT ) {
333
- ngx_iocp_conf_t * iocpcf ;
334
-
335
- rev -> handler = ngx_event_acceptex ;
336
-
337
- if (ngx_add_event (rev , 0 , NGX_IOCP_ACCEPT ) == NGX_ERROR ) {
338
- return NGX_ERROR ;
339
- }
340
-
341
- ls -> log .handler = ngx_acceptex_log_error ;
342
-
343
- iocpcf = ngx_event_get_conf (ngx_cycle -> conf_ctx , ngx_iocp_module );
344
- if (ngx_event_post_acceptex (ls , iocpcf -> post_acceptex )
345
- == NGX_ERROR )
346
- {
347
- return NGX_ERROR ;
348
- }
349
- } else {
350
- rev -> handler = ngx_event_accept ;
351
-
352
- if (ngx_add_event (rev , NGX_READ_EVENT , 0 ) == NGX_ERROR ) {
353
- return NGX_ERROR ;
354
- }
355
- }
333
+ #if (nginx_version >= 1009013 )
334
+ rev -> handler = (c -> type == SOCK_STREAM ) ? ngx_event_accept
335
+ : ngx_event_recvmsg ;
356
336
#else
357
337
rev -> handler = ngx_event_accept ;
338
+ #endif
358
339
359
340
if (ngx_add_event (rev , NGX_READ_EVENT , 0 ) == NGX_ERROR ) {
360
341
return NGX_ERROR ;
361
342
}
362
- #endif
363
343
}
364
344
#endif
365
345
Original file line number Diff line number Diff line change 9
9
#define _NGX_RTMP_VERSION_H_INCLUDED_
10
10
11
11
12
- #define nginx_rtmp_version 1002008
13
- #define NGINX_RTMP_VERSION "1.2.8 "
12
+ #define nginx_rtmp_version 1002009
13
+ #define NGINX_RTMP_VERSION "1.2.9 "
14
14
15
15
16
16
#endif /* _NGX_RTMP_VERSION_H_INCLUDED_ */
You can’t perform that action at this time.
0 commit comments