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