Mercurial > hg > nginx
annotate src/http/modules/perl/ngx_http_perl_module.c @ 3598:8152369f7037 stable-0.7
merge r3528:
remove r->zero_in_uri
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 07 Jun 2010 12:27:06 +0000 |
parents | 724e5cd44164 |
children |
rev | line source |
---|---|
599 | 1 |
2 /* | |
3 * Copyright (C) Igor Sysoev | |
4 */ | |
5 | |
6 | |
7 #include <ngx_config.h> | |
8 #include <ngx_core.h> | |
9 #include <ngx_http.h> | |
10 #include <ngx_http_perl_module.h> | |
11 | |
12 | |
13 typedef struct { | |
14 PerlInterpreter *perl; | |
873
f92ad15c2db1
fix segfaults in future workers those will use old configuration,
Igor Sysoev <igor@sysoev.ru>
parents:
872
diff
changeset
|
15 HV *nginx; |
3239
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
16 ngx_array_t *modules; |
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
17 ngx_array_t *requires; |
599 | 18 } ngx_http_perl_main_conf_t; |
19 | |
20 | |
21 typedef struct { | |
22 SV *sub; | |
23 ngx_str_t handler; | |
24 } ngx_http_perl_loc_conf_t; | |
25 | |
26 | |
27 typedef struct { | |
28 SV *sub; | |
29 ngx_str_t handler; | |
30 } ngx_http_perl_variable_t; | |
31 | |
32 | |
617 | 33 #if (NGX_HTTP_SSI) |
599 | 34 static ngx_int_t ngx_http_perl_ssi(ngx_http_request_t *r, |
35 ngx_http_ssi_ctx_t *ssi_ctx, ngx_str_t **params); | |
617 | 36 #endif |
37 | |
599 | 38 static char *ngx_http_perl_init_interpreter(ngx_conf_t *cf, |
39 ngx_http_perl_main_conf_t *pmcf); | |
1069 | 40 static PerlInterpreter *ngx_http_perl_create_interpreter(ngx_conf_t *cf, |
41 ngx_http_perl_main_conf_t *pmcf); | |
653 | 42 static ngx_int_t ngx_http_perl_run_requires(pTHX_ ngx_array_t *requires, |
649 | 43 ngx_log_t *log); |
599 | 44 static ngx_int_t ngx_http_perl_call_handler(pTHX_ ngx_http_request_t *r, |
1899
d24ef26f1205
pass additional arguments in ngx_http_perl_call_handler() as SV
Igor Sysoev <igor@sysoev.ru>
parents:
1897
diff
changeset
|
45 HV *nginx, SV *sub, SV **args, ngx_str_t *handler, ngx_str_t *rv); |
599 | 46 static void ngx_http_perl_eval_anon_sub(pTHX_ ngx_str_t *handler, SV **sv); |
47 | |
48 static ngx_int_t ngx_http_perl_preconfiguration(ngx_conf_t *cf); | |
49 static void *ngx_http_perl_create_main_conf(ngx_conf_t *cf); | |
50 static char *ngx_http_perl_init_main_conf(ngx_conf_t *cf, void *conf); | |
51 static void *ngx_http_perl_create_loc_conf(ngx_conf_t *cf); | |
52 static char *ngx_http_perl_merge_loc_conf(ngx_conf_t *cf, void *parent, | |
53 void *child); | |
54 static char *ngx_http_perl(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); | |
55 static char *ngx_http_perl_set(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); | |
872
1c4a5b3f9110
Axe several perl interpreter instances: they may be useful in currently
Igor Sysoev <igor@sysoev.ru>
parents:
871
diff
changeset
|
56 |
1c4a5b3f9110
Axe several perl interpreter instances: they may be useful in currently
Igor Sysoev <igor@sysoev.ru>
parents:
871
diff
changeset
|
57 #if (NGX_HAVE_PERL_MULTIPLICITY) |
599 | 58 static void ngx_http_perl_cleanup_perl(void *data); |
649 | 59 #endif |
599 | 60 |
1257 | 61 static ngx_int_t ngx_http_perl_init_worker(ngx_cycle_t *cycle); |
1221
aa653367028e
PERL_SYS_TERM() should be called once on exit only, this fixes the message
Igor Sysoev <igor@sysoev.ru>
parents:
1165
diff
changeset
|
62 static void ngx_http_perl_exit(ngx_cycle_t *cycle); |
aa653367028e
PERL_SYS_TERM() should be called once on exit only, this fixes the message
Igor Sysoev <igor@sysoev.ru>
parents:
1165
diff
changeset
|
63 |
599 | 64 |
65 static ngx_command_t ngx_http_perl_commands[] = { | |
66 | |
67 { ngx_string("perl_modules"), | |
68 NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1, | |
3239
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
69 ngx_conf_set_str_array_slot, |
599 | 70 NGX_HTTP_MAIN_CONF_OFFSET, |
71 offsetof(ngx_http_perl_main_conf_t, modules), | |
72 NULL }, | |
73 | |
74 { ngx_string("perl_require"), | |
75 NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1, | |
3239
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
76 ngx_conf_set_str_array_slot, |
599 | 77 NGX_HTTP_MAIN_CONF_OFFSET, |
3239
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
78 offsetof(ngx_http_perl_main_conf_t, requires), |
599 | 79 NULL }, |
80 | |
81 { ngx_string("perl"), | |
922
a5b9cdfe3e19
allow "perl" inside "limit_except"
Igor Sysoev <igor@sysoev.ru>
parents:
913
diff
changeset
|
82 NGX_HTTP_LOC_CONF|NGX_HTTP_LMT_CONF|NGX_CONF_TAKE1, |
599 | 83 ngx_http_perl, |
84 NGX_HTTP_LOC_CONF_OFFSET, | |
85 0, | |
86 NULL }, | |
87 | |
88 { ngx_string("perl_set"), | |
89 NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE2, | |
90 ngx_http_perl_set, | |
91 NGX_HTTP_LOC_CONF_OFFSET, | |
92 0, | |
93 NULL }, | |
94 | |
95 ngx_null_command | |
96 }; | |
97 | |
98 | |
99 static ngx_http_module_t ngx_http_perl_module_ctx = { | |
100 ngx_http_perl_preconfiguration, /* preconfiguration */ | |
101 NULL, /* postconfiguration */ | |
102 | |
103 ngx_http_perl_create_main_conf, /* create main configuration */ | |
104 ngx_http_perl_init_main_conf, /* init main configuration */ | |
105 | |
106 NULL, /* create server configuration */ | |
107 NULL, /* merge server configuration */ | |
108 | |
109 ngx_http_perl_create_loc_conf, /* create location configuration */ | |
110 ngx_http_perl_merge_loc_conf /* merge location configuration */ | |
111 }; | |
112 | |
113 | |
114 ngx_module_t ngx_http_perl_module = { | |
115 NGX_MODULE_V1, | |
116 &ngx_http_perl_module_ctx, /* module context */ | |
117 ngx_http_perl_commands, /* module directives */ | |
118 NGX_HTTP_MODULE, /* module type */ | |
119 NULL, /* init master */ | |
120 NULL, /* init module */ | |
1257 | 121 ngx_http_perl_init_worker, /* init process */ |
599 | 122 NULL, /* init thread */ |
123 NULL, /* exit thread */ | |
124 NULL, /* exit process */ | |
1221
aa653367028e
PERL_SYS_TERM() should be called once on exit only, this fixes the message
Igor Sysoev <igor@sysoev.ru>
parents:
1165
diff
changeset
|
125 ngx_http_perl_exit, /* exit master */ |
599 | 126 NGX_MODULE_V1_PADDING |
127 }; | |
128 | |
129 | |
617 | 130 #if (NGX_HTTP_SSI) |
131 | |
599 | 132 #define NGX_HTTP_PERL_SSI_SUB 0 |
133 #define NGX_HTTP_PERL_SSI_ARG 1 | |
134 | |
135 | |
136 static ngx_http_ssi_param_t ngx_http_perl_ssi_params[] = { | |
137 { ngx_string("sub"), NGX_HTTP_PERL_SSI_SUB, 1, 0 }, | |
138 { ngx_string("arg"), NGX_HTTP_PERL_SSI_ARG, 0, 1 }, | |
139 { ngx_null_string, 0, 0, 0 } | |
140 }; | |
141 | |
142 static ngx_http_ssi_command_t ngx_http_perl_ssi_command = { | |
667 | 143 ngx_string("perl"), ngx_http_perl_ssi, ngx_http_perl_ssi_params, 0, 0, 1 |
599 | 144 }; |
145 | |
617 | 146 #endif |
147 | |
599 | 148 |
3442 | 149 static ngx_str_t ngx_null_name = ngx_null_string; |
150 static HV *nginx_stash; | |
681 | 151 |
2715 | 152 #if (NGX_HAVE_PERL_MULTIPLICITY) |
3442 | 153 static ngx_uint_t ngx_perl_term; |
154 #else | |
155 static PerlInterpreter *perl; | |
2715 | 156 #endif |
681 | 157 |
633 | 158 |
599 | 159 static void |
160 ngx_http_perl_xs_init(pTHX) | |
161 { | |
162 newXS("DynaLoader::boot_DynaLoader", boot_DynaLoader, __FILE__); | |
633 | 163 |
164 nginx_stash = gv_stashpv("nginx", TRUE); | |
599 | 165 } |
166 | |
167 | |
168 static ngx_int_t | |
169 ngx_http_perl_handler(ngx_http_request_t *r) | |
170 { | |
681 | 171 ngx_http_perl_handle_request(r); |
172 | |
173 return NGX_DONE; | |
629 | 174 } |
175 | |
176 | |
681 | 177 void |
629 | 178 ngx_http_perl_handle_request(ngx_http_request_t *r) |
179 { | |
681 | 180 SV *sub; |
599 | 181 ngx_int_t rc; |
681 | 182 ngx_str_t uri, args, *handler; |
599 | 183 ngx_http_perl_ctx_t *ctx; |
184 ngx_http_perl_loc_conf_t *plcf; | |
185 ngx_http_perl_main_conf_t *pmcf; | |
186 | |
187 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "perl handler"); | |
188 | |
189 ctx = ngx_http_get_module_ctx(r, ngx_http_perl_module); | |
190 | |
191 if (ctx == NULL) { | |
192 ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_perl_ctx_t)); | |
193 if (ctx == NULL) { | |
681 | 194 ngx_http_finalize_request(r, NGX_ERROR); |
1025 | 195 return; |
599 | 196 } |
197 | |
198 ngx_http_set_ctx(r, ctx, ngx_http_perl_module); | |
199 } | |
200 | |
201 pmcf = ngx_http_get_module_main_conf(r, ngx_http_perl_module); | |
202 | |
203 { | |
204 | |
872
1c4a5b3f9110
Axe several perl interpreter instances: they may be useful in currently
Igor Sysoev <igor@sysoev.ru>
parents:
871
diff
changeset
|
205 dTHXa(pmcf->perl); |
873
f92ad15c2db1
fix segfaults in future workers those will use old configuration,
Igor Sysoev <igor@sysoev.ru>
parents:
872
diff
changeset
|
206 PERL_SET_CONTEXT(pmcf->perl); |
599 | 207 |
681 | 208 if (ctx->next == NULL) { |
209 plcf = ngx_http_get_module_loc_conf(r, ngx_http_perl_module); | |
210 sub = plcf->sub; | |
211 handler = &plcf->handler; | |
599 | 212 |
681 | 213 } else { |
214 sub = ctx->next; | |
215 handler = &ngx_null_name; | |
216 ctx->next = NULL; | |
217 } | |
218 | |
873
f92ad15c2db1
fix segfaults in future workers those will use old configuration,
Igor Sysoev <igor@sysoev.ru>
parents:
872
diff
changeset
|
219 rc = ngx_http_perl_call_handler(aTHX_ r, pmcf->nginx, sub, NULL, handler, |
f92ad15c2db1
fix segfaults in future workers those will use old configuration,
Igor Sysoev <igor@sysoev.ru>
parents:
872
diff
changeset
|
220 NULL); |
599 | 221 |
222 } | |
223 | |
1702
86bb52e28ce0
fix segfault when $r->has_request_body() is called with ready body
Igor Sysoev <igor@sysoev.ru>
parents:
1565
diff
changeset
|
224 if (rc == NGX_DONE) { |
86bb52e28ce0
fix segfault when $r->has_request_body() is called with ready body
Igor Sysoev <igor@sysoev.ru>
parents:
1565
diff
changeset
|
225 return; |
86bb52e28ce0
fix segfault when $r->has_request_body() is called with ready body
Igor Sysoev <igor@sysoev.ru>
parents:
1565
diff
changeset
|
226 } |
86bb52e28ce0
fix segfault when $r->has_request_body() is called with ready body
Igor Sysoev <igor@sysoev.ru>
parents:
1565
diff
changeset
|
227 |
599 | 228 if (rc > 600) { |
229 rc = NGX_OK; | |
230 } | |
231 | |
232 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
233 "perl handler done: %i", rc); | |
234 | |
235 if (ctx->redirect_uri.len) { | |
236 uri = ctx->redirect_uri; | |
237 args = ctx->redirect_args; | |
629 | 238 |
239 } else { | |
240 uri.len = 0; | |
599 | 241 } |
242 | |
633 | 243 ctx->filename.data = NULL; |
599 | 244 ctx->redirect_uri.len = 0; |
245 | |
681 | 246 if (ctx->done || ctx->next) { |
247 return; | |
248 } | |
249 | |
599 | 250 if (uri.len) { |
629 | 251 ngx_http_internal_redirect(r, &uri, &args); |
252 return; | |
599 | 253 } |
254 | |
255 if (rc == NGX_OK || rc == NGX_HTTP_OK) { | |
629 | 256 ngx_http_send_special(r, NGX_HTTP_LAST); |
681 | 257 ctx->done = 1; |
599 | 258 } |
259 | |
629 | 260 ngx_http_finalize_request(r, rc); |
599 | 261 } |
262 | |
263 | |
1897 | 264 void |
911 | 265 ngx_http_perl_sleep_handler(ngx_http_request_t *r) |
266 { | |
913
90ce4d0e3241
fix ngx_http_perl_sleep_handler()
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
267 ngx_event_t *wev; |
90ce4d0e3241
fix ngx_http_perl_sleep_handler()
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
268 |
911 | 269 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
270 "perl sleep handler"); | |
271 | |
913
90ce4d0e3241
fix ngx_http_perl_sleep_handler()
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
272 wev = r->connection->write; |
90ce4d0e3241
fix ngx_http_perl_sleep_handler()
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
273 |
90ce4d0e3241
fix ngx_http_perl_sleep_handler()
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
274 if (wev->timedout) { |
90ce4d0e3241
fix ngx_http_perl_sleep_handler()
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
275 wev->timedout = 0; |
90ce4d0e3241
fix ngx_http_perl_sleep_handler()
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
276 ngx_http_perl_handle_request(r); |
90ce4d0e3241
fix ngx_http_perl_sleep_handler()
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
277 return; |
90ce4d0e3241
fix ngx_http_perl_sleep_handler()
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
278 } |
90ce4d0e3241
fix ngx_http_perl_sleep_handler()
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
279 |
2388
722b5aff05ae
use "!= NGX_OK" instead of "== NGX_ERROR"
Igor Sysoev <igor@sysoev.ru>
parents:
2049
diff
changeset
|
280 if (ngx_handle_write_event(wev, 0) != NGX_OK) { |
913
90ce4d0e3241
fix ngx_http_perl_sleep_handler()
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
281 ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); |
90ce4d0e3241
fix ngx_http_perl_sleep_handler()
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
282 } |
911 | 283 } |
284 | |
285 | |
599 | 286 static ngx_int_t |
287 ngx_http_perl_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, | |
288 uintptr_t data) | |
289 { | |
290 ngx_http_perl_variable_t *pv = (ngx_http_perl_variable_t *) data; | |
291 | |
292 ngx_int_t rc; | |
293 ngx_str_t value; | |
294 ngx_http_perl_ctx_t *ctx; | |
295 ngx_http_perl_main_conf_t *pmcf; | |
296 | |
297 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
298 "perl variable handler"); | |
299 | |
300 ctx = ngx_http_get_module_ctx(r, ngx_http_perl_module); | |
301 | |
302 if (ctx == NULL) { | |
303 ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_perl_ctx_t)); | |
304 if (ctx == NULL) { | |
305 return NGX_ERROR; | |
306 } | |
307 | |
308 ngx_http_set_ctx(r, ctx, ngx_http_perl_module); | |
872
1c4a5b3f9110
Axe several perl interpreter instances: they may be useful in currently
Igor Sysoev <igor@sysoev.ru>
parents:
871
diff
changeset
|
309 } |
599 | 310 |
872
1c4a5b3f9110
Axe several perl interpreter instances: they may be useful in currently
Igor Sysoev <igor@sysoev.ru>
parents:
871
diff
changeset
|
311 pmcf = ngx_http_get_module_main_conf(r, ngx_http_perl_module); |
599 | 312 |
313 value.data = NULL; | |
314 | |
315 { | |
316 | |
872
1c4a5b3f9110
Axe several perl interpreter instances: they may be useful in currently
Igor Sysoev <igor@sysoev.ru>
parents:
871
diff
changeset
|
317 dTHXa(pmcf->perl); |
873
f92ad15c2db1
fix segfaults in future workers those will use old configuration,
Igor Sysoev <igor@sysoev.ru>
parents:
872
diff
changeset
|
318 PERL_SET_CONTEXT(pmcf->perl); |
599 | 319 |
873
f92ad15c2db1
fix segfaults in future workers those will use old configuration,
Igor Sysoev <igor@sysoev.ru>
parents:
872
diff
changeset
|
320 rc = ngx_http_perl_call_handler(aTHX_ r, pmcf->nginx, pv->sub, NULL, |
599 | 321 &pv->handler, &value); |
322 | |
323 } | |
324 | |
325 if (value.data) { | |
326 v->len = value.len; | |
327 v->valid = 1; | |
1565 | 328 v->no_cacheable = 0; |
599 | 329 v->not_found = 0; |
330 v->data = value.data; | |
331 | |
332 } else { | |
333 v->not_found = 1; | |
334 } | |
335 | |
633 | 336 ctx->filename.data = NULL; |
599 | 337 ctx->redirect_uri.len = 0; |
338 | |
871 | 339 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
340 "perl variable done"); | |
341 | |
599 | 342 return rc; |
343 } | |
344 | |
345 | |
617 | 346 #if (NGX_HTTP_SSI) |
347 | |
599 | 348 static ngx_int_t |
349 ngx_http_perl_ssi(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ssi_ctx, | |
350 ngx_str_t **params) | |
351 { | |
1899
d24ef26f1205
pass additional arguments in ngx_http_perl_call_handler() as SV
Igor Sysoev <igor@sysoev.ru>
parents:
1897
diff
changeset
|
352 SV *sv, **asv; |
599 | 353 ngx_int_t rc; |
1899
d24ef26f1205
pass additional arguments in ngx_http_perl_call_handler() as SV
Igor Sysoev <igor@sysoev.ru>
parents:
1897
diff
changeset
|
354 ngx_str_t *handler, **args; |
d24ef26f1205
pass additional arguments in ngx_http_perl_call_handler() as SV
Igor Sysoev <igor@sysoev.ru>
parents:
1897
diff
changeset
|
355 ngx_uint_t i; |
599 | 356 ngx_http_perl_ctx_t *ctx; |
357 ngx_http_perl_main_conf_t *pmcf; | |
358 | |
359 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
360 "perl ssi handler"); | |
361 | |
362 ctx = ngx_http_get_module_ctx(r, ngx_http_perl_module); | |
363 | |
364 if (ctx == NULL) { | |
365 ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_perl_ctx_t)); | |
366 if (ctx == NULL) { | |
367 return NGX_ERROR; | |
368 } | |
369 | |
370 ngx_http_set_ctx(r, ctx, ngx_http_perl_module); | |
371 } | |
372 | |
872
1c4a5b3f9110
Axe several perl interpreter instances: they may be useful in currently
Igor Sysoev <igor@sysoev.ru>
parents:
871
diff
changeset
|
373 pmcf = ngx_http_get_module_main_conf(r, ngx_http_perl_module); |
599 | 374 |
375 ctx->ssi = ssi_ctx; | |
376 | |
377 handler = params[NGX_HTTP_PERL_SSI_SUB]; | |
378 handler->data[handler->len] = '\0'; | |
379 | |
380 { | |
381 | |
872
1c4a5b3f9110
Axe several perl interpreter instances: they may be useful in currently
Igor Sysoev <igor@sysoev.ru>
parents:
871
diff
changeset
|
382 dTHXa(pmcf->perl); |
873
f92ad15c2db1
fix segfaults in future workers those will use old configuration,
Igor Sysoev <igor@sysoev.ru>
parents:
872
diff
changeset
|
383 PERL_SET_CONTEXT(pmcf->perl); |
599 | 384 |
651 | 385 #if 0 |
386 | |
387 /* the code is disabled to force the precompiled perl code using only */ | |
388 | |
389 ngx_http_perl_eval_anon_sub(aTHX_ handler, &sv); | |
390 | |
391 if (sv == &PL_sv_undef) { | |
392 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, | |
393 "eval_pv(\"%V\") failed", handler); | |
394 return NGX_ERROR; | |
395 } | |
396 | |
397 if (sv == NULL) { | |
398 sv = newSVpvn((char *) handler->data, handler->len); | |
399 } | |
400 | |
401 #endif | |
402 | |
599 | 403 sv = newSVpvn((char *) handler->data, handler->len); |
404 | |
1899
d24ef26f1205
pass additional arguments in ngx_http_perl_call_handler() as SV
Igor Sysoev <igor@sysoev.ru>
parents:
1897
diff
changeset
|
405 args = ¶ms[NGX_HTTP_PERL_SSI_ARG]; |
d24ef26f1205
pass additional arguments in ngx_http_perl_call_handler() as SV
Igor Sysoev <igor@sysoev.ru>
parents:
1897
diff
changeset
|
406 |
d24ef26f1205
pass additional arguments in ngx_http_perl_call_handler() as SV
Igor Sysoev <igor@sysoev.ru>
parents:
1897
diff
changeset
|
407 if (args) { |
d24ef26f1205
pass additional arguments in ngx_http_perl_call_handler() as SV
Igor Sysoev <igor@sysoev.ru>
parents:
1897
diff
changeset
|
408 |
d24ef26f1205
pass additional arguments in ngx_http_perl_call_handler() as SV
Igor Sysoev <igor@sysoev.ru>
parents:
1897
diff
changeset
|
409 for (i = 0; args[i]; i++) { /* void */ } |
d24ef26f1205
pass additional arguments in ngx_http_perl_call_handler() as SV
Igor Sysoev <igor@sysoev.ru>
parents:
1897
diff
changeset
|
410 |
d24ef26f1205
pass additional arguments in ngx_http_perl_call_handler() as SV
Igor Sysoev <igor@sysoev.ru>
parents:
1897
diff
changeset
|
411 asv = ngx_pcalloc(r->pool, (i + 1) * sizeof(SV *)); |
d24ef26f1205
pass additional arguments in ngx_http_perl_call_handler() as SV
Igor Sysoev <igor@sysoev.ru>
parents:
1897
diff
changeset
|
412 |
d24ef26f1205
pass additional arguments in ngx_http_perl_call_handler() as SV
Igor Sysoev <igor@sysoev.ru>
parents:
1897
diff
changeset
|
413 if (asv == NULL) { |
d24ef26f1205
pass additional arguments in ngx_http_perl_call_handler() as SV
Igor Sysoev <igor@sysoev.ru>
parents:
1897
diff
changeset
|
414 SvREFCNT_dec(sv); |
d24ef26f1205
pass additional arguments in ngx_http_perl_call_handler() as SV
Igor Sysoev <igor@sysoev.ru>
parents:
1897
diff
changeset
|
415 return NGX_ERROR; |
d24ef26f1205
pass additional arguments in ngx_http_perl_call_handler() as SV
Igor Sysoev <igor@sysoev.ru>
parents:
1897
diff
changeset
|
416 } |
d24ef26f1205
pass additional arguments in ngx_http_perl_call_handler() as SV
Igor Sysoev <igor@sysoev.ru>
parents:
1897
diff
changeset
|
417 |
d24ef26f1205
pass additional arguments in ngx_http_perl_call_handler() as SV
Igor Sysoev <igor@sysoev.ru>
parents:
1897
diff
changeset
|
418 asv[0] = (SV *) i; |
d24ef26f1205
pass additional arguments in ngx_http_perl_call_handler() as SV
Igor Sysoev <igor@sysoev.ru>
parents:
1897
diff
changeset
|
419 |
d24ef26f1205
pass additional arguments in ngx_http_perl_call_handler() as SV
Igor Sysoev <igor@sysoev.ru>
parents:
1897
diff
changeset
|
420 for (i = 0; args[i]; i++) { |
d24ef26f1205
pass additional arguments in ngx_http_perl_call_handler() as SV
Igor Sysoev <igor@sysoev.ru>
parents:
1897
diff
changeset
|
421 asv[i + 1] = newSVpvn((char *) args[i]->data, args[i]->len); |
d24ef26f1205
pass additional arguments in ngx_http_perl_call_handler() as SV
Igor Sysoev <igor@sysoev.ru>
parents:
1897
diff
changeset
|
422 } |
d24ef26f1205
pass additional arguments in ngx_http_perl_call_handler() as SV
Igor Sysoev <igor@sysoev.ru>
parents:
1897
diff
changeset
|
423 |
d24ef26f1205
pass additional arguments in ngx_http_perl_call_handler() as SV
Igor Sysoev <igor@sysoev.ru>
parents:
1897
diff
changeset
|
424 } else { |
d24ef26f1205
pass additional arguments in ngx_http_perl_call_handler() as SV
Igor Sysoev <igor@sysoev.ru>
parents:
1897
diff
changeset
|
425 asv = NULL; |
d24ef26f1205
pass additional arguments in ngx_http_perl_call_handler() as SV
Igor Sysoev <igor@sysoev.ru>
parents:
1897
diff
changeset
|
426 } |
d24ef26f1205
pass additional arguments in ngx_http_perl_call_handler() as SV
Igor Sysoev <igor@sysoev.ru>
parents:
1897
diff
changeset
|
427 |
d24ef26f1205
pass additional arguments in ngx_http_perl_call_handler() as SV
Igor Sysoev <igor@sysoev.ru>
parents:
1897
diff
changeset
|
428 rc = ngx_http_perl_call_handler(aTHX_ r, pmcf->nginx, sv, asv, handler, |
d24ef26f1205
pass additional arguments in ngx_http_perl_call_handler() as SV
Igor Sysoev <igor@sysoev.ru>
parents:
1897
diff
changeset
|
429 NULL); |
599 | 430 |
431 SvREFCNT_dec(sv); | |
432 | |
433 } | |
434 | |
633 | 435 ctx->filename.data = NULL; |
599 | 436 ctx->redirect_uri.len = 0; |
437 ctx->ssi = NULL; | |
438 | |
871 | 439 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "perl ssi done"); |
440 | |
599 | 441 return rc; |
442 } | |
443 | |
617 | 444 #endif |
445 | |
599 | 446 |
447 static char * | |
448 ngx_http_perl_init_interpreter(ngx_conf_t *cf, ngx_http_perl_main_conf_t *pmcf) | |
449 { | |
3442 | 450 ngx_str_t *m; |
451 ngx_uint_t i; | |
872
1c4a5b3f9110
Axe several perl interpreter instances: they may be useful in currently
Igor Sysoev <igor@sysoev.ru>
parents:
871
diff
changeset
|
452 #if (NGX_HAVE_PERL_MULTIPLICITY) |
3442 | 453 ngx_pool_cleanup_t *cln; |
599 | 454 |
455 cln = ngx_pool_cleanup_add(cf->pool, 0); | |
456 if (cln == NULL) { | |
457 return NGX_CONF_ERROR; | |
458 } | |
459 | |
649 | 460 #endif |
461 | |
599 | 462 #ifdef NGX_PERL_MODULES |
3239
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
463 if (pmcf->modules == NGX_CONF_UNSET_PTR) { |
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
464 |
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
465 pmcf->modules = ngx_array_create(cf->pool, 1, sizeof(ngx_str_t)); |
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
466 if (pmcf->modules == NULL) { |
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
467 return NGX_CONF_ERROR; |
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
468 } |
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
469 |
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
470 m = ngx_array_push(pmcf->modules); |
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
471 if (m == NULL) { |
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
472 return NGX_CONF_ERROR; |
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
473 } |
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
474 |
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
475 m->len = sizeof(NGX_PERL_MODULES) - 1; |
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
476 m->data = NGX_PERL_MODULES; |
599 | 477 } |
478 #endif | |
479 | |
3239
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
480 if (pmcf->modules != NGX_CONF_UNSET_PTR) { |
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
481 m = pmcf->modules->elts; |
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
482 for (i = 0; i < pmcf->modules->nelts; i++) { |
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
483 if (ngx_conf_full_name(cf->cycle, &m[i], 0) != NGX_OK) { |
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
484 return NGX_CONF_ERROR; |
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
485 } |
639 | 486 } |
629 | 487 } |
488 | |
872
1c4a5b3f9110
Axe several perl interpreter instances: they may be useful in currently
Igor Sysoev <igor@sysoev.ru>
parents:
871
diff
changeset
|
489 #if !(NGX_HAVE_PERL_MULTIPLICITY) |
649 | 490 |
491 if (perl) { | |
1165 | 492 |
493 if (ngx_set_environment(cf->cycle, NULL) == NULL) { | |
494 return NGX_CONF_ERROR; | |
495 } | |
496 | |
3239
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
497 if (ngx_http_perl_run_requires(aTHX_ pmcf->requires, cf->log) |
653 | 498 != NGX_OK) |
499 { | |
649 | 500 return NGX_CONF_ERROR; |
501 } | |
502 | |
503 pmcf->perl = perl; | |
1163
8288459f15c9
set nginx_stash after reconfiguration in single interpreter perl
Igor Sysoev <igor@sysoev.ru>
parents:
1069
diff
changeset
|
504 pmcf->nginx = nginx_stash; |
649 | 505 |
506 return NGX_CONF_OK; | |
507 } | |
508 | |
509 #endif | |
510 | |
1221
aa653367028e
PERL_SYS_TERM() should be called once on exit only, this fixes the message
Igor Sysoev <igor@sysoev.ru>
parents:
1165
diff
changeset
|
511 if (nginx_stash == NULL) { |
aa653367028e
PERL_SYS_TERM() should be called once on exit only, this fixes the message
Igor Sysoev <igor@sysoev.ru>
parents:
1165
diff
changeset
|
512 PERL_SYS_INIT(&ngx_argc, &ngx_argv); |
aa653367028e
PERL_SYS_TERM() should be called once on exit only, this fixes the message
Igor Sysoev <igor@sysoev.ru>
parents:
1165
diff
changeset
|
513 } |
599 | 514 |
1069 | 515 pmcf->perl = ngx_http_perl_create_interpreter(cf, pmcf); |
599 | 516 |
517 if (pmcf->perl == NULL) { | |
518 return NGX_CONF_ERROR; | |
519 } | |
520 | |
873
f92ad15c2db1
fix segfaults in future workers those will use old configuration,
Igor Sysoev <igor@sysoev.ru>
parents:
872
diff
changeset
|
521 pmcf->nginx = nginx_stash; |
f92ad15c2db1
fix segfaults in future workers those will use old configuration,
Igor Sysoev <igor@sysoev.ru>
parents:
872
diff
changeset
|
522 |
872
1c4a5b3f9110
Axe several perl interpreter instances: they may be useful in currently
Igor Sysoev <igor@sysoev.ru>
parents:
871
diff
changeset
|
523 #if (NGX_HAVE_PERL_MULTIPLICITY) |
649 | 524 |
599 | 525 cln->handler = ngx_http_perl_cleanup_perl; |
526 cln->data = pmcf->perl; | |
527 | |
649 | 528 #else |
529 | |
530 perl = pmcf->perl; | |
531 | |
532 #endif | |
533 | |
599 | 534 return NGX_CONF_OK; |
535 } | |
536 | |
537 | |
538 static PerlInterpreter * | |
1069 | 539 ngx_http_perl_create_interpreter(ngx_conf_t *cf, |
540 ngx_http_perl_main_conf_t *pmcf) | |
599 | 541 { |
542 int n; | |
775 | 543 STRLEN len; |
544 SV *sv; | |
3239
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
545 char *ver, **embedding; |
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
546 ngx_str_t *m; |
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
547 ngx_uint_t i; |
599 | 548 PerlInterpreter *perl; |
549 | |
1069 | 550 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, cf->log, 0, "create perl interpreter"); |
551 | |
552 if (ngx_set_environment(cf->cycle, NULL) == NULL) { | |
553 return NULL; | |
554 } | |
599 | 555 |
556 perl = perl_alloc(); | |
557 if (perl == NULL) { | |
1069 | 558 ngx_log_error(NGX_LOG_ALERT, cf->log, 0, "perl_alloc() failed"); |
599 | 559 return NULL; |
560 } | |
561 | |
562 { | |
563 | |
564 dTHXa(perl); | |
873
f92ad15c2db1
fix segfaults in future workers those will use old configuration,
Igor Sysoev <igor@sysoev.ru>
parents:
872
diff
changeset
|
565 PERL_SET_CONTEXT(perl); |
f92ad15c2db1
fix segfaults in future workers those will use old configuration,
Igor Sysoev <igor@sysoev.ru>
parents:
872
diff
changeset
|
566 |
f92ad15c2db1
fix segfaults in future workers those will use old configuration,
Igor Sysoev <igor@sysoev.ru>
parents:
872
diff
changeset
|
567 perl_construct(perl); |
599 | 568 |
569 #ifdef PERL_EXIT_DESTRUCT_END | |
570 PL_exit_flags |= PERL_EXIT_DESTRUCT_END; | |
571 #endif | |
572 | |
3239
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
573 n = (pmcf->modules != NGX_CONF_UNSET_PTR) ? pmcf->modules->nelts * 2 : 0; |
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
574 |
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
575 embedding = ngx_palloc(cf->pool, (4 + n) * sizeof(char *)); |
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
576 if (embedding == NULL) { |
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
577 goto fail; |
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
578 } |
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
579 |
599 | 580 embedding[0] = ""; |
581 | |
3239
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
582 if (n++) { |
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
583 m = pmcf->modules->elts; |
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
584 for (i = 0; i < pmcf->modules->nelts; i++) { |
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
585 embedding[2 * i + 1] = "-I"; |
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
586 embedding[2 * i + 2] = (char *) m[i].data; |
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
587 } |
599 | 588 } |
589 | |
590 embedding[n++] = "-Mnginx"; | |
591 embedding[n++] = "-e"; | |
592 embedding[n++] = "0"; | |
593 | |
594 n = perl_parse(perl, ngx_http_perl_xs_init, n, embedding, NULL); | |
595 | |
596 if (n != 0) { | |
1069 | 597 ngx_log_error(NGX_LOG_ALERT, cf->log, 0, "perl_parse() failed: %d", n); |
599 | 598 goto fail; |
599 } | |
600 | |
775 | 601 sv = get_sv("nginx::VERSION", FALSE); |
602 ver = SvPV(sv, len); | |
603 | |
604 if (ngx_strcmp(ver, NGINX_VERSION) != 0) { | |
1069 | 605 ngx_log_error(NGX_LOG_ALERT, cf->log, 0, |
775 | 606 "version " NGINX_VERSION " of nginx.pm is required, " |
607 "but %s was found", ver); | |
608 goto fail; | |
609 } | |
610 | |
3239
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
611 if (ngx_http_perl_run_requires(aTHX_ pmcf->requires, cf->log) != NGX_OK) { |
649 | 612 goto fail; |
599 | 613 } |
614 | |
615 } | |
616 | |
617 return perl; | |
618 | |
619 fail: | |
620 | |
621 (void) perl_destruct(perl); | |
622 | |
623 perl_free(perl); | |
624 | |
625 return NULL; | |
626 } | |
627 | |
628 | |
649 | 629 static ngx_int_t |
653 | 630 ngx_http_perl_run_requires(pTHX_ ngx_array_t *requires, ngx_log_t *log) |
649 | 631 { |
3239
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
632 u_char *err; |
649 | 633 STRLEN len; |
3239
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
634 ngx_str_t *script; |
649 | 635 ngx_uint_t i; |
636 | |
3239
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
637 if (requires == NGX_CONF_UNSET_PTR) { |
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
638 return NGX_OK; |
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
639 } |
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
640 |
649 | 641 script = requires->elts; |
642 for (i = 0; i < requires->nelts; i++) { | |
643 | |
3239
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
644 require_pv((char *) script[i].data); |
649 | 645 |
646 if (SvTRUE(ERRSV)) { | |
647 | |
3239
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
648 err = (u_char *) SvPV(ERRSV, len); |
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
649 while (--len && (err[len] == CR || err[len] == LF)) { /* void */ } |
649 | 650 |
651 ngx_log_error(NGX_LOG_EMERG, log, 0, | |
3239
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
652 "require_pv(\"%s\") failed: \"%*s\"", |
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
653 script[i].data, len + 1, err); |
649 | 654 |
655 return NGX_ERROR; | |
656 } | |
657 } | |
658 | |
659 return NGX_OK; | |
660 } | |
661 | |
662 | |
599 | 663 static ngx_int_t |
873
f92ad15c2db1
fix segfaults in future workers those will use old configuration,
Igor Sysoev <igor@sysoev.ru>
parents:
872
diff
changeset
|
664 ngx_http_perl_call_handler(pTHX_ ngx_http_request_t *r, HV *nginx, SV *sub, |
1899
d24ef26f1205
pass additional arguments in ngx_http_perl_call_handler() as SV
Igor Sysoev <igor@sysoev.ru>
parents:
1897
diff
changeset
|
665 SV **args, ngx_str_t *handler, ngx_str_t *rv) |
599 | 666 { |
1702
86bb52e28ce0
fix segfault when $r->has_request_body() is called with ready body
Igor Sysoev <igor@sysoev.ru>
parents:
1565
diff
changeset
|
667 SV *sv; |
86bb52e28ce0
fix segfault when $r->has_request_body() is called with ready body
Igor Sysoev <igor@sysoev.ru>
parents:
1565
diff
changeset
|
668 int n, status; |
86bb52e28ce0
fix segfault when $r->has_request_body() is called with ready body
Igor Sysoev <igor@sysoev.ru>
parents:
1565
diff
changeset
|
669 char *line; |
3239
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
670 u_char *err; |
1702
86bb52e28ce0
fix segfault when $r->has_request_body() is called with ready body
Igor Sysoev <igor@sysoev.ru>
parents:
1565
diff
changeset
|
671 STRLEN len, n_a; |
86bb52e28ce0
fix segfault when $r->has_request_body() is called with ready body
Igor Sysoev <igor@sysoev.ru>
parents:
1565
diff
changeset
|
672 ngx_uint_t i; |
86bb52e28ce0
fix segfault when $r->has_request_body() is called with ready body
Igor Sysoev <igor@sysoev.ru>
parents:
1565
diff
changeset
|
673 ngx_connection_t *c; |
599 | 674 |
675 dSP; | |
676 | |
677 status = 0; | |
678 | |
679 ENTER; | |
680 SAVETMPS; | |
681 | |
682 PUSHMARK(sp); | |
683 | |
873
f92ad15c2db1
fix segfaults in future workers those will use old configuration,
Igor Sysoev <igor@sysoev.ru>
parents:
872
diff
changeset
|
684 sv = sv_2mortal(sv_bless(newRV_noinc(newSViv(PTR2IV(r))), nginx)); |
599 | 685 XPUSHs(sv); |
686 | |
687 if (args) { | |
1940
6a4c74bea81c
fix building on 64-bit platforms broken in r1900
Igor Sysoev <igor@sysoev.ru>
parents:
1899
diff
changeset
|
688 EXTEND(sp, (intptr_t) args[0]); |
599 | 689 |
1899
d24ef26f1205
pass additional arguments in ngx_http_perl_call_handler() as SV
Igor Sysoev <igor@sysoev.ru>
parents:
1897
diff
changeset
|
690 for (i = 1; i <= (ngx_uint_t) args[0]; i++) { |
d24ef26f1205
pass additional arguments in ngx_http_perl_call_handler() as SV
Igor Sysoev <igor@sysoev.ru>
parents:
1897
diff
changeset
|
691 PUSHs(sv_2mortal(args[i])); |
599 | 692 } |
693 } | |
694 | |
695 PUTBACK; | |
696 | |
1702
86bb52e28ce0
fix segfault when $r->has_request_body() is called with ready body
Igor Sysoev <igor@sysoev.ru>
parents:
1565
diff
changeset
|
697 c = r->connection; |
86bb52e28ce0
fix segfault when $r->has_request_body() is called with ready body
Igor Sysoev <igor@sysoev.ru>
parents:
1565
diff
changeset
|
698 |
599 | 699 n = call_sv(sub, G_EVAL); |
700 | |
701 SPAGAIN; | |
702 | |
1702
86bb52e28ce0
fix segfault when $r->has_request_body() is called with ready body
Igor Sysoev <igor@sysoev.ru>
parents:
1565
diff
changeset
|
703 if (c->destroyed) { |
86bb52e28ce0
fix segfault when $r->has_request_body() is called with ready body
Igor Sysoev <igor@sysoev.ru>
parents:
1565
diff
changeset
|
704 PUTBACK; |
86bb52e28ce0
fix segfault when $r->has_request_body() is called with ready body
Igor Sysoev <igor@sysoev.ru>
parents:
1565
diff
changeset
|
705 |
86bb52e28ce0
fix segfault when $r->has_request_body() is called with ready body
Igor Sysoev <igor@sysoev.ru>
parents:
1565
diff
changeset
|
706 FREETMPS; |
86bb52e28ce0
fix segfault when $r->has_request_body() is called with ready body
Igor Sysoev <igor@sysoev.ru>
parents:
1565
diff
changeset
|
707 LEAVE; |
86bb52e28ce0
fix segfault when $r->has_request_body() is called with ready body
Igor Sysoev <igor@sysoev.ru>
parents:
1565
diff
changeset
|
708 |
86bb52e28ce0
fix segfault when $r->has_request_body() is called with ready body
Igor Sysoev <igor@sysoev.ru>
parents:
1565
diff
changeset
|
709 return NGX_DONE; |
86bb52e28ce0
fix segfault when $r->has_request_body() is called with ready body
Igor Sysoev <igor@sysoev.ru>
parents:
1565
diff
changeset
|
710 } |
86bb52e28ce0
fix segfault when $r->has_request_body() is called with ready body
Igor Sysoev <igor@sysoev.ru>
parents:
1565
diff
changeset
|
711 |
599 | 712 if (n) { |
713 if (rv == NULL) { | |
714 status = POPi; | |
715 | |
1702
86bb52e28ce0
fix segfault when $r->has_request_body() is called with ready body
Igor Sysoev <igor@sysoev.ru>
parents:
1565
diff
changeset
|
716 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, |
599 | 717 "call_sv: %d", status); |
718 | |
719 } else { | |
619 | 720 line = SvPVx(POPs, n_a); |
599 | 721 rv->len = n_a; |
722 | |
2049 | 723 rv->data = ngx_pnalloc(r->pool, n_a); |
599 | 724 if (rv->data == NULL) { |
725 return NGX_ERROR; | |
726 } | |
727 | |
728 ngx_memcpy(rv->data, line, n_a); | |
729 } | |
730 } | |
731 | |
732 PUTBACK; | |
733 | |
734 FREETMPS; | |
735 LEAVE; | |
736 | |
737 /* check $@ */ | |
738 | |
739 if (SvTRUE(ERRSV)) { | |
740 | |
3239
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
741 err = (u_char *) SvPV(ERRSV, len); |
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
742 while (--len && (err[len] == CR || err[len] == LF)) { /* void */ } |
599 | 743 |
1702
86bb52e28ce0
fix segfault when $r->has_request_body() is called with ready body
Igor Sysoev <igor@sysoev.ru>
parents:
1565
diff
changeset
|
744 ngx_log_error(NGX_LOG_ERR, c->log, 0, |
3239
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
745 "call_sv(\"%V\") failed: \"%*s\"", handler, len + 1, err); |
599 | 746 |
747 if (rv) { | |
748 return NGX_ERROR; | |
749 } | |
750 | |
751 return NGX_HTTP_INTERNAL_SERVER_ERROR; | |
752 } | |
753 | |
754 if (n != 1) { | |
1702
86bb52e28ce0
fix segfault when $r->has_request_body() is called with ready body
Igor Sysoev <igor@sysoev.ru>
parents:
1565
diff
changeset
|
755 ngx_log_error(NGX_LOG_ALERT, c->log, 0, |
599 | 756 "call_sv(\"%V\") returned %d results", handler, n); |
757 status = NGX_OK; | |
758 } | |
759 | |
760 if (rv) { | |
761 return NGX_OK; | |
762 } | |
763 | |
764 return (ngx_int_t) status; | |
765 } | |
766 | |
767 | |
768 static void | |
769 ngx_http_perl_eval_anon_sub(pTHX_ ngx_str_t *handler, SV **sv) | |
770 { | |
623 | 771 u_char *p; |
772 | |
773 for (p = handler->data; *p; p++) { | |
774 if (*p != ' ' && *p != '\t' && *p != CR && *p != LF) { | |
775 break; | |
776 } | |
777 } | |
778 | |
3239
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
779 if (ngx_strncmp(p, "sub ", 4) == 0 |
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
780 || ngx_strncmp(p, "sub{", 4) == 0 |
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
781 || ngx_strncmp(p, "use ", 4) == 0) |
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
782 { |
623 | 783 *sv = eval_pv((char *) p, FALSE); |
874 | 784 |
785 /* eval_pv() does not set ERRSV on failure */ | |
786 | |
599 | 787 return; |
788 } | |
789 | |
790 *sv = NULL; | |
791 } | |
792 | |
793 | |
794 static void * | |
795 ngx_http_perl_create_main_conf(ngx_conf_t *cf) | |
796 { | |
797 ngx_http_perl_main_conf_t *pmcf; | |
798 | |
799 pmcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_perl_main_conf_t)); | |
800 if (pmcf == NULL) { | |
3237
2efa8d2fcde1
merge r2903, r2911, r2912, r3002:
Igor Sysoev <igor@sysoev.ru>
parents:
2721
diff
changeset
|
801 return NULL; |
599 | 802 } |
803 | |
3239
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
804 pmcf->modules = NGX_CONF_UNSET_PTR; |
8254055b6693
merge r2972, r2994, r3133, r3142, r3143, r3174, r3175, r3176:
Igor Sysoev <igor@sysoev.ru>
parents:
3237
diff
changeset
|
805 pmcf->requires = NGX_CONF_UNSET_PTR; |
599 | 806 |
807 return pmcf; | |
808 } | |
809 | |
810 | |
811 static char * | |
812 ngx_http_perl_init_main_conf(ngx_conf_t *cf, void *conf) | |
813 { | |
814 ngx_http_perl_main_conf_t *pmcf = conf; | |
815 | |
816 if (pmcf->perl == NULL) { | |
817 if (ngx_http_perl_init_interpreter(cf, pmcf) != NGX_CONF_OK) { | |
818 return NGX_CONF_ERROR; | |
819 } | |
820 } | |
821 | |
822 return NGX_CONF_OK; | |
823 } | |
824 | |
825 | |
872
1c4a5b3f9110
Axe several perl interpreter instances: they may be useful in currently
Igor Sysoev <igor@sysoev.ru>
parents:
871
diff
changeset
|
826 #if (NGX_HAVE_PERL_MULTIPLICITY) |
649 | 827 |
599 | 828 static void |
829 ngx_http_perl_cleanup_perl(void *data) | |
830 { | |
649 | 831 PerlInterpreter *perl = data; |
599 | 832 |
873
f92ad15c2db1
fix segfaults in future workers those will use old configuration,
Igor Sysoev <igor@sysoev.ru>
parents:
872
diff
changeset
|
833 PERL_SET_CONTEXT(perl); |
f92ad15c2db1
fix segfaults in future workers those will use old configuration,
Igor Sysoev <igor@sysoev.ru>
parents:
872
diff
changeset
|
834 |
599 | 835 (void) perl_destruct(perl); |
836 | |
837 perl_free(perl); | |
2715 | 838 |
839 if (ngx_perl_term) { | |
840 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0, "perl term"); | |
841 | |
842 PERL_SYS_TERM(); | |
843 } | |
599 | 844 } |
845 | |
649 | 846 #endif |
847 | |
848 | |
599 | 849 static ngx_int_t |
850 ngx_http_perl_preconfiguration(ngx_conf_t *cf) | |
851 { | |
617 | 852 #if (NGX_HTTP_SSI) |
599 | 853 ngx_int_t rc; |
854 ngx_http_ssi_main_conf_t *smcf; | |
855 | |
856 smcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_ssi_filter_module); | |
857 | |
858 rc = ngx_hash_add_key(&smcf->commands, &ngx_http_perl_ssi_command.name, | |
859 &ngx_http_perl_ssi_command, NGX_HASH_READONLY_KEY); | |
860 | |
861 if (rc != NGX_OK) { | |
862 if (rc == NGX_BUSY) { | |
863 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
864 "conflicting SSI command \"%V\"", | |
865 &ngx_http_perl_ssi_command.name); | |
866 } | |
867 | |
868 return NGX_ERROR; | |
869 } | |
617 | 870 #endif |
599 | 871 |
872 return NGX_OK; | |
873 } | |
874 | |
875 | |
876 static void * | |
877 ngx_http_perl_create_loc_conf(ngx_conf_t *cf) | |
878 { | |
879 ngx_http_perl_loc_conf_t *plcf; | |
880 | |
881 plcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_perl_loc_conf_t)); | |
882 if (plcf == NULL) { | |
3237
2efa8d2fcde1
merge r2903, r2911, r2912, r3002:
Igor Sysoev <igor@sysoev.ru>
parents:
2721
diff
changeset
|
883 return NULL; |
599 | 884 } |
885 | |
886 /* | |
887 * set by ngx_pcalloc(): | |
888 * | |
889 * plcf->handler = { 0, NULL }; | |
890 */ | |
891 | |
892 return plcf; | |
893 } | |
894 | |
895 | |
896 static char * | |
897 ngx_http_perl_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) | |
898 { | |
899 ngx_http_perl_loc_conf_t *prev = parent; | |
900 ngx_http_perl_loc_conf_t *conf = child; | |
901 | |
902 if (conf->sub == NULL) { | |
903 conf->sub = prev->sub; | |
904 conf->handler = prev->handler; | |
905 } | |
906 | |
907 return NGX_CONF_OK; | |
908 } | |
909 | |
910 | |
911 static char * | |
912 ngx_http_perl(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) | |
913 { | |
914 ngx_http_perl_loc_conf_t *plcf = conf; | |
915 | |
916 ngx_str_t *value; | |
917 ngx_http_core_loc_conf_t *clcf; | |
918 ngx_http_perl_main_conf_t *pmcf; | |
919 | |
920 value = cf->args->elts; | |
921 | |
922 if (plcf->handler.data) { | |
923 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
924 "duplicate perl handler \"%V\"", &value[1]); | |
925 return NGX_CONF_ERROR; | |
926 } | |
927 | |
928 pmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_perl_module); | |
929 | |
930 if (pmcf->perl == NULL) { | |
931 if (ngx_http_perl_init_interpreter(cf, pmcf) != NGX_CONF_OK) { | |
932 return NGX_CONF_ERROR; | |
933 } | |
934 } | |
935 | |
936 plcf->handler = value[1]; | |
937 | |
938 { | |
939 | |
940 dTHXa(pmcf->perl); | |
873
f92ad15c2db1
fix segfaults in future workers those will use old configuration,
Igor Sysoev <igor@sysoev.ru>
parents:
872
diff
changeset
|
941 PERL_SET_CONTEXT(pmcf->perl); |
599 | 942 |
943 ngx_http_perl_eval_anon_sub(aTHX_ &value[1], &plcf->sub); | |
944 | |
945 if (plcf->sub == &PL_sv_undef) { | |
946 ngx_conf_log_error(NGX_LOG_ERR, cf, 0, | |
947 "eval_pv(\"%V\") failed", &value[1]); | |
948 return NGX_CONF_ERROR; | |
949 } | |
950 | |
951 if (plcf->sub == NULL) { | |
952 plcf->sub = newSVpvn((char *) value[1].data, value[1].len); | |
953 } | |
954 | |
955 } | |
956 | |
957 clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module); | |
958 clcf->handler = ngx_http_perl_handler; | |
959 | |
960 return NGX_CONF_OK; | |
961 } | |
962 | |
963 | |
964 static char * | |
965 ngx_http_perl_set(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) | |
966 { | |
967 ngx_int_t index; | |
968 ngx_str_t *value; | |
969 ngx_http_variable_t *v; | |
970 ngx_http_perl_variable_t *pv; | |
971 ngx_http_perl_main_conf_t *pmcf; | |
972 | |
973 value = cf->args->elts; | |
974 | |
975 if (value[1].data[0] != '$') { | |
976 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
977 "invalid variable name \"%V\"", &value[1]); | |
978 return NGX_CONF_ERROR; | |
979 } | |
980 | |
981 value[1].len--; | |
982 value[1].data++; | |
983 | |
1565 | 984 v = ngx_http_add_variable(cf, &value[1], NGX_HTTP_VAR_CHANGEABLE); |
599 | 985 if (v == NULL) { |
986 return NGX_CONF_ERROR; | |
987 } | |
988 | |
989 pv = ngx_palloc(cf->pool, sizeof(ngx_http_perl_variable_t)); | |
990 if (pv == NULL) { | |
991 return NGX_CONF_ERROR; | |
992 } | |
993 | |
994 index = ngx_http_get_variable_index(cf, &value[1]); | |
995 if (index == NGX_ERROR) { | |
996 return NGX_CONF_ERROR; | |
997 } | |
998 | |
999 pmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_perl_module); | |
1000 | |
1001 if (pmcf->perl == NULL) { | |
1002 if (ngx_http_perl_init_interpreter(cf, pmcf) != NGX_CONF_OK) { | |
1003 return NGX_CONF_ERROR; | |
1004 } | |
1005 } | |
1006 | |
1007 pv->handler = value[2]; | |
1008 | |
1009 { | |
1010 | |
1011 dTHXa(pmcf->perl); | |
873
f92ad15c2db1
fix segfaults in future workers those will use old configuration,
Igor Sysoev <igor@sysoev.ru>
parents:
872
diff
changeset
|
1012 PERL_SET_CONTEXT(pmcf->perl); |
599 | 1013 |
1014 ngx_http_perl_eval_anon_sub(aTHX_ &value[2], &pv->sub); | |
1015 | |
1016 if (pv->sub == &PL_sv_undef) { | |
1017 ngx_conf_log_error(NGX_LOG_ERR, cf, 0, | |
1018 "eval_pv(\"%V\") failed", &value[2]); | |
1019 return NGX_CONF_ERROR; | |
1020 } | |
1021 | |
1022 if (pv->sub == NULL) { | |
1023 pv->sub = newSVpvn((char *) value[2].data, value[2].len); | |
1024 } | |
1025 | |
1026 } | |
1027 | |
637 | 1028 v->get_handler = ngx_http_perl_variable; |
599 | 1029 v->data = (uintptr_t) pv; |
1030 | |
1031 return NGX_CONF_OK; | |
1032 } | |
1221
aa653367028e
PERL_SYS_TERM() should be called once on exit only, this fixes the message
Igor Sysoev <igor@sysoev.ru>
parents:
1165
diff
changeset
|
1033 |
aa653367028e
PERL_SYS_TERM() should be called once on exit only, this fixes the message
Igor Sysoev <igor@sysoev.ru>
parents:
1165
diff
changeset
|
1034 |
1257 | 1035 static ngx_int_t |
1036 ngx_http_perl_init_worker(ngx_cycle_t *cycle) | |
1037 { | |
1258
5076d97b9cf0
fix building on threaded or multiplicity interpreter perl,
Igor Sysoev <igor@sysoev.ru>
parents:
1257
diff
changeset
|
1038 ngx_http_perl_main_conf_t *pmcf; |
5076d97b9cf0
fix building on threaded or multiplicity interpreter perl,
Igor Sysoev <igor@sysoev.ru>
parents:
1257
diff
changeset
|
1039 |
5076d97b9cf0
fix building on threaded or multiplicity interpreter perl,
Igor Sysoev <igor@sysoev.ru>
parents:
1257
diff
changeset
|
1040 pmcf = ngx_http_cycle_get_module_main_conf(cycle, ngx_http_perl_module); |
5076d97b9cf0
fix building on threaded or multiplicity interpreter perl,
Igor Sysoev <igor@sysoev.ru>
parents:
1257
diff
changeset
|
1041 |
2713
b4d8aef4a1ad
fix segfault if no http section is defined in confguraiton,
Igor Sysoev <igor@sysoev.ru>
parents:
2388
diff
changeset
|
1042 if (pmcf) { |
b4d8aef4a1ad
fix segfault if no http section is defined in confguraiton,
Igor Sysoev <igor@sysoev.ru>
parents:
2388
diff
changeset
|
1043 dTHXa(pmcf->perl); |
b4d8aef4a1ad
fix segfault if no http section is defined in confguraiton,
Igor Sysoev <igor@sysoev.ru>
parents:
2388
diff
changeset
|
1044 PERL_SET_CONTEXT(pmcf->perl); |
1258
5076d97b9cf0
fix building on threaded or multiplicity interpreter perl,
Igor Sysoev <igor@sysoev.ru>
parents:
1257
diff
changeset
|
1045 |
2713
b4d8aef4a1ad
fix segfault if no http section is defined in confguraiton,
Igor Sysoev <igor@sysoev.ru>
parents:
2388
diff
changeset
|
1046 /* set worker's $$ */ |
1257 | 1047 |
2713
b4d8aef4a1ad
fix segfault if no http section is defined in confguraiton,
Igor Sysoev <igor@sysoev.ru>
parents:
2388
diff
changeset
|
1048 sv_setiv(GvSV(gv_fetchpv("$", TRUE, SVt_PV)), (I32) ngx_pid); |
1258
5076d97b9cf0
fix building on threaded or multiplicity interpreter perl,
Igor Sysoev <igor@sysoev.ru>
parents:
1257
diff
changeset
|
1049 } |
5076d97b9cf0
fix building on threaded or multiplicity interpreter perl,
Igor Sysoev <igor@sysoev.ru>
parents:
1257
diff
changeset
|
1050 |
1257 | 1051 return NGX_OK; |
1052 } | |
1053 | |
1941 | 1054 |
1221
aa653367028e
PERL_SYS_TERM() should be called once on exit only, this fixes the message
Igor Sysoev <igor@sysoev.ru>
parents:
1165
diff
changeset
|
1055 static void |
aa653367028e
PERL_SYS_TERM() should be called once on exit only, this fixes the message
Igor Sysoev <igor@sysoev.ru>
parents:
1165
diff
changeset
|
1056 ngx_http_perl_exit(ngx_cycle_t *cycle) |
aa653367028e
PERL_SYS_TERM() should be called once on exit only, this fixes the message
Igor Sysoev <igor@sysoev.ru>
parents:
1165
diff
changeset
|
1057 { |
2715 | 1058 #if (NGX_HAVE_PERL_MULTIPLICITY) |
1059 | |
3442 | 1060 /* |
1061 * the master exit hook is run before global pool cleanup, | |
1062 * therefore just set flag here | |
1063 */ | |
1064 | |
2715 | 1065 ngx_perl_term = 1; |
1066 | |
1067 #else | |
1946
171a283af56b
some perl builds require my_perl for PERL_SYS_TERM()
Igor Sysoev <igor@sysoev.ru>
parents:
1941
diff
changeset
|
1068 |
3442 | 1069 if (nginx_stash) { |
2715 | 1070 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, cycle->log, 0, "perl term"); |
1071 | |
3442 | 1072 (void) perl_destruct(perl); |
2715 | 1073 |
3442 | 1074 perl_free(perl); |
1946
171a283af56b
some perl builds require my_perl for PERL_SYS_TERM()
Igor Sysoev <igor@sysoev.ru>
parents:
1941
diff
changeset
|
1075 |
2714
4dd1773990db
fix segfault on exit if no http section is defined in confguraiton,
Igor Sysoev <igor@sysoev.ru>
parents:
2713
diff
changeset
|
1076 PERL_SYS_TERM(); |
1946
171a283af56b
some perl builds require my_perl for PERL_SYS_TERM()
Igor Sysoev <igor@sysoev.ru>
parents:
1941
diff
changeset
|
1077 } |
2715 | 1078 |
1079 #endif | |
1221
aa653367028e
PERL_SYS_TERM() should be called once on exit only, this fixes the message
Igor Sysoev <igor@sysoev.ru>
parents:
1165
diff
changeset
|
1080 } |