Mercurial > hg > nginx
annotate src/http/modules/perl/nginx.xs @ 7524:deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
This ensures that correct ctx is always available, including after
filter finalization. In particular, this fixes a segmentation fault
with the following configuration:
location / {
image_filter test;
perl 'sub {
my $r = shift;
$r->send_http_header();
$r->print("foo\n");
$r->print("bar\n");
}';
}
This also seems to be the only way to correctly handle filter finalization
in various complex cases, for example, when embedded perl is used both
in the original handler and in an error page called after filter
finalization.
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Fri, 12 Jul 2019 11:29:22 +0300 |
| parents | 36c52a0f6ded |
| children | 575480d3fd01 |
| rev | line source |
|---|---|
| 599 | 1 |
| 2 /* | |
| 3 * Copyright (C) Igor Sysoev | |
| 4412 | 4 * Copyright (C) Nginx, Inc. |
| 599 | 5 */ |
| 6 | |
| 7 | |
|
882
26c3e48b9996
the PERL_NO_GET_CONTEXT is actually required, see perlguts
Igor Sysoev <igor@sysoev.ru>
parents:
869
diff
changeset
|
8 #define PERL_NO_GET_CONTEXT |
|
26c3e48b9996
the PERL_NO_GET_CONTEXT is actually required, see perlguts
Igor Sysoev <igor@sysoev.ru>
parents:
869
diff
changeset
|
9 |
| 599 | 10 #include <ngx_config.h> |
| 11 #include <ngx_core.h> | |
| 12 #include <ngx_http.h> | |
| 13 #include <ngx_http_perl_module.h> | |
| 14 | |
| 603 | 15 #include "XSUB.h" |
| 16 | |
|
1739
5b7baef2e11e
copy return values to perl's allocated memory
Igor Sysoev <igor@sysoev.ru>
parents:
1703
diff
changeset
|
17 |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
18 #define ngx_http_perl_set_request(r, ctx) \ |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
19 \ |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
20 ctx = INT2PTR(ngx_http_perl_ctx_t *, SvIV((SV *) SvRV(ST(0)))); \ |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
21 r = ctx->request |
| 633 | 22 |
| 23 | |
|
1739
5b7baef2e11e
copy return values to perl's allocated memory
Igor Sysoev <igor@sysoev.ru>
parents:
1703
diff
changeset
|
24 #define ngx_http_perl_set_targ(p, len) \ |
| 633 | 25 \ |
|
1739
5b7baef2e11e
copy return values to perl's allocated memory
Igor Sysoev <igor@sysoev.ru>
parents:
1703
diff
changeset
|
26 SvUPGRADE(TARG, SVt_PV); \ |
| 633 | 27 SvPOK_on(TARG); \ |
|
1739
5b7baef2e11e
copy return values to perl's allocated memory
Igor Sysoev <igor@sysoev.ru>
parents:
1703
diff
changeset
|
28 sv_setpvn(TARG, (char *) p, len) |
| 633 | 29 |
| 599 | 30 |
| 31 static ngx_int_t | |
| 32 ngx_http_perl_sv2str(pTHX_ ngx_http_request_t *r, ngx_str_t *s, SV *sv) | |
| 33 { | |
| 34 u_char *p; | |
| 35 STRLEN len; | |
| 36 | |
| 37 if (SvROK(sv) && SvTYPE(SvRV(sv)) == SVt_PV) { | |
| 38 sv = SvRV(sv); | |
| 39 } | |
| 40 | |
| 41 p = (u_char *) SvPV(sv, len); | |
| 42 | |
| 43 s->len = len; | |
| 44 | |
|
1703
43747661804d
*) copy regex captures $1, $2, etc.
Igor Sysoev <igor@sysoev.ru>
parents:
1565
diff
changeset
|
45 if (SvREADONLY(sv) && SvPOK(sv)) { |
| 599 | 46 s->data = p; |
|
1703
43747661804d
*) copy regex captures $1, $2, etc.
Igor Sysoev <igor@sysoev.ru>
parents:
1565
diff
changeset
|
47 |
|
43747661804d
*) copy regex captures $1, $2, etc.
Igor Sysoev <igor@sysoev.ru>
parents:
1565
diff
changeset
|
48 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
|
43747661804d
*) copy regex captures $1, $2, etc.
Igor Sysoev <igor@sysoev.ru>
parents:
1565
diff
changeset
|
49 "perl sv2str: %08XD \"%V\"", sv->sv_flags, s); |
|
43747661804d
*) copy regex captures $1, $2, etc.
Igor Sysoev <igor@sysoev.ru>
parents:
1565
diff
changeset
|
50 |
| 599 | 51 return NGX_OK; |
| 52 } | |
| 53 | |
| 2049 | 54 s->data = ngx_pnalloc(r->pool, len); |
| 599 | 55 if (s->data == NULL) { |
| 56 return NGX_ERROR; | |
| 57 } | |
| 58 | |
| 59 ngx_memcpy(s->data, p, len); | |
| 60 | |
|
1703
43747661804d
*) copy regex captures $1, $2, etc.
Igor Sysoev <igor@sysoev.ru>
parents:
1565
diff
changeset
|
61 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
|
43747661804d
*) copy regex captures $1, $2, etc.
Igor Sysoev <igor@sysoev.ru>
parents:
1565
diff
changeset
|
62 "perl sv2str: %08XD \"%V\"", sv->sv_flags, s); |
|
43747661804d
*) copy regex captures $1, $2, etc.
Igor Sysoev <igor@sysoev.ru>
parents:
1565
diff
changeset
|
63 |
| 599 | 64 return NGX_OK; |
| 65 } | |
| 66 | |
| 67 | |
| 68 static ngx_int_t | |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
69 ngx_http_perl_output(ngx_http_request_t *r, ngx_http_perl_ctx_t *ctx, |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
70 ngx_buf_t *b) |
| 599 | 71 { |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
72 ngx_chain_t out; |
| 617 | 73 #if (NGX_HTTP_SSI) |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
74 ngx_chain_t *cl; |
| 599 | 75 |
| 76 if (ctx->ssi) { | |
| 77 cl = ngx_alloc_chain_link(r->pool); | |
| 78 if (cl == NULL) { | |
| 79 return NGX_ERROR; | |
| 80 } | |
| 81 | |
| 82 cl->buf = b; | |
| 83 cl->next = NULL; | |
| 84 *ctx->ssi->last_out = cl; | |
| 85 ctx->ssi->last_out = &cl->next; | |
| 86 | |
| 87 return NGX_OK; | |
| 88 } | |
| 617 | 89 #endif |
| 599 | 90 |
| 91 out.buf = b; | |
| 92 out.next = NULL; | |
| 93 | |
| 94 return ngx_http_output_filter(r, &out); | |
| 95 } | |
| 96 | |
| 97 | |
| 98 MODULE = nginx PACKAGE = nginx | |
| 99 | |
| 100 | |
|
6233
c6cc0b79a43d
Perl: prototyping behavior explicitly specified.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6232
diff
changeset
|
101 PROTOTYPES: DISABLE |
|
c6cc0b79a43d
Perl: prototyping behavior explicitly specified.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6232
diff
changeset
|
102 |
|
c6cc0b79a43d
Perl: prototyping behavior explicitly specified.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6232
diff
changeset
|
103 |
| 633 | 104 void |
| 915 | 105 status(r, code) |
| 106 CODE: | |
| 107 | |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
108 ngx_http_request_t *r; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
109 ngx_http_perl_ctx_t *ctx; |
| 915 | 110 |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
111 ngx_http_perl_set_request(r, ctx); |
| 915 | 112 |
| 113 r->headers_out.status = SvIV(ST(1)); | |
| 114 | |
| 115 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 116 "perl status: %d", r->headers_out.status); | |
| 117 | |
| 118 XSRETURN_UNDEF; | |
| 119 | |
| 120 | |
| 121 void | |
| 599 | 122 send_http_header(r, ...) |
| 633 | 123 CODE: |
| 599 | 124 |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
125 ngx_http_request_t *r; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
126 ngx_http_perl_ctx_t *ctx; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
127 SV *sv; |
| 599 | 128 |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
129 ngx_http_perl_set_request(r, ctx); |
| 599 | 130 |
| 131 if (r->headers_out.status == 0) { | |
| 132 r->headers_out.status = NGX_HTTP_OK; | |
| 133 } | |
| 134 | |
| 135 if (items != 1) { | |
| 136 sv = ST(1); | |
| 137 | |
| 138 if (ngx_http_perl_sv2str(aTHX_ r, &r->headers_out.content_type, sv) | |
| 139 != NGX_OK) | |
| 140 { | |
| 633 | 141 XSRETURN_EMPTY; |
| 599 | 142 } |
| 143 | |
|
1444
37938e68910b
allow to append charset to the "Content-Type" header
Igor Sysoev <igor@sysoev.ru>
parents:
1372
diff
changeset
|
144 r->headers_out.content_type_len = r->headers_out.content_type.len; |
|
37938e68910b
allow to append charset to the "Content-Type" header
Igor Sysoev <igor@sysoev.ru>
parents:
1372
diff
changeset
|
145 |
| 599 | 146 } else { |
| 673 | 147 if (ngx_http_set_content_type(r) != NGX_OK) { |
| 148 XSRETURN_EMPTY; | |
| 599 | 149 } |
| 150 } | |
| 151 | |
|
7516
36c52a0f6ded
Perl: disabled not_modified filter (ticket #1786).
Maxim Dounin <mdounin@mdounin.ru>
parents:
6986
diff
changeset
|
152 r->disable_not_modified = 1; |
|
36c52a0f6ded
Perl: disabled not_modified filter (ticket #1786).
Maxim Dounin <mdounin@mdounin.ru>
parents:
6986
diff
changeset
|
153 |
| 633 | 154 (void) ngx_http_send_header(r); |
| 599 | 155 |
| 156 | |
| 633 | 157 void |
| 158 header_only(r) | |
| 599 | 159 CODE: |
| 160 | |
| 633 | 161 dXSTARG; |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
162 ngx_http_request_t *r; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
163 ngx_http_perl_ctx_t *ctx; |
| 633 | 164 |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
165 ngx_http_perl_set_request(r, ctx); |
| 599 | 166 |
| 633 | 167 sv_upgrade(TARG, SVt_IV); |
| 168 sv_setiv(TARG, r->header_only); | |
| 599 | 169 |
| 633 | 170 ST(0) = TARG; |
| 599 | 171 |
| 172 | |
| 633 | 173 void |
| 174 uri(r) | |
| 175 CODE: | |
| 176 | |
| 177 dXSTARG; | |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
178 ngx_http_request_t *r; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
179 ngx_http_perl_ctx_t *ctx; |
| 599 | 180 |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
181 ngx_http_perl_set_request(r, ctx); |
|
1739
5b7baef2e11e
copy return values to perl's allocated memory
Igor Sysoev <igor@sysoev.ru>
parents:
1703
diff
changeset
|
182 ngx_http_perl_set_targ(r->uri.data, r->uri.len); |
| 633 | 183 |
| 184 ST(0) = TARG; | |
| 185 | |
| 186 | |
| 187 void | |
| 188 args(r) | |
| 599 | 189 CODE: |
| 190 | |
| 633 | 191 dXSTARG; |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
192 ngx_http_request_t *r; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
193 ngx_http_perl_ctx_t *ctx; |
| 599 | 194 |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
195 ngx_http_perl_set_request(r, ctx); |
|
1739
5b7baef2e11e
copy return values to perl's allocated memory
Igor Sysoev <igor@sysoev.ru>
parents:
1703
diff
changeset
|
196 ngx_http_perl_set_targ(r->args.data, r->args.len); |
| 599 | 197 |
| 633 | 198 ST(0) = TARG; |
| 599 | 199 |
| 200 | |
| 633 | 201 void |
| 629 | 202 request_method(r) |
| 633 | 203 CODE: |
| 204 | |
| 205 dXSTARG; | |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
206 ngx_http_request_t *r; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
207 ngx_http_perl_ctx_t *ctx; |
| 629 | 208 |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
209 ngx_http_perl_set_request(r, ctx); |
|
1739
5b7baef2e11e
copy return values to perl's allocated memory
Igor Sysoev <igor@sysoev.ru>
parents:
1703
diff
changeset
|
210 ngx_http_perl_set_targ(r->method_name.data, r->method_name.len); |
| 633 | 211 |
| 212 ST(0) = TARG; | |
| 213 | |
| 214 | |
| 215 void | |
| 216 remote_addr(r) | |
| 629 | 217 CODE: |
| 218 | |
| 633 | 219 dXSTARG; |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
220 ngx_http_request_t *r; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
221 ngx_http_perl_ctx_t *ctx; |
| 629 | 222 |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
223 ngx_http_perl_set_request(r, ctx); |
| 633 | 224 ngx_http_perl_set_targ(r->connection->addr_text.data, |
|
1739
5b7baef2e11e
copy return values to perl's allocated memory
Igor Sysoev <igor@sysoev.ru>
parents:
1703
diff
changeset
|
225 r->connection->addr_text.len); |
| 629 | 226 |
| 633 | 227 ST(0) = TARG; |
| 629 | 228 |
| 229 | |
| 633 | 230 void |
| 231 header_in(r, key) | |
| 629 | 232 CODE: |
| 233 | |
| 633 | 234 dXSTARG; |
| 667 | 235 ngx_http_request_t *r; |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
236 ngx_http_perl_ctx_t *ctx; |
| 667 | 237 SV *key; |
|
5248
f5626ab8cb87
Perl: fixed r->header_in("Cookie") (ticket #351).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5198
diff
changeset
|
238 u_char *p, *lowcase_key, *value, sep; |
| 667 | 239 STRLEN len; |
| 240 ssize_t size; | |
| 241 ngx_uint_t i, n, hash; | |
|
5248
f5626ab8cb87
Perl: fixed r->header_in("Cookie") (ticket #351).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5198
diff
changeset
|
242 ngx_array_t *a; |
| 667 | 243 ngx_list_part_t *part; |
| 244 ngx_table_elt_t *h, **ph; | |
| 245 ngx_http_header_t *hh; | |
| 246 ngx_http_core_main_conf_t *cmcf; | |
| 629 | 247 |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
248 ngx_http_perl_set_request(r, ctx); |
| 599 | 249 |
| 633 | 250 key = ST(1); |
| 599 | 251 |
| 252 if (SvROK(key) && SvTYPE(SvRV(key)) == SVt_PV) { | |
| 253 key = SvRV(key); | |
| 254 } | |
| 255 | |
| 256 p = (u_char *) SvPV(key, len); | |
| 257 | |
| 667 | 258 /* look up hashed headers */ |
| 259 | |
| 2049 | 260 lowcase_key = ngx_pnalloc(r->pool, len); |
| 667 | 261 if (lowcase_key == NULL) { |
| 262 XSRETURN_UNDEF; | |
| 263 } | |
| 264 | |
| 2136 | 265 hash = ngx_hash_strlow(lowcase_key, p, len); |
| 667 | 266 |
| 267 cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module); | |
| 268 | |
| 269 hh = ngx_hash_find(&cmcf->headers_in_hash, hash, lowcase_key, len); | |
| 270 | |
| 271 if (hh) { | |
|
5248
f5626ab8cb87
Perl: fixed r->header_in("Cookie") (ticket #351).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5198
diff
changeset
|
272 |
|
f5626ab8cb87
Perl: fixed r->header_in("Cookie") (ticket #351).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5198
diff
changeset
|
273 if (hh->offset == offsetof(ngx_http_headers_in_t, cookies)) { |
|
f5626ab8cb87
Perl: fixed r->header_in("Cookie") (ticket #351).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5198
diff
changeset
|
274 sep = ';'; |
|
f5626ab8cb87
Perl: fixed r->header_in("Cookie") (ticket #351).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5198
diff
changeset
|
275 goto multi; |
|
f5626ab8cb87
Perl: fixed r->header_in("Cookie") (ticket #351).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5198
diff
changeset
|
276 } |
|
5306
43900b822890
Perl: fixed syntax usage for C preprocessor directives.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5248
diff
changeset
|
277 #if (NGX_HTTP_X_FORWARDED_FOR) |
|
5248
f5626ab8cb87
Perl: fixed r->header_in("Cookie") (ticket #351).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5198
diff
changeset
|
278 if (hh->offset == offsetof(ngx_http_headers_in_t, x_forwarded_for)) { |
|
f5626ab8cb87
Perl: fixed r->header_in("Cookie") (ticket #351).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5198
diff
changeset
|
279 sep = ','; |
|
f5626ab8cb87
Perl: fixed r->header_in("Cookie") (ticket #351).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5198
diff
changeset
|
280 goto multi; |
|
f5626ab8cb87
Perl: fixed r->header_in("Cookie") (ticket #351).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5198
diff
changeset
|
281 } |
|
5306
43900b822890
Perl: fixed syntax usage for C preprocessor directives.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5248
diff
changeset
|
282 #endif |
|
5248
f5626ab8cb87
Perl: fixed r->header_in("Cookie") (ticket #351).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5198
diff
changeset
|
283 |
|
6232
5f2a0739da19
Perl: fixed warning about "sep" may be used uninitialized.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5306
diff
changeset
|
284 ph = (ngx_table_elt_t **) ((char *) &r->headers_in + hh->offset); |
| 667 | 285 |
|
6232
5f2a0739da19
Perl: fixed warning about "sep" may be used uninitialized.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5306
diff
changeset
|
286 if (*ph) { |
|
5f2a0739da19
Perl: fixed warning about "sep" may be used uninitialized.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5306
diff
changeset
|
287 ngx_http_perl_set_targ((*ph)->value.data, (*ph)->value.len); |
| 667 | 288 |
|
6232
5f2a0739da19
Perl: fixed warning about "sep" may be used uninitialized.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5306
diff
changeset
|
289 goto done; |
|
5f2a0739da19
Perl: fixed warning about "sep" may be used uninitialized.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5306
diff
changeset
|
290 } |
| 667 | 291 |
|
6232
5f2a0739da19
Perl: fixed warning about "sep" may be used uninitialized.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5306
diff
changeset
|
292 XSRETURN_UNDEF; |
| 667 | 293 |
|
5248
f5626ab8cb87
Perl: fixed r->header_in("Cookie") (ticket #351).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5198
diff
changeset
|
294 multi: |
|
f5626ab8cb87
Perl: fixed r->header_in("Cookie") (ticket #351).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5198
diff
changeset
|
295 |
|
f5626ab8cb87
Perl: fixed r->header_in("Cookie") (ticket #351).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5198
diff
changeset
|
296 /* Cookie, X-Forwarded-For */ |
| 667 | 297 |
|
5248
f5626ab8cb87
Perl: fixed r->header_in("Cookie") (ticket #351).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5198
diff
changeset
|
298 a = (ngx_array_t *) ((char *) &r->headers_in + hh->offset); |
|
f5626ab8cb87
Perl: fixed r->header_in("Cookie") (ticket #351).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5198
diff
changeset
|
299 |
|
f5626ab8cb87
Perl: fixed r->header_in("Cookie") (ticket #351).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5198
diff
changeset
|
300 n = a->nelts; |
| 667 | 301 |
| 302 if (n == 0) { | |
| 303 XSRETURN_UNDEF; | |
| 304 } | |
| 305 | |
|
5248
f5626ab8cb87
Perl: fixed r->header_in("Cookie") (ticket #351).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5198
diff
changeset
|
306 ph = a->elts; |
| 667 | 307 |
| 308 if (n == 1) { | |
|
1739
5b7baef2e11e
copy return values to perl's allocated memory
Igor Sysoev <igor@sysoev.ru>
parents:
1703
diff
changeset
|
309 ngx_http_perl_set_targ((*ph)->value.data, (*ph)->value.len); |
| 667 | 310 |
| 311 goto done; | |
| 312 } | |
| 313 | |
| 314 size = - (ssize_t) (sizeof("; ") - 1); | |
| 315 | |
| 316 for (i = 0; i < n; i++) { | |
| 317 size += ph[i]->value.len + sizeof("; ") - 1; | |
| 318 } | |
| 319 | |
|
5248
f5626ab8cb87
Perl: fixed r->header_in("Cookie") (ticket #351).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5198
diff
changeset
|
320 value = ngx_pnalloc(r->pool, size); |
|
f5626ab8cb87
Perl: fixed r->header_in("Cookie") (ticket #351).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5198
diff
changeset
|
321 if (value == NULL) { |
| 667 | 322 XSRETURN_UNDEF; |
| 323 } | |
| 324 | |
|
5248
f5626ab8cb87
Perl: fixed r->header_in("Cookie") (ticket #351).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5198
diff
changeset
|
325 p = value; |
| 667 | 326 |
| 327 for (i = 0; /* void */ ; i++) { | |
| 328 p = ngx_copy(p, ph[i]->value.data, ph[i]->value.len); | |
| 329 | |
| 330 if (i == n - 1) { | |
| 331 break; | |
| 332 } | |
| 333 | |
|
5248
f5626ab8cb87
Perl: fixed r->header_in("Cookie") (ticket #351).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5198
diff
changeset
|
334 *p++ = sep; *p++ = ' '; |
| 667 | 335 } |
| 336 | |
|
5248
f5626ab8cb87
Perl: fixed r->header_in("Cookie") (ticket #351).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5198
diff
changeset
|
337 ngx_http_perl_set_targ(value, size); |
| 667 | 338 |
| 339 goto done; | |
| 340 } | |
| 341 | |
| 342 /* iterate over all headers */ | |
| 343 | |
| 599 | 344 part = &r->headers_in.headers.part; |
| 667 | 345 h = part->elts; |
| 599 | 346 |
| 347 for (i = 0; /* void */ ; i++) { | |
| 348 | |
| 349 if (i >= part->nelts) { | |
| 350 if (part->next == NULL) { | |
| 351 break; | |
| 352 } | |
| 353 | |
| 354 part = part->next; | |
| 667 | 355 h = part->elts; |
| 599 | 356 i = 0; |
| 357 } | |
| 358 | |
| 667 | 359 if (len != h[i].key.len |
| 360 || ngx_strcasecmp(p, h[i].key.data) != 0) | |
| 599 | 361 { |
| 362 continue; | |
| 363 } | |
| 364 | |
|
1739
5b7baef2e11e
copy return values to perl's allocated memory
Igor Sysoev <igor@sysoev.ru>
parents:
1703
diff
changeset
|
365 ngx_http_perl_set_targ(h[i].value.data, h[i].value.len); |
| 599 | 366 |
| 367 goto done; | |
| 368 } | |
| 369 | |
| 370 XSRETURN_UNDEF; | |
| 371 | |
| 372 done: | |
| 373 | |
| 633 | 374 ST(0) = TARG; |
| 599 | 375 |
| 376 | |
| 633 | 377 void |
| 681 | 378 has_request_body(r, next) |
| 379 CODE: | |
| 380 | |
| 381 dXSTARG; | |
| 382 ngx_http_request_t *r; | |
| 383 ngx_http_perl_ctx_t *ctx; | |
| 384 | |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
385 ngx_http_perl_set_request(r, ctx); |
| 681 | 386 |
|
5181
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
387 if (r->headers_in.content_length_n <= 0 && !r->headers_in.chunked) { |
| 681 | 388 XSRETURN_UNDEF; |
| 389 } | |
| 390 | |
| 909 | 391 ctx->next = SvRV(ST(1)); |
| 681 | 392 |
| 393 r->request_body_in_single_buf = 1; | |
| 394 r->request_body_in_persistent_file = 1; | |
|
1075
4d203f76b757
undo "client_body_in_file_only any"
Igor Sysoev <igor@sysoev.ru>
parents:
1056
diff
changeset
|
395 r->request_body_in_clean_file = 1; |
| 681 | 396 |
| 397 if (r->request_body_in_file_only) { | |
| 398 r->request_body_file_log_level = 0; | |
| 399 } | |
| 400 | |
| 401 ngx_http_read_client_request_body(r, ngx_http_perl_handle_request); | |
| 402 | |
| 403 sv_upgrade(TARG, SVt_IV); | |
| 404 sv_setiv(TARG, 1); | |
| 405 | |
| 406 ST(0) = TARG; | |
| 407 | |
| 408 | |
| 409 void | |
| 631 | 410 request_body(r) |
| 411 CODE: | |
| 412 | |
| 633 | 413 dXSTARG; |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
414 ngx_http_request_t *r; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
415 ngx_http_perl_ctx_t *ctx; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
416 u_char *p, *data; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
417 size_t len; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
418 ngx_buf_t *buf; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
419 ngx_chain_t *cl; |
| 633 | 420 |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
421 ngx_http_perl_set_request(r, ctx); |
| 631 | 422 |
| 941 | 423 if (r->request_body == NULL |
| 424 || r->request_body->temp_file | |
| 425 || r->request_body->bufs == NULL) | |
| 426 { | |
| 633 | 427 XSRETURN_UNDEF; |
| 428 } | |
| 631 | 429 |
|
5181
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
430 cl = r->request_body->bufs; |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
431 buf = cl->buf; |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
432 |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
433 if (cl->next == NULL) { |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
434 len = buf->last - buf->pos; |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
435 data = buf->pos; |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
436 goto done; |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
437 } |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
438 |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
439 len = buf->last - buf->pos; |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
440 cl = cl->next; |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
441 |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
442 for ( /* void */ ; cl; cl = cl->next) { |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
443 buf = cl->buf; |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
444 len += buf->last - buf->pos; |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
445 } |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
446 |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
447 p = ngx_pnalloc(r->pool, len); |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
448 if (p == NULL) { |
|
5198
e530b88b088b
Perl: extra "return" removed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5181
diff
changeset
|
449 XSRETURN_UNDEF; |
|
5181
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
450 } |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
451 |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
452 data = p; |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
453 cl = r->request_body->bufs; |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
454 |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
455 for ( /* void */ ; cl; cl = cl->next) { |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
456 buf = cl->buf; |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
457 p = ngx_cpymem(p, buf->pos, buf->last - buf->pos); |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
458 } |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
459 |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
460 done: |
| 631 | 461 |
| 462 if (len == 0) { | |
| 463 XSRETURN_UNDEF; | |
| 464 } | |
| 465 | |
|
5181
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
466 ngx_http_perl_set_targ(data, len); |
| 631 | 467 |
| 633 | 468 ST(0) = TARG; |
| 631 | 469 |
| 470 | |
| 633 | 471 void |
| 472 request_body_file(r) | |
| 473 CODE: | |
| 474 | |
| 475 dXSTARG; | |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
476 ngx_http_request_t *r; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
477 ngx_http_perl_ctx_t *ctx; |
| 633 | 478 |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
479 ngx_http_perl_set_request(r, ctx); |
| 633 | 480 |
| 941 | 481 if (r->request_body == NULL || r->request_body->temp_file == NULL) { |
| 633 | 482 XSRETURN_UNDEF; |
| 483 } | |
| 484 | |
| 485 ngx_http_perl_set_targ(r->request_body->temp_file->file.name.data, | |
|
1739
5b7baef2e11e
copy return values to perl's allocated memory
Igor Sysoev <igor@sysoev.ru>
parents:
1703
diff
changeset
|
486 r->request_body->temp_file->file.name.len); |
| 599 | 487 |
| 633 | 488 ST(0) = TARG; |
| 489 | |
| 490 | |
| 491 void | |
| 1371 | 492 discard_request_body(r) |
| 493 CODE: | |
| 494 | |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
495 ngx_http_request_t *r; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
496 ngx_http_perl_ctx_t *ctx; |
| 1371 | 497 |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
498 ngx_http_perl_set_request(r, ctx); |
| 1371 | 499 |
| 500 ngx_http_discard_request_body(r); | |
| 501 | |
| 502 | |
| 503 void | |
| 633 | 504 header_out(r, key, value) |
| 505 CODE: | |
| 599 | 506 |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
507 ngx_http_request_t *r; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
508 ngx_http_perl_ctx_t *ctx; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
509 SV *key; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
510 SV *value; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
511 ngx_table_elt_t *header; |
| 599 | 512 |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
513 ngx_http_perl_set_request(r, ctx); |
| 633 | 514 |
| 515 key = ST(1); | |
| 516 value = ST(2); | |
| 599 | 517 |
| 518 header = ngx_list_push(&r->headers_out.headers); | |
| 519 if (header == NULL) { | |
| 633 | 520 XSRETURN_EMPTY; |
| 599 | 521 } |
| 522 | |
| 523 header->hash = 1; | |
| 524 | |
| 525 if (ngx_http_perl_sv2str(aTHX_ r, &header->key, key) != NGX_OK) { | |
|
6986
0cdee26605f3
Cleaned up r->headers_out.headers allocation error handling.
Sergey Kandaurov <pluknet@nginx.com>
parents:
6960
diff
changeset
|
526 header->hash = 0; |
| 633 | 527 XSRETURN_EMPTY; |
| 599 | 528 } |
| 529 | |
| 530 if (ngx_http_perl_sv2str(aTHX_ r, &header->value, value) != NGX_OK) { | |
|
6986
0cdee26605f3
Cleaned up r->headers_out.headers allocation error handling.
Sergey Kandaurov <pluknet@nginx.com>
parents:
6960
diff
changeset
|
531 header->hash = 0; |
| 633 | 532 XSRETURN_EMPTY; |
| 599 | 533 } |
| 534 | |
| 535 if (header->key.len == sizeof("Content-Length") - 1 | |
| 3870 | 536 && ngx_strncasecmp(header->key.data, (u_char *) "Content-Length", |
|
741
63a08390a8a2
$r->headers_out("Content-Length", "NNN") did not work
Igor Sysoev <igor@sysoev.ru>
parents:
681
diff
changeset
|
537 sizeof("Content-Length") - 1) == 0) |
| 599 | 538 { |
|
741
63a08390a8a2
$r->headers_out("Content-Length", "NNN") did not work
Igor Sysoev <igor@sysoev.ru>
parents:
681
diff
changeset
|
539 r->headers_out.content_length_n = (off_t) SvIV(value); |
| 599 | 540 r->headers_out.content_length = header; |
| 541 } | |
| 542 | |
|
4196
190ae1a7f917
Handling of Content-Encoding set from perl.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4188
diff
changeset
|
543 if (header->key.len == sizeof("Content-Encoding") - 1 |
|
4644
95763fce86a8
Fixed warning during nginx.xs compilation.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4494
diff
changeset
|
544 && ngx_strncasecmp(header->key.data, (u_char *) "Content-Encoding", |
|
4196
190ae1a7f917
Handling of Content-Encoding set from perl.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4188
diff
changeset
|
545 sizeof("Content-Encoding") - 1) == 0) |
|
190ae1a7f917
Handling of Content-Encoding set from perl.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4188
diff
changeset
|
546 { |
|
190ae1a7f917
Handling of Content-Encoding set from perl.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4188
diff
changeset
|
547 r->headers_out.content_encoding = header; |
|
190ae1a7f917
Handling of Content-Encoding set from perl.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4188
diff
changeset
|
548 } |
|
190ae1a7f917
Handling of Content-Encoding set from perl.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4188
diff
changeset
|
549 |
| 599 | 550 |
| 633 | 551 void |
| 599 | 552 filename(r) |
| 633 | 553 CODE: |
| 599 | 554 |
| 633 | 555 dXSTARG; |
| 556 ngx_http_request_t *r; | |
| 599 | 557 ngx_http_perl_ctx_t *ctx; |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
558 size_t root; |
| 599 | 559 |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
560 ngx_http_perl_set_request(r, ctx); |
| 599 | 561 |
| 633 | 562 if (ctx->filename.data) { |
| 599 | 563 goto done; |
| 564 } | |
| 565 | |
|
774
589841f06b87
previous commit broke two modules
Igor Sysoev <igor@sysoev.ru>
parents:
741
diff
changeset
|
566 if (ngx_http_map_uri_to_path(r, &ctx->filename, &root, 0) == NULL) { |
| 599 | 567 XSRETURN_UNDEF; |
| 568 } | |
| 569 | |
| 633 | 570 ctx->filename.len--; |
| 571 sv_setpv(PL_statname, (char *) ctx->filename.data); | |
| 599 | 572 |
| 573 done: | |
| 574 | |
|
1739
5b7baef2e11e
copy return values to perl's allocated memory
Igor Sysoev <igor@sysoev.ru>
parents:
1703
diff
changeset
|
575 ngx_http_perl_set_targ(ctx->filename.data, ctx->filename.len); |
| 599 | 576 |
| 633 | 577 ST(0) = TARG; |
| 599 | 578 |
| 579 | |
| 633 | 580 void |
| 599 | 581 print(r, ...) |
| 582 CODE: | |
| 583 | |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
584 ngx_http_request_t *r; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
585 ngx_http_perl_ctx_t *ctx; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
586 SV *sv; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
587 int i; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
588 u_char *p; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
589 size_t size; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
590 STRLEN len; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
591 ngx_buf_t *b; |
| 633 | 592 |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
593 ngx_http_perl_set_request(r, ctx); |
| 599 | 594 |
| 595 if (items == 2) { | |
| 596 | |
| 597 /* | |
| 598 * do zero copy for prolate single read-only SV: | |
| 599 * $r->print("some text\n"); | |
| 600 */ | |
| 601 | |
| 602 sv = ST(1); | |
| 603 | |
| 604 if (SvROK(sv) && SvTYPE(SvRV(sv)) == SVt_PV) { | |
| 605 sv = SvRV(sv); | |
| 606 } | |
| 607 | |
|
1703
43747661804d
*) copy regex captures $1, $2, etc.
Igor Sysoev <igor@sysoev.ru>
parents:
1565
diff
changeset
|
608 if (SvREADONLY(sv) && SvPOK(sv)) { |
| 599 | 609 |
| 610 p = (u_char *) SvPV(sv, len); | |
| 611 | |
| 612 if (len == 0) { | |
| 633 | 613 XSRETURN_EMPTY; |
| 599 | 614 } |
| 615 | |
| 616 b = ngx_calloc_buf(r->pool); | |
| 617 if (b == NULL) { | |
| 633 | 618 XSRETURN_EMPTY; |
| 599 | 619 } |
| 620 | |
| 621 b->memory = 1; | |
| 622 b->pos = p; | |
| 623 b->last = p + len; | |
| 624 b->start = p; | |
| 625 b->end = b->last; | |
| 626 | |
| 601 | 627 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
| 628 "$r->print: read-only SV: %z", len); | |
| 629 | |
| 599 | 630 goto out; |
| 631 } | |
| 632 } | |
| 633 | |
| 634 size = 0; | |
| 635 | |
| 636 for (i = 1; i < items; i++) { | |
| 637 | |
| 638 sv = ST(i); | |
| 639 | |
| 640 if (SvROK(sv) && SvTYPE(SvRV(sv)) == SVt_PV) { | |
| 641 sv = SvRV(sv); | |
| 642 } | |
| 643 | |
| 601 | 644 (void) SvPV(sv, len); |
| 599 | 645 |
| 601 | 646 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
| 647 "$r->print: copy SV: %z", len); | |
| 599 | 648 |
| 649 size += len; | |
| 650 } | |
| 651 | |
| 652 if (size == 0) { | |
| 633 | 653 XSRETURN_EMPTY; |
| 599 | 654 } |
| 655 | |
| 656 b = ngx_create_temp_buf(r->pool, size); | |
| 657 if (b == NULL) { | |
| 633 | 658 XSRETURN_EMPTY; |
| 599 | 659 } |
| 660 | |
| 661 for (i = 1; i < items; i++) { | |
| 662 sv = ST(i); | |
| 663 | |
| 664 if (SvROK(sv) && SvTYPE(SvRV(sv)) == SVt_PV) { | |
| 665 sv = SvRV(sv); | |
| 666 } | |
| 667 | |
| 668 p = (u_char *) SvPV(sv, len); | |
| 669 b->last = ngx_cpymem(b->last, p, len); | |
| 670 } | |
| 671 | |
| 672 out: | |
| 673 | |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
674 (void) ngx_http_perl_output(r, ctx, b); |
| 599 | 675 |
| 676 | |
| 633 | 677 void |
| 613 | 678 sendfile(r, filename, offset = -1, bytes = 0) |
| 633 | 679 CODE: |
| 680 | |
| 1454 | 681 ngx_http_request_t *r; |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
682 ngx_http_perl_ctx_t *ctx; |
| 1454 | 683 char *filename; |
|
2794
92bd6afe8d9c
use off_t in $r->sendfile(), this allows to use 64-bit off_t on platforms
Igor Sysoev <igor@sysoev.ru>
parents:
2756
diff
changeset
|
684 off_t offset; |
| 1454 | 685 size_t bytes; |
| 686 ngx_str_t path; | |
| 687 ngx_buf_t *b; | |
| 688 ngx_open_file_info_t of; | |
| 689 ngx_http_core_loc_conf_t *clcf; | |
| 599 | 690 |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
691 ngx_http_perl_set_request(r, ctx); |
| 633 | 692 |
| 693 filename = SvPV_nolen(ST(1)); | |
| 599 | 694 |
| 695 if (filename == NULL) { | |
| 696 croak("sendfile(): NULL filename"); | |
| 697 } | |
| 698 | |
| 633 | 699 offset = items < 3 ? -1 : SvIV(ST(2)); |
| 700 bytes = items < 4 ? 0 : SvIV(ST(3)); | |
| 701 | |
| 599 | 702 b = ngx_calloc_buf(r->pool); |
| 703 if (b == NULL) { | |
| 633 | 704 XSRETURN_EMPTY; |
| 599 | 705 } |
| 706 | |
| 707 b->file = ngx_pcalloc(r->pool, sizeof(ngx_file_t)); | |
| 708 if (b->file == NULL) { | |
| 633 | 709 XSRETURN_EMPTY; |
| 599 | 710 } |
| 711 | |
| 1454 | 712 path.len = ngx_strlen(filename); |
| 713 | |
|
2061
b0a1c84725cf
change useless ngx_pcalloc() to ngx_pnalloc()
Igor Sysoev <igor@sysoev.ru>
parents:
2049
diff
changeset
|
714 path.data = ngx_pnalloc(r->pool, path.len + 1); |
| 1454 | 715 if (path.data == NULL) { |
| 633 | 716 XSRETURN_EMPTY; |
| 599 | 717 } |
| 718 | |
| 3870 | 719 (void) ngx_cpystrn(path.data, (u_char *) filename, path.len + 1); |
|
1560
25ee6eee7573
style fix: remove trailing spaces
Igor Sysoev <igor@sysoev.ru>
parents:
1457
diff
changeset
|
720 |
|
2063
67a29af877ed
initialize of.uniq in ngx_open_cached_file()
Igor Sysoev <igor@sysoev.ru>
parents:
2061
diff
changeset
|
721 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); |
|
67a29af877ed
initialize of.uniq in ngx_open_cached_file()
Igor Sysoev <igor@sysoev.ru>
parents:
2061
diff
changeset
|
722 |
|
2068
75a8d34459c5
ngx_memzero() ngx_open_file_info_t
Igor Sysoev <igor@sysoev.ru>
parents:
2063
diff
changeset
|
723 ngx_memzero(&of, sizeof(ngx_open_file_info_t)); |
|
75a8d34459c5
ngx_memzero() ngx_open_file_info_t
Igor Sysoev <igor@sysoev.ru>
parents:
2063
diff
changeset
|
724 |
| 3178 | 725 of.read_ahead = clcf->read_ahead; |
| 2129 | 726 of.directio = clcf->directio; |
|
2063
67a29af877ed
initialize of.uniq in ngx_open_cached_file()
Igor Sysoev <igor@sysoev.ru>
parents:
2061
diff
changeset
|
727 of.valid = clcf->open_file_cache_valid; |
|
67a29af877ed
initialize of.uniq in ngx_open_cached_file()
Igor Sysoev <igor@sysoev.ru>
parents:
2061
diff
changeset
|
728 of.min_uses = clcf->open_file_cache_min_uses; |
|
67a29af877ed
initialize of.uniq in ngx_open_cached_file()
Igor Sysoev <igor@sysoev.ru>
parents:
2061
diff
changeset
|
729 of.errors = clcf->open_file_cache_errors; |
|
67a29af877ed
initialize of.uniq in ngx_open_cached_file()
Igor Sysoev <igor@sysoev.ru>
parents:
2061
diff
changeset
|
730 of.events = clcf->open_file_cache_events; |
|
4494
13e09cf11d4e
Disable symlinks: initialization of the "disable_symlinks" field in
Valentin Bartenev <vbart@nginx.com>
parents:
4478
diff
changeset
|
731 |
|
13e09cf11d4e
Disable symlinks: initialization of the "disable_symlinks" field in
Valentin Bartenev <vbart@nginx.com>
parents:
4478
diff
changeset
|
732 if (ngx_http_set_disable_symlinks(r, clcf, &path, &of) != NGX_OK) { |
|
13e09cf11d4e
Disable symlinks: initialization of the "disable_symlinks" field in
Valentin Bartenev <vbart@nginx.com>
parents:
4478
diff
changeset
|
733 XSRETURN_EMPTY; |
|
13e09cf11d4e
Disable symlinks: initialization of the "disable_symlinks" field in
Valentin Bartenev <vbart@nginx.com>
parents:
4478
diff
changeset
|
734 } |
|
2063
67a29af877ed
initialize of.uniq in ngx_open_cached_file()
Igor Sysoev <igor@sysoev.ru>
parents:
2061
diff
changeset
|
735 |
| 1799 | 736 if (ngx_open_cached_file(clcf->open_file_cache, &path, &of, r->pool) |
| 737 != NGX_OK) | |
| 738 { | |
| 1454 | 739 if (of.err == 0) { |
| 740 XSRETURN_EMPTY; | |
| 741 } | |
| 742 | |
| 599 | 743 ngx_log_error(NGX_LOG_CRIT, r->connection->log, ngx_errno, |
|
2756
09cab3f8d92e
*) of.test_only to not open file if only stat() is enough
Igor Sysoev <igor@sysoev.ru>
parents:
2231
diff
changeset
|
744 "%s \"%s\" failed", of.failed, filename); |
| 633 | 745 XSRETURN_EMPTY; |
| 599 | 746 } |
| 747 | |
| 613 | 748 if (offset == -1) { |
| 749 offset = 0; | |
| 750 } | |
| 751 | |
| 752 if (bytes == 0) { | |
| 1454 | 753 bytes = of.size - offset; |
| 599 | 754 } |
| 755 | |
| 756 b->in_file = 1; | |
| 613 | 757 |
| 758 b->file_pos = offset; | |
| 759 b->file_last = offset + bytes; | |
| 599 | 760 |
| 1454 | 761 b->file->fd = of.fd; |
| 599 | 762 b->file->log = r->connection->log; |
|
2231
8564129d49b6
*) handle unaligned file part for directio
Igor Sysoev <igor@sysoev.ru>
parents:
2136
diff
changeset
|
763 b->file->directio = of.is_directio; |
| 599 | 764 |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
765 (void) ngx_http_perl_output(r, ctx, b); |
| 599 | 766 |
| 767 | |
| 633 | 768 void |
|
1178
a77f6980de50
rename $r->rflush to $r->flush
Igor Sysoev <igor@sysoev.ru>
parents:
1075
diff
changeset
|
769 flush(r) |
| 633 | 770 CODE: |
| 599 | 771 |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
772 ngx_http_request_t *r; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
773 ngx_http_perl_ctx_t *ctx; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
774 ngx_buf_t *b; |
| 599 | 775 |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
776 ngx_http_perl_set_request(r, ctx); |
| 599 | 777 |
| 778 b = ngx_calloc_buf(r->pool); | |
| 779 if (b == NULL) { | |
| 633 | 780 XSRETURN_EMPTY; |
| 599 | 781 } |
| 782 | |
| 783 b->flush = 1; | |
| 784 | |
|
1178
a77f6980de50
rename $r->rflush to $r->flush
Igor Sysoev <igor@sysoev.ru>
parents:
1075
diff
changeset
|
785 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "$r->flush"); |
| 601 | 786 |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
787 (void) ngx_http_perl_output(r, ctx, b); |
| 599 | 788 |
| 633 | 789 XSRETURN_EMPTY; |
| 599 | 790 |
| 791 | |
| 792 void | |
| 793 internal_redirect(r, uri) | |
| 633 | 794 CODE: |
| 599 | 795 |
| 633 | 796 ngx_http_request_t *r; |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
797 ngx_http_perl_ctx_t *ctx; |
| 633 | 798 SV *uri; |
| 599 | 799 ngx_uint_t i; |
| 800 | |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
801 ngx_http_perl_set_request(r, ctx); |
| 633 | 802 |
| 803 uri = ST(1); | |
| 599 | 804 |
| 805 if (ngx_http_perl_sv2str(aTHX_ r, &ctx->redirect_uri, uri) != NGX_OK) { | |
| 806 XSRETURN_EMPTY; | |
| 807 } | |
| 808 | |
| 809 for (i = 0; i < ctx->redirect_uri.len; i++) { | |
| 810 if (ctx->redirect_uri.data[i] == '?') { | |
| 811 | |
| 812 ctx->redirect_args.len = ctx->redirect_uri.len - (i + 1); | |
| 813 ctx->redirect_args.data = &ctx->redirect_uri.data[i + 1]; | |
| 814 ctx->redirect_uri.len = i; | |
| 815 | |
| 816 XSRETURN_EMPTY; | |
| 817 } | |
| 818 } | |
| 601 | 819 |
| 820 | |
| 633 | 821 void |
| 811 | 822 allow_ranges(r) |
| 823 CODE: | |
| 824 | |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
825 ngx_http_request_t *r; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
826 ngx_http_perl_ctx_t *ctx; |
| 811 | 827 |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
828 ngx_http_perl_set_request(r, ctx); |
| 811 | 829 |
| 830 r->allow_ranges = 1; | |
| 831 | |
| 832 | |
| 833 void | |
| 601 | 834 unescape(r, text, type = 0) |
| 835 CODE: | |
| 836 | |
| 633 | 837 dXSTARG; |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
838 ngx_http_request_t *r; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
839 ngx_http_perl_ctx_t *ctx; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
840 SV *text; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
841 int type; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
842 u_char *p, *dst, *src; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
843 STRLEN len; |
| 601 | 844 |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
845 ngx_http_perl_set_request(r, ctx); |
| 633 | 846 |
| 847 text = ST(1); | |
| 848 | |
| 849 src = (u_char *) SvPV(text, len); | |
| 850 | |
| 2049 | 851 p = ngx_pnalloc(r->pool, len + 1); |
| 601 | 852 if (p == NULL) { |
| 853 XSRETURN_UNDEF; | |
| 854 } | |
| 855 | |
| 856 dst = p; | |
| 857 | |
| 633 | 858 type = items < 3 ? 0 : SvIV(ST(2)); |
| 859 | |
| 860 ngx_unescape_uri(&dst, &src, len, (ngx_uint_t) type); | |
| 601 | 861 *dst = '\0'; |
| 862 | |
|
1739
5b7baef2e11e
copy return values to perl's allocated memory
Igor Sysoev <igor@sysoev.ru>
parents:
1703
diff
changeset
|
863 ngx_http_perl_set_targ(p, dst - p); |
| 601 | 864 |
| 633 | 865 ST(0) = TARG; |
| 833 | 866 |
| 867 | |
| 868 void | |
| 869 variable(r, name, value = NULL) | |
| 870 CODE: | |
| 871 | |
| 872 dXSTARG; | |
| 873 ngx_http_request_t *r; | |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
874 ngx_http_perl_ctx_t *ctx; |
| 833 | 875 SV *name, *value; |
| 876 u_char *p, *lowcase; | |
| 877 STRLEN len; | |
| 878 ngx_str_t var, val; | |
| 879 ngx_uint_t i, hash; | |
|
912
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
880 ngx_http_perl_var_t *v; |
| 833 | 881 ngx_http_variable_value_t *vv; |
| 882 | |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
883 ngx_http_perl_set_request(r, ctx); |
| 833 | 884 |
| 885 name = ST(1); | |
| 886 | |
| 887 if (SvROK(name) && SvTYPE(SvRV(name)) == SVt_PV) { | |
| 888 name = SvRV(name); | |
| 889 } | |
| 890 | |
| 891 if (items == 2) { | |
| 892 value = NULL; | |
| 893 | |
| 894 } else { | |
| 895 value = ST(2); | |
| 896 | |
| 897 if (SvROK(value) && SvTYPE(SvRV(value)) == SVt_PV) { | |
| 898 value = SvRV(value); | |
| 899 } | |
| 900 | |
| 901 if (ngx_http_perl_sv2str(aTHX_ r, &val, value) != NGX_OK) { | |
| 902 XSRETURN_UNDEF; | |
| 903 } | |
| 904 } | |
| 905 | |
| 906 p = (u_char *) SvPV(name, len); | |
| 907 | |
| 2049 | 908 lowcase = ngx_pnalloc(r->pool, len); |
| 833 | 909 if (lowcase == NULL) { |
| 910 XSRETURN_UNDEF; | |
| 911 } | |
| 912 | |
| 2136 | 913 hash = ngx_hash_strlow(lowcase, p, len); |
| 833 | 914 |
| 915 var.len = len; | |
| 916 var.data = lowcase; | |
|
5306
43900b822890
Perl: fixed syntax usage for C preprocessor directives.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5248
diff
changeset
|
917 #if (NGX_DEBUG) |
|
912
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
918 |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
919 if (value) { |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
920 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
921 "perl variable: \"%V\"=\"%V\"", &var, &val); |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
922 } else { |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
923 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
924 "perl variable: \"%V\"", &var); |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
925 } |
|
5306
43900b822890
Perl: fixed syntax usage for C preprocessor directives.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5248
diff
changeset
|
926 #endif |
|
912
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
927 |
|
3500
0eb46e3c5c02
change processing variables accessed by SSI and perl module:
Igor Sysoev <igor@sysoev.ru>
parents:
3447
diff
changeset
|
928 vv = ngx_http_get_variable(r, &var, hash); |
| 833 | 929 if (vv == NULL) { |
| 930 XSRETURN_UNDEF; | |
| 931 } | |
| 932 | |
| 933 if (vv->not_found) { | |
|
912
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
934 |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
935 if (ctx->variables) { |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
936 |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
937 v = ctx->variables->elts; |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
938 for (i = 0; i < ctx->variables->nelts; i++) { |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
939 |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
940 if (hash != v[i].hash |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
941 || len != v[i].name.len |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
942 || ngx_strncmp(lowcase, v[i].name.data, len) != 0) |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
943 { |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
944 continue; |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
945 } |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
946 |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
947 if (value) { |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
948 v[i].value = val; |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
949 XSRETURN_UNDEF; |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
950 } |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
951 |
|
1739
5b7baef2e11e
copy return values to perl's allocated memory
Igor Sysoev <igor@sysoev.ru>
parents:
1703
diff
changeset
|
952 ngx_http_perl_set_targ(v[i].value.data, v[i].value.len); |
|
912
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
953 |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
954 goto done; |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
955 } |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
956 } |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
957 |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
958 if (value) { |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
959 if (ctx->variables == NULL) { |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
960 ctx->variables = ngx_array_create(r->pool, 1, |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
961 sizeof(ngx_http_perl_var_t)); |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
962 if (ctx->variables == NULL) { |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
963 XSRETURN_UNDEF; |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
964 } |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
965 } |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
966 |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
967 v = ngx_array_push(ctx->variables); |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
968 if (v == NULL) { |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
969 XSRETURN_UNDEF; |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
970 } |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
971 |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
972 v->hash = hash; |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
973 v->name.len = len; |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
974 v->name.data = lowcase; |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
975 v->value = val; |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
976 |
| 833 | 977 XSRETURN_UNDEF; |
| 978 } | |
| 979 | |
| 980 XSRETURN_UNDEF; | |
| 981 } | |
| 982 | |
| 983 if (value) { | |
| 984 vv->len = val.len; | |
| 985 vv->valid = 1; | |
| 1565 | 986 vv->no_cacheable = 0; |
| 833 | 987 vv->not_found = 0; |
| 988 vv->data = val.data; | |
| 989 | |
| 990 XSRETURN_UNDEF; | |
| 991 } | |
| 992 | |
|
1739
5b7baef2e11e
copy return values to perl's allocated memory
Igor Sysoev <igor@sysoev.ru>
parents:
1703
diff
changeset
|
993 ngx_http_perl_set_targ(vv->data, vv->len); |
| 833 | 994 |
|
912
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
995 done: |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
996 |
| 833 | 997 ST(0) = TARG; |
| 907 | 998 |
| 999 | |
| 1000 void | |
| 911 | 1001 sleep(r, sleep, next) |
| 1002 CODE: | |
| 1003 | |
| 1004 ngx_http_request_t *r; | |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
1005 ngx_http_perl_ctx_t *ctx; |
| 1897 | 1006 ngx_msec_t sleep; |
| 911 | 1007 |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
1008 ngx_http_perl_set_request(r, ctx); |
| 911 | 1009 |
| 1898 | 1010 sleep = (ngx_msec_t) SvIV(ST(1)); |
| 1897 | 1011 |
| 1012 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 1013 "perl sleep: %M", sleep); | |
| 1014 | |
| 911 | 1015 ctx->next = SvRV(ST(2)); |
| 1016 | |
|
6960
1c5e5e5b008d
Perl: fixed delaying subrequests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6233
diff
changeset
|
1017 r->connection->write->delayed = 1; |
| 1897 | 1018 ngx_add_timer(r->connection->write, sleep); |
| 1019 | |
| 1020 r->write_event_handler = ngx_http_perl_sleep_handler; | |
|
3447
de70f912ad58
fix request counter for $r->sleep(), the bug was introduced in r3050
Igor Sysoev <igor@sysoev.ru>
parents:
3317
diff
changeset
|
1021 r->main->count++; |
| 911 | 1022 |
| 1023 | |
| 1024 void | |
| 907 | 1025 log_error(r, err, msg) |
| 1026 CODE: | |
| 1027 | |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
1028 ngx_http_request_t *r; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
1029 ngx_http_perl_ctx_t *ctx; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
1030 SV *err, *msg; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
1031 u_char *p; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
1032 STRLEN len; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
1033 ngx_err_t e; |
| 907 | 1034 |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
1035 ngx_http_perl_set_request(r, ctx); |
| 907 | 1036 |
| 1037 err = ST(1); | |
| 1038 | |
| 1039 if (SvROK(err) && SvTYPE(SvRV(err)) == SVt_PV) { | |
| 1040 err = SvRV(err); | |
| 1041 } | |
| 1042 | |
| 1043 e = SvIV(err); | |
| 1044 | |
| 1045 msg = ST(2); | |
| 1046 | |
| 1047 if (SvROK(msg) && SvTYPE(SvRV(msg)) == SVt_PV) { | |
| 1048 msg = SvRV(msg); | |
| 1049 } | |
| 1050 | |
| 1051 p = (u_char *) SvPV(msg, len); | |
| 1052 | |
| 910 | 1053 ngx_log_error(NGX_LOG_ERR, r->connection->log, e, "perl: %s", p); |