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