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