comparison auto/sources @ 517:8fbdd980b527

Merge with current.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 13 Jul 2009 23:56:24 +0400
parents 44a61c599bb2 829f9a66a659
children 40fd8d7b82f9
comparison
equal deleted inserted replaced
424:44a61c599bb2 517:8fbdd980b527
31 src/core/ngx_shmtx.h \ 31 src/core/ngx_shmtx.h \
32 src/core/ngx_connection.h \ 32 src/core/ngx_connection.h \
33 src/core/ngx_cycle.h \ 33 src/core/ngx_cycle.h \
34 src/core/ngx_conf_file.h \ 34 src/core/ngx_conf_file.h \
35 src/core/ngx_resolver.h \ 35 src/core/ngx_resolver.h \
36 src/core/ngx_open_file_cache.h \ 36 src/core/ngx_open_file_cache.h"
37 src/core/ngx_garbage_collector.h"
38 37
39 38
40 CORE_SRCS="src/core/nginx.c \ 39 CORE_SRCS="src/core/nginx.c \
41 src/core/ngx_log.c \ 40 src/core/ngx_log.c \
42 src/core/ngx_palloc.c \ 41 src/core/ngx_palloc.c \
60 src/core/ngx_cycle.c \ 59 src/core/ngx_cycle.c \
61 src/core/ngx_spinlock.c \ 60 src/core/ngx_spinlock.c \
62 src/core/ngx_cpuinfo.c \ 61 src/core/ngx_cpuinfo.c \
63 src/core/ngx_conf_file.c \ 62 src/core/ngx_conf_file.c \
64 src/core/ngx_resolver.c \ 63 src/core/ngx_resolver.c \
65 src/core/ngx_open_file_cache.c \ 64 src/core/ngx_open_file_cache.c"
66 src/core/ngx_garbage_collector.c"
67 65
68 66
69 REGEX_DEPS=src/core/ngx_regex.h 67 REGEX_DEPS=src/core/ngx_regex.h
70 REGEX_SRCS=src/core/ngx_regex.c 68 REGEX_SRCS=src/core/ngx_regex.c
71 69
95 src/event/ngx_event_pipe.c" 93 src/event/ngx_event_pipe.c"
96 94
97 95
98 SELECT_MODULE=ngx_select_module 96 SELECT_MODULE=ngx_select_module
99 SELECT_SRCS=src/event/modules/ngx_select_module.c 97 SELECT_SRCS=src/event/modules/ngx_select_module.c
98 WIN32_SELECT_SRCS=src/event/modules/ngx_win32_select_module.c
100 99
101 POLL_MODULE=ngx_poll_module 100 POLL_MODULE=ngx_poll_module
102 POLL_SRCS=src/event/modules/ngx_poll_module.c 101 POLL_SRCS=src/event/modules/ngx_poll_module.c
103 102
104 KQUEUE_MODULE=ngx_kqueue_module 103 KQUEUE_MODULE=ngx_kqueue_module
215 src/os/win32/ngx_atomic.h \ 214 src/os/win32/ngx_atomic.h \
216 src/os/win32/ngx_thread.h \ 215 src/os/win32/ngx_thread.h \
217 src/os/win32/ngx_socket.h \ 216 src/os/win32/ngx_socket.h \
218 src/os/win32/ngx_os.h \ 217 src/os/win32/ngx_os.h \
219 src/os/win32/ngx_user.h \ 218 src/os/win32/ngx_user.h \
220 src/os/win32/ngx_gui.h \
221 src/os/win32/ngx_gui_resources.h \
222 src/os/win32/ngx_process_cycle.h" 219 src/os/win32/ngx_process_cycle.h"
223 220
224 WIN32_CONFIG=src/os/win32/ngx_win32_config.h 221 WIN32_CONFIG=src/os/win32/ngx_win32_config.h
225 222
226 WIN32_SRCS="$CORE_SRCS $EVENT_SRCS \ 223 WIN32_SRCS="$CORE_SRCS $EVENT_SRCS \
233 src/os/win32/ngx_thread.c \ 230 src/os/win32/ngx_thread.c \
234 src/os/win32/ngx_socket.c \ 231 src/os/win32/ngx_socket.c \
235 src/os/win32/ngx_wsarecv.c \ 232 src/os/win32/ngx_wsarecv.c \
236 src/os/win32/ngx_wsarecv_chain.c \ 233 src/os/win32/ngx_wsarecv_chain.c \
237 src/os/win32/ngx_udp_wsarecv.c \ 234 src/os/win32/ngx_udp_wsarecv.c \
235 src/os/win32/ngx_wsasend.c \
238 src/os/win32/ngx_wsasend_chain.c \ 236 src/os/win32/ngx_wsasend_chain.c \
239 src/os/win32/ngx_win32_init.c \ 237 src/os/win32/ngx_win32_init.c \
240 src/os/win32/ngx_user.c \ 238 src/os/win32/ngx_user.c \
241 src/os/win32/ngx_gui.c \ 239 src/os/win32/ngx_event_log.c \
242 src/os/win32/ngx_process_cycle.c \ 240 src/os/win32/ngx_process_cycle.c \
243 src/event/ngx_event_acceptex.c" 241 src/event/ngx_event_acceptex.c"
244 242
245 NGX_WIN32_ICONS="src/os/win32/nginx.ico src/os/win32/nginx_tray.ico" 243 NGX_WIN32_ICONS="src/os/win32/nginx.ico"
246 NGX_WIN32_RC="src/os/win32/nginx.rc" 244 NGX_WIN32_RC="src/os/win32/nginx.rc"
247 245
248 246
249 # the http modules that have their logging formats 247 # the http modules that have their logging formats
250 # must be after ngx_http_log_module 248 # must be after ngx_http_log_module
251 249
252 HTTP_MODULES="ngx_http_module \ 250 HTTP_MODULES="ngx_http_module \
253 ngx_http_core_module \ 251 ngx_http_core_module \
254 ngx_http_log_module \ 252 ngx_http_log_module \
255 ngx_http_upstream_module" 253 ngx_http_upstream_module"
256
257 HTTP_CACHE_MODULE=ngx_http_cache_module
258 254
259 HTTP_WRITE_FILTER_MODULE="ngx_http_write_filter_module" 255 HTTP_WRITE_FILTER_MODULE="ngx_http_write_filter_module"
260 HTTP_HEADER_FILTER_MODULE="ngx_http_header_filter_module" 256 HTTP_HEADER_FILTER_MODULE="ngx_http_header_filter_module"
261 257
262 HTTP_POSTPONE_FILTER_MODULE=ngx_http_postpone_filter_module 258 HTTP_POSTPONE_FILTER_MODULE=ngx_http_postpone_filter_module
312 # STUB 308 # STUB
313 HTTP_SRCS="$HTTP_SRCS src/http/ngx_http_busy_lock.c" 309 HTTP_SRCS="$HTTP_SRCS src/http/ngx_http_busy_lock.c"
314 310
315 HTTP_POSTPONE_FILTER_SRCS=src/http/ngx_http_postpone_filter_module.c 311 HTTP_POSTPONE_FILTER_SRCS=src/http/ngx_http_postpone_filter_module.c
316 312
317 HTTP_CACHE_SRCS=src/http/ngx_http_cache.c
318 HTTP_FILE_CACHE_SRCS=src/http/ngx_http_file_cache.c 313 HTTP_FILE_CACHE_SRCS=src/http/ngx_http_file_cache.c
319 314
320 315
321 HTTP_CHARSET_FILTER_MODULE=ngx_http_charset_filter_module 316 HTTP_CHARSET_FILTER_MODULE=ngx_http_charset_filter_module
322 HTTP_CHARSET_SRCS=src/http/modules/ngx_http_charset_filter_module.c 317 HTTP_CHARSET_SRCS=src/http/modules/ngx_http_charset_filter_module.c
331 HTTP_SSI_SRCS=src/http/modules/ngx_http_ssi_filter_module.c 326 HTTP_SSI_SRCS=src/http/modules/ngx_http_ssi_filter_module.c
332 327
333 328
334 HTTP_XSLT_FILTER_MODULE=ngx_http_xslt_filter_module 329 HTTP_XSLT_FILTER_MODULE=ngx_http_xslt_filter_module
335 HTTP_XSLT_SRCS=src/http/modules/ngx_http_xslt_filter_module.c 330 HTTP_XSLT_SRCS=src/http/modules/ngx_http_xslt_filter_module.c
331
332
333 HTTP_IMAGE_FILTER_MODULE=ngx_http_image_filter_module
334 HTTP_IMAGE_SRCS=src/http/modules/ngx_http_image_filter_module.c
336 335
337 336
338 HTTP_SUB_FILTER_MODULE=ngx_http_sub_filter_module 337 HTTP_SUB_FILTER_MODULE=ngx_http_sub_filter_module
339 HTTP_SUB_SRCS=src/http/modules/ngx_http_sub_filter_module.c 338 HTTP_SUB_SRCS=src/http/modules/ngx_http_sub_filter_module.c
340 339
416 415
417 HTTP_LIMIT_ZONE_MODULE=ngx_http_limit_zone_module 416 HTTP_LIMIT_ZONE_MODULE=ngx_http_limit_zone_module
418 HTTP_LIMIT_ZONE_SRCS=src/http/modules/ngx_http_limit_zone_module.c 417 HTTP_LIMIT_ZONE_SRCS=src/http/modules/ngx_http_limit_zone_module.c
419 418
420 419
420 HTTP_LIMIT_REQ_MODULE=ngx_http_limit_req_module
421 HTTP_LIMIT_REQ_SRCS=src/http/modules/ngx_http_limit_req_module.c
422
423
421 HTTP_EMPTY_GIF_MODULE=ngx_http_empty_gif_module 424 HTTP_EMPTY_GIF_MODULE=ngx_http_empty_gif_module
422 HTTP_EMPTY_GIF_SRCS=src/http/modules/ngx_http_empty_gif_module.c 425 HTTP_EMPTY_GIF_SRCS=src/http/modules/ngx_http_empty_gif_module.c
423 426
424 427
425 HTTP_BROWSER_MODULE=ngx_http_browser_module 428 HTTP_BROWSER_MODULE=ngx_http_browser_module