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