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