Mercurial > hg > nginx
annotate src/http/modules/perl/nginx.xs @ 8024:ef6a3a99a81a
Reworked multi headers to use linked lists.
Multi headers are now using linked lists instead of arrays. Notably,
the following fields were changed: r->headers_in.cookies (renamed
to r->headers_in.cookie), r->headers_in.x_forwarded_for,
r->headers_out.cache_control, r->headers_out.link, u->headers_in.cache_control
u->headers_in.cookies (renamed to u->headers_in.set_cookie).
The r->headers_in.cookies and u->headers_in.cookies fields were renamed
to r->headers_in.cookie and u->headers_in.set_cookie to match header names.
The ngx_http_parse_multi_header_lines() and ngx_http_parse_set_cookie_lines()
functions were changed accordingly.
With this change, multi headers are now essentially equivalent to normal
headers, and following changes will further make them equivalent.
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Mon, 30 May 2022 21:25:33 +0300 |
| parents | 56b4fb46ba7d |
| children | 8b3860b52bb3 |
| 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 |
|
7528
0cb693b4cbbb
Perl: disabled unrelated calls from variable handlers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7527
diff
changeset
|
113 if (ctx->variable) { |
|
0cb693b4cbbb
Perl: disabled unrelated calls from variable handlers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7527
diff
changeset
|
114 croak("status(): cannot be used in variable handler"); |
|
0cb693b4cbbb
Perl: disabled unrelated calls from variable handlers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7527
diff
changeset
|
115 } |
|
0cb693b4cbbb
Perl: disabled unrelated calls from variable handlers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7527
diff
changeset
|
116 |
| 915 | 117 r->headers_out.status = SvIV(ST(1)); |
| 118 | |
| 119 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 120 "perl status: %d", r->headers_out.status); | |
| 121 | |
| 122 XSRETURN_UNDEF; | |
| 123 | |
| 124 | |
| 125 void | |
| 599 | 126 send_http_header(r, ...) |
| 633 | 127 CODE: |
| 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_request_t *r; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
130 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
|
131 SV *sv; |
| 7525 | 132 ngx_int_t rc; |
| 599 | 133 |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
134 ngx_http_perl_set_request(r, ctx); |
| 599 | 135 |
| 7525 | 136 if (ctx->error) { |
| 137 croak("send_http_header(): called after error"); | |
| 138 } | |
| 139 | |
|
7528
0cb693b4cbbb
Perl: disabled unrelated calls from variable handlers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7527
diff
changeset
|
140 if (ctx->variable) { |
|
0cb693b4cbbb
Perl: disabled unrelated calls from variable handlers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7527
diff
changeset
|
141 croak("send_http_header(): cannot be used in variable handler"); |
|
0cb693b4cbbb
Perl: disabled unrelated calls from variable handlers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7527
diff
changeset
|
142 } |
|
0cb693b4cbbb
Perl: disabled unrelated calls from variable handlers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7527
diff
changeset
|
143 |
|
7531
ede052c67512
Perl: additional ctx->header_sent checks.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7530
diff
changeset
|
144 if (ctx->header_sent) { |
|
ede052c67512
Perl: additional ctx->header_sent checks.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7530
diff
changeset
|
145 croak("send_http_header(): header already sent"); |
|
ede052c67512
Perl: additional ctx->header_sent checks.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7530
diff
changeset
|
146 } |
|
ede052c67512
Perl: additional ctx->header_sent checks.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7530
diff
changeset
|
147 |
|
ede052c67512
Perl: additional ctx->header_sent checks.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7530
diff
changeset
|
148 if (ctx->redirect_uri.len) { |
|
ede052c67512
Perl: additional ctx->header_sent checks.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7530
diff
changeset
|
149 croak("send_http_header(): cannot be used with internal_redirect()"); |
|
ede052c67512
Perl: additional ctx->header_sent checks.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7530
diff
changeset
|
150 } |
|
ede052c67512
Perl: additional ctx->header_sent checks.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7530
diff
changeset
|
151 |
| 599 | 152 if (r->headers_out.status == 0) { |
| 153 r->headers_out.status = NGX_HTTP_OK; | |
| 154 } | |
| 155 | |
| 156 if (items != 1) { | |
| 157 sv = ST(1); | |
| 158 | |
| 159 if (ngx_http_perl_sv2str(aTHX_ r, &r->headers_out.content_type, sv) | |
| 160 != NGX_OK) | |
| 161 { | |
|
7526
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
162 ctx->error = 1; |
|
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
163 croak("ngx_http_perl_sv2str() failed"); |
| 599 | 164 } |
| 165 | |
|
1444
37938e68910b
allow to append charset to the "Content-Type" header
Igor Sysoev <igor@sysoev.ru>
parents:
1372
diff
changeset
|
166 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
|
167 |
| 599 | 168 } else { |
| 673 | 169 if (ngx_http_set_content_type(r) != NGX_OK) { |
|
7526
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
170 ctx->error = 1; |
|
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
171 croak("ngx_http_set_content_type() failed"); |
| 599 | 172 } |
| 173 } | |
| 174 | |
|
7530
fd9252844ec1
Perl: avoid returning 500 if header was already sent.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7528
diff
changeset
|
175 ctx->header_sent = 1; |
|
fd9252844ec1
Perl: avoid returning 500 if header was already sent.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7528
diff
changeset
|
176 |
|
7516
36c52a0f6ded
Perl: disabled not_modified filter (ticket #1786).
Maxim Dounin <mdounin@mdounin.ru>
parents:
6986
diff
changeset
|
177 r->disable_not_modified = 1; |
|
36c52a0f6ded
Perl: disabled not_modified filter (ticket #1786).
Maxim Dounin <mdounin@mdounin.ru>
parents:
6986
diff
changeset
|
178 |
| 7525 | 179 rc = ngx_http_send_header(r); |
| 180 | |
| 181 if (rc == NGX_ERROR || rc > NGX_OK) { | |
| 182 ctx->error = 1; | |
| 183 ctx->status = rc; | |
| 184 croak("ngx_http_send_header() failed"); | |
| 185 } | |
| 599 | 186 |
| 187 | |
| 633 | 188 void |
| 189 header_only(r) | |
| 599 | 190 CODE: |
| 191 | |
| 633 | 192 dXSTARG; |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
193 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
|
194 ngx_http_perl_ctx_t *ctx; |
| 633 | 195 |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
196 ngx_http_perl_set_request(r, ctx); |
| 599 | 197 |
| 633 | 198 sv_upgrade(TARG, SVt_IV); |
| 199 sv_setiv(TARG, r->header_only); | |
| 599 | 200 |
| 633 | 201 ST(0) = TARG; |
| 599 | 202 |
| 203 | |
| 633 | 204 void |
| 205 uri(r) | |
| 206 CODE: | |
| 207 | |
| 208 dXSTARG; | |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
209 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
|
210 ngx_http_perl_ctx_t *ctx; |
| 599 | 211 |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
212 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
|
213 ngx_http_perl_set_targ(r->uri.data, r->uri.len); |
| 633 | 214 |
| 215 ST(0) = TARG; | |
| 216 | |
| 217 | |
| 218 void | |
| 219 args(r) | |
| 599 | 220 CODE: |
| 221 | |
| 633 | 222 dXSTARG; |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
223 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
|
224 ngx_http_perl_ctx_t *ctx; |
| 599 | 225 |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
226 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
|
227 ngx_http_perl_set_targ(r->args.data, r->args.len); |
| 599 | 228 |
| 633 | 229 ST(0) = TARG; |
| 599 | 230 |
| 231 | |
| 633 | 232 void |
| 629 | 233 request_method(r) |
| 633 | 234 CODE: |
| 235 | |
| 236 dXSTARG; | |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
237 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
|
238 ngx_http_perl_ctx_t *ctx; |
| 629 | 239 |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
240 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
|
241 ngx_http_perl_set_targ(r->method_name.data, r->method_name.len); |
| 633 | 242 |
| 243 ST(0) = TARG; | |
| 244 | |
| 245 | |
| 246 void | |
| 247 remote_addr(r) | |
| 629 | 248 CODE: |
| 249 | |
| 633 | 250 dXSTARG; |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
251 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
|
252 ngx_http_perl_ctx_t *ctx; |
| 629 | 253 |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
254 ngx_http_perl_set_request(r, ctx); |
| 633 | 255 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
|
256 r->connection->addr_text.len); |
| 629 | 257 |
| 633 | 258 ST(0) = TARG; |
| 629 | 259 |
| 260 | |
| 633 | 261 void |
| 262 header_in(r, key) | |
| 629 | 263 CODE: |
| 264 | |
| 633 | 265 dXSTARG; |
| 667 | 266 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
|
267 ngx_http_perl_ctx_t *ctx; |
| 667 | 268 SV *key; |
|
5248
f5626ab8cb87
Perl: fixed r->header_in("Cookie") (ticket #351).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5198
diff
changeset
|
269 u_char *p, *lowcase_key, *value, sep; |
| 667 | 270 STRLEN len; |
| 271 ssize_t size; | |
| 272 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
|
273 ngx_array_t *a; |
| 667 | 274 ngx_list_part_t *part; |
| 275 ngx_table_elt_t *h, **ph; | |
| 276 ngx_http_header_t *hh; | |
| 277 ngx_http_core_main_conf_t *cmcf; | |
| 629 | 278 |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
279 ngx_http_perl_set_request(r, ctx); |
| 599 | 280 |
| 633 | 281 key = ST(1); |
| 599 | 282 |
| 283 if (SvROK(key) && SvTYPE(SvRV(key)) == SVt_PV) { | |
| 284 key = SvRV(key); | |
| 285 } | |
| 286 | |
| 287 p = (u_char *) SvPV(key, len); | |
| 288 | |
| 667 | 289 /* look up hashed headers */ |
| 290 | |
| 2049 | 291 lowcase_key = ngx_pnalloc(r->pool, len); |
| 667 | 292 if (lowcase_key == NULL) { |
|
7526
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
293 ctx->error = 1; |
|
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
294 croak("ngx_pnalloc() failed"); |
| 667 | 295 } |
| 296 | |
| 2136 | 297 hash = ngx_hash_strlow(lowcase_key, p, len); |
| 667 | 298 |
| 299 cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module); | |
| 300 | |
| 301 hh = ngx_hash_find(&cmcf->headers_in_hash, hash, lowcase_key, len); | |
| 302 | |
| 303 if (hh) { | |
|
5248
f5626ab8cb87
Perl: fixed r->header_in("Cookie") (ticket #351).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5198
diff
changeset
|
304 |
|
8024
ef6a3a99a81a
Reworked multi headers to use linked lists.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7535
diff
changeset
|
305 if (hh->offset == offsetof(ngx_http_headers_in_t, cookie)) { |
|
5248
f5626ab8cb87
Perl: fixed r->header_in("Cookie") (ticket #351).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5198
diff
changeset
|
306 sep = ';'; |
|
f5626ab8cb87
Perl: fixed r->header_in("Cookie") (ticket #351).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5198
diff
changeset
|
307 goto multi; |
|
f5626ab8cb87
Perl: fixed r->header_in("Cookie") (ticket #351).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5198
diff
changeset
|
308 } |
|
5306
43900b822890
Perl: fixed syntax usage for C preprocessor directives.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5248
diff
changeset
|
309 #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
|
310 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
|
311 sep = ','; |
|
f5626ab8cb87
Perl: fixed r->header_in("Cookie") (ticket #351).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5198
diff
changeset
|
312 goto multi; |
|
f5626ab8cb87
Perl: fixed r->header_in("Cookie") (ticket #351).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5198
diff
changeset
|
313 } |
|
5306
43900b822890
Perl: fixed syntax usage for C preprocessor directives.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5248
diff
changeset
|
314 #endif |
|
5248
f5626ab8cb87
Perl: fixed r->header_in("Cookie") (ticket #351).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5198
diff
changeset
|
315 |
|
6232
5f2a0739da19
Perl: fixed warning about "sep" may be used uninitialized.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5306
diff
changeset
|
316 ph = (ngx_table_elt_t **) ((char *) &r->headers_in + hh->offset); |
| 667 | 317 |
|
6232
5f2a0739da19
Perl: fixed warning about "sep" may be used uninitialized.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5306
diff
changeset
|
318 if (*ph) { |
|
5f2a0739da19
Perl: fixed warning about "sep" may be used uninitialized.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5306
diff
changeset
|
319 ngx_http_perl_set_targ((*ph)->value.data, (*ph)->value.len); |
| 667 | 320 |
|
6232
5f2a0739da19
Perl: fixed warning about "sep" may be used uninitialized.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5306
diff
changeset
|
321 goto done; |
|
5f2a0739da19
Perl: fixed warning about "sep" may be used uninitialized.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5306
diff
changeset
|
322 } |
| 667 | 323 |
|
6232
5f2a0739da19
Perl: fixed warning about "sep" may be used uninitialized.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5306
diff
changeset
|
324 XSRETURN_UNDEF; |
| 667 | 325 |
|
5248
f5626ab8cb87
Perl: fixed r->header_in("Cookie") (ticket #351).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5198
diff
changeset
|
326 multi: |
|
f5626ab8cb87
Perl: fixed r->header_in("Cookie") (ticket #351).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5198
diff
changeset
|
327 |
|
f5626ab8cb87
Perl: fixed r->header_in("Cookie") (ticket #351).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5198
diff
changeset
|
328 /* Cookie, X-Forwarded-For */ |
| 667 | 329 |
|
8024
ef6a3a99a81a
Reworked multi headers to use linked lists.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7535
diff
changeset
|
330 ph = (ngx_table_elt_t **) ((char *) &r->headers_in + hh->offset); |
|
5248
f5626ab8cb87
Perl: fixed r->header_in("Cookie") (ticket #351).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5198
diff
changeset
|
331 |
|
8024
ef6a3a99a81a
Reworked multi headers to use linked lists.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7535
diff
changeset
|
332 if (*ph == NULL) { |
| 667 | 333 XSRETURN_UNDEF; |
| 334 } | |
| 335 | |
|
8024
ef6a3a99a81a
Reworked multi headers to use linked lists.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7535
diff
changeset
|
336 if ((*ph)->next == NULL) { |
|
1739
5b7baef2e11e
copy return values to perl's allocated memory
Igor Sysoev <igor@sysoev.ru>
parents:
1703
diff
changeset
|
337 ngx_http_perl_set_targ((*ph)->value.data, (*ph)->value.len); |
| 667 | 338 |
| 339 goto done; | |
| 340 } | |
| 341 | |
| 342 size = - (ssize_t) (sizeof("; ") - 1); | |
| 343 | |
|
8024
ef6a3a99a81a
Reworked multi headers to use linked lists.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7535
diff
changeset
|
344 for (h = *ph; h; h = h->next) { |
|
ef6a3a99a81a
Reworked multi headers to use linked lists.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7535
diff
changeset
|
345 size += h->value.len + sizeof("; ") - 1; |
| 667 | 346 } |
| 347 | |
|
5248
f5626ab8cb87
Perl: fixed r->header_in("Cookie") (ticket #351).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5198
diff
changeset
|
348 value = ngx_pnalloc(r->pool, size); |
|
f5626ab8cb87
Perl: fixed r->header_in("Cookie") (ticket #351).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5198
diff
changeset
|
349 if (value == NULL) { |
|
7526
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
350 ctx->error = 1; |
|
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
351 croak("ngx_pnalloc() failed"); |
| 667 | 352 } |
| 353 | |
|
5248
f5626ab8cb87
Perl: fixed r->header_in("Cookie") (ticket #351).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5198
diff
changeset
|
354 p = value; |
| 667 | 355 |
|
8024
ef6a3a99a81a
Reworked multi headers to use linked lists.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7535
diff
changeset
|
356 for (h = *ph; h; h = h->next) { |
|
ef6a3a99a81a
Reworked multi headers to use linked lists.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7535
diff
changeset
|
357 p = ngx_copy(p, h->value.data, h->value.len); |
| 667 | 358 |
|
8024
ef6a3a99a81a
Reworked multi headers to use linked lists.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7535
diff
changeset
|
359 if (h->next == NULL) { |
| 667 | 360 break; |
| 361 } | |
| 362 | |
|
5248
f5626ab8cb87
Perl: fixed r->header_in("Cookie") (ticket #351).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5198
diff
changeset
|
363 *p++ = sep; *p++ = ' '; |
| 667 | 364 } |
| 365 | |
|
5248
f5626ab8cb87
Perl: fixed r->header_in("Cookie") (ticket #351).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5198
diff
changeset
|
366 ngx_http_perl_set_targ(value, size); |
| 667 | 367 |
| 368 goto done; | |
| 369 } | |
| 370 | |
| 371 /* iterate over all headers */ | |
| 372 | |
| 599 | 373 part = &r->headers_in.headers.part; |
| 667 | 374 h = part->elts; |
| 599 | 375 |
| 376 for (i = 0; /* void */ ; i++) { | |
| 377 | |
| 378 if (i >= part->nelts) { | |
| 379 if (part->next == NULL) { | |
| 380 break; | |
| 381 } | |
| 382 | |
| 383 part = part->next; | |
| 667 | 384 h = part->elts; |
| 599 | 385 i = 0; |
| 386 } | |
| 387 | |
| 667 | 388 if (len != h[i].key.len |
| 389 || ngx_strcasecmp(p, h[i].key.data) != 0) | |
| 599 | 390 { |
| 391 continue; | |
| 392 } | |
| 393 | |
|
1739
5b7baef2e11e
copy return values to perl's allocated memory
Igor Sysoev <igor@sysoev.ru>
parents:
1703
diff
changeset
|
394 ngx_http_perl_set_targ(h[i].value.data, h[i].value.len); |
| 599 | 395 |
| 396 goto done; | |
| 397 } | |
| 398 | |
| 399 XSRETURN_UNDEF; | |
| 400 | |
| 401 done: | |
| 402 | |
| 633 | 403 ST(0) = TARG; |
| 599 | 404 |
| 405 | |
| 633 | 406 void |
| 681 | 407 has_request_body(r, next) |
| 408 CODE: | |
| 409 | |
| 410 dXSTARG; | |
| 411 ngx_http_request_t *r; | |
| 412 ngx_http_perl_ctx_t *ctx; | |
| 7525 | 413 ngx_int_t rc; |
| 681 | 414 |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
415 ngx_http_perl_set_request(r, ctx); |
| 681 | 416 |
|
7528
0cb693b4cbbb
Perl: disabled unrelated calls from variable handlers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7527
diff
changeset
|
417 if (ctx->variable) { |
|
0cb693b4cbbb
Perl: disabled unrelated calls from variable handlers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7527
diff
changeset
|
418 croak("has_request_body(): cannot be used in variable handler"); |
|
0cb693b4cbbb
Perl: disabled unrelated calls from variable handlers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7527
diff
changeset
|
419 } |
|
0cb693b4cbbb
Perl: disabled unrelated calls from variable handlers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7527
diff
changeset
|
420 |
|
7527
02cd116ebe2a
Perl: protection against duplicate $r->sleep() calls.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7526
diff
changeset
|
421 if (ctx->next) { |
|
02cd116ebe2a
Perl: protection against duplicate $r->sleep() calls.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7526
diff
changeset
|
422 croak("has_request_body(): another handler active"); |
|
02cd116ebe2a
Perl: protection against duplicate $r->sleep() calls.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7526
diff
changeset
|
423 } |
|
02cd116ebe2a
Perl: protection against duplicate $r->sleep() calls.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7526
diff
changeset
|
424 |
|
5181
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
425 if (r->headers_in.content_length_n <= 0 && !r->headers_in.chunked) { |
| 681 | 426 XSRETURN_UNDEF; |
| 427 } | |
| 428 | |
| 909 | 429 ctx->next = SvRV(ST(1)); |
| 681 | 430 |
| 431 r->request_body_in_single_buf = 1; | |
| 432 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
|
433 r->request_body_in_clean_file = 1; |
| 681 | 434 |
| 435 if (r->request_body_in_file_only) { | |
| 436 r->request_body_file_log_level = 0; | |
| 437 } | |
| 438 | |
| 7525 | 439 rc = ngx_http_read_client_request_body(r, ngx_http_perl_handle_request); |
| 440 | |
| 441 if (rc >= NGX_HTTP_SPECIAL_RESPONSE) { | |
| 442 ctx->error = 1; | |
| 443 ctx->status = rc; | |
| 444 ctx->next = NULL; | |
| 445 croak("ngx_http_read_client_request_body() failed"); | |
| 446 } | |
| 681 | 447 |
| 448 sv_upgrade(TARG, SVt_IV); | |
| 449 sv_setiv(TARG, 1); | |
| 450 | |
| 451 ST(0) = TARG; | |
| 452 | |
| 453 | |
| 454 void | |
| 631 | 455 request_body(r) |
| 456 CODE: | |
| 457 | |
| 633 | 458 dXSTARG; |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
459 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
|
460 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
|
461 u_char *p, *data; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
462 size_t len; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
463 ngx_buf_t *buf; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
464 ngx_chain_t *cl; |
| 633 | 465 |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
466 ngx_http_perl_set_request(r, ctx); |
| 631 | 467 |
| 941 | 468 if (r->request_body == NULL |
| 469 || r->request_body->temp_file | |
| 470 || r->request_body->bufs == NULL) | |
| 471 { | |
| 633 | 472 XSRETURN_UNDEF; |
| 473 } | |
| 631 | 474 |
|
5181
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
475 cl = r->request_body->bufs; |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
476 buf = cl->buf; |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
477 |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
478 if (cl->next == NULL) { |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
479 len = buf->last - buf->pos; |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
480 data = buf->pos; |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
481 goto done; |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
482 } |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
483 |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
484 len = buf->last - buf->pos; |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
485 cl = cl->next; |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
486 |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
487 for ( /* void */ ; cl; cl = cl->next) { |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
488 buf = cl->buf; |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
489 len += buf->last - buf->pos; |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
490 } |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
491 |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
492 p = ngx_pnalloc(r->pool, len); |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
493 if (p == NULL) { |
|
7526
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
494 ctx->error = 1; |
|
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
495 croak("ngx_pnalloc() failed"); |
|
5181
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
496 } |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
497 |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
498 data = p; |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
499 cl = r->request_body->bufs; |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
500 |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
501 for ( /* void */ ; cl; cl = cl->next) { |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
502 buf = cl->buf; |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
503 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
|
504 } |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
505 |
|
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
506 done: |
| 631 | 507 |
| 508 if (len == 0) { | |
| 509 XSRETURN_UNDEF; | |
| 510 } | |
| 511 | |
|
5181
4d0ac175f6e4
Perl: request body handling fixed.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4644
diff
changeset
|
512 ngx_http_perl_set_targ(data, len); |
| 631 | 513 |
| 633 | 514 ST(0) = TARG; |
| 631 | 515 |
| 516 | |
| 633 | 517 void |
| 518 request_body_file(r) | |
| 519 CODE: | |
| 520 | |
| 521 dXSTARG; | |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
522 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
|
523 ngx_http_perl_ctx_t *ctx; |
| 633 | 524 |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
525 ngx_http_perl_set_request(r, ctx); |
| 633 | 526 |
| 941 | 527 if (r->request_body == NULL || r->request_body->temp_file == NULL) { |
| 633 | 528 XSRETURN_UNDEF; |
| 529 } | |
| 530 | |
| 531 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
|
532 r->request_body->temp_file->file.name.len); |
| 599 | 533 |
| 633 | 534 ST(0) = TARG; |
| 535 | |
| 536 | |
| 537 void | |
| 1371 | 538 discard_request_body(r) |
| 539 CODE: | |
| 540 | |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
541 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
|
542 ngx_http_perl_ctx_t *ctx; |
| 7525 | 543 ngx_int_t rc; |
| 1371 | 544 |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
545 ngx_http_perl_set_request(r, ctx); |
| 1371 | 546 |
|
7528
0cb693b4cbbb
Perl: disabled unrelated calls from variable handlers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7527
diff
changeset
|
547 if (ctx->variable) { |
|
0cb693b4cbbb
Perl: disabled unrelated calls from variable handlers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7527
diff
changeset
|
548 croak("discard_request_body(): cannot be used in variable handler"); |
|
0cb693b4cbbb
Perl: disabled unrelated calls from variable handlers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7527
diff
changeset
|
549 } |
|
0cb693b4cbbb
Perl: disabled unrelated calls from variable handlers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7527
diff
changeset
|
550 |
| 7525 | 551 rc = ngx_http_discard_request_body(r); |
| 552 | |
| 553 if (rc != NGX_OK) { | |
| 554 ctx->error = 1; | |
| 555 ctx->status = rc; | |
| 556 croak("ngx_http_discard_request_body() failed"); | |
| 557 } | |
| 1371 | 558 |
| 559 | |
| 560 void | |
| 633 | 561 header_out(r, key, value) |
| 562 CODE: | |
| 599 | 563 |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
564 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
|
565 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
|
566 SV *key; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
567 SV *value; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
568 ngx_table_elt_t *header; |
| 599 | 569 |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
570 ngx_http_perl_set_request(r, ctx); |
| 633 | 571 |
| 7525 | 572 if (ctx->error) { |
| 573 croak("header_out(): called after error"); | |
| 574 } | |
| 575 | |
|
7528
0cb693b4cbbb
Perl: disabled unrelated calls from variable handlers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7527
diff
changeset
|
576 if (ctx->variable) { |
|
0cb693b4cbbb
Perl: disabled unrelated calls from variable handlers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7527
diff
changeset
|
577 croak("header_out(): cannot be used in variable handler"); |
|
0cb693b4cbbb
Perl: disabled unrelated calls from variable handlers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7527
diff
changeset
|
578 } |
|
0cb693b4cbbb
Perl: disabled unrelated calls from variable handlers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7527
diff
changeset
|
579 |
| 633 | 580 key = ST(1); |
| 581 value = ST(2); | |
| 599 | 582 |
| 583 header = ngx_list_push(&r->headers_out.headers); | |
| 584 if (header == NULL) { | |
|
7526
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
585 ctx->error = 1; |
|
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
586 croak("ngx_list_push() failed"); |
| 599 | 587 } |
| 588 | |
| 589 header->hash = 1; | |
| 590 | |
| 591 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
|
592 header->hash = 0; |
|
7526
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
593 ctx->error = 1; |
|
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
594 croak("ngx_http_perl_sv2str() failed"); |
| 599 | 595 } |
| 596 | |
| 597 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
|
598 header->hash = 0; |
|
7526
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
599 ctx->error = 1; |
|
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
600 croak("ngx_http_perl_sv2str() failed"); |
| 599 | 601 } |
| 602 | |
| 603 if (header->key.len == sizeof("Content-Length") - 1 | |
| 3870 | 604 && 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
|
605 sizeof("Content-Length") - 1) == 0) |
| 599 | 606 { |
|
741
63a08390a8a2
$r->headers_out("Content-Length", "NNN") did not work
Igor Sysoev <igor@sysoev.ru>
parents:
681
diff
changeset
|
607 r->headers_out.content_length_n = (off_t) SvIV(value); |
| 599 | 608 r->headers_out.content_length = header; |
| 609 } | |
| 610 | |
|
4196
190ae1a7f917
Handling of Content-Encoding set from perl.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4188
diff
changeset
|
611 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
|
612 && 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
|
613 sizeof("Content-Encoding") - 1) == 0) |
|
190ae1a7f917
Handling of Content-Encoding set from perl.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4188
diff
changeset
|
614 { |
|
190ae1a7f917
Handling of Content-Encoding set from perl.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4188
diff
changeset
|
615 r->headers_out.content_encoding = header; |
|
190ae1a7f917
Handling of Content-Encoding set from perl.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4188
diff
changeset
|
616 } |
|
190ae1a7f917
Handling of Content-Encoding set from perl.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4188
diff
changeset
|
617 |
| 599 | 618 |
| 633 | 619 void |
| 599 | 620 filename(r) |
| 633 | 621 CODE: |
| 599 | 622 |
| 633 | 623 dXSTARG; |
| 624 ngx_http_request_t *r; | |
| 599 | 625 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
|
626 size_t root; |
| 599 | 627 |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
628 ngx_http_perl_set_request(r, ctx); |
| 599 | 629 |
| 633 | 630 if (ctx->filename.data) { |
| 599 | 631 goto done; |
| 632 } | |
| 633 | |
|
774
589841f06b87
previous commit broke two modules
Igor Sysoev <igor@sysoev.ru>
parents:
741
diff
changeset
|
634 if (ngx_http_map_uri_to_path(r, &ctx->filename, &root, 0) == NULL) { |
|
7526
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
635 ctx->error = 1; |
|
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
636 croak("ngx_http_map_uri_to_path() failed"); |
| 599 | 637 } |
| 638 | |
| 633 | 639 ctx->filename.len--; |
| 640 sv_setpv(PL_statname, (char *) ctx->filename.data); | |
| 599 | 641 |
| 642 done: | |
| 643 | |
|
1739
5b7baef2e11e
copy return values to perl's allocated memory
Igor Sysoev <igor@sysoev.ru>
parents:
1703
diff
changeset
|
644 ngx_http_perl_set_targ(ctx->filename.data, ctx->filename.len); |
| 599 | 645 |
| 633 | 646 ST(0) = TARG; |
| 599 | 647 |
| 648 | |
| 633 | 649 void |
| 599 | 650 print(r, ...) |
| 651 CODE: | |
| 652 | |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
653 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
|
654 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
|
655 SV *sv; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
656 int i; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
657 u_char *p; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
658 size_t size; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
659 STRLEN len; |
| 7525 | 660 ngx_int_t rc; |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
661 ngx_buf_t *b; |
| 633 | 662 |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
663 ngx_http_perl_set_request(r, ctx); |
| 599 | 664 |
| 7525 | 665 if (ctx->error) { |
| 666 croak("print(): called after error"); | |
| 667 } | |
| 668 | |
|
7528
0cb693b4cbbb
Perl: disabled unrelated calls from variable handlers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7527
diff
changeset
|
669 if (ctx->variable) { |
|
0cb693b4cbbb
Perl: disabled unrelated calls from variable handlers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7527
diff
changeset
|
670 croak("print(): cannot be used in variable handler"); |
|
0cb693b4cbbb
Perl: disabled unrelated calls from variable handlers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7527
diff
changeset
|
671 } |
|
0cb693b4cbbb
Perl: disabled unrelated calls from variable handlers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7527
diff
changeset
|
672 |
|
7531
ede052c67512
Perl: additional ctx->header_sent checks.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7530
diff
changeset
|
673 if (!ctx->header_sent) { |
|
ede052c67512
Perl: additional ctx->header_sent checks.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7530
diff
changeset
|
674 croak("print(): header not sent"); |
|
ede052c67512
Perl: additional ctx->header_sent checks.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7530
diff
changeset
|
675 } |
|
ede052c67512
Perl: additional ctx->header_sent checks.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7530
diff
changeset
|
676 |
| 599 | 677 if (items == 2) { |
| 678 | |
| 679 /* | |
| 680 * do zero copy for prolate single read-only SV: | |
| 681 * $r->print("some text\n"); | |
| 682 */ | |
| 683 | |
| 684 sv = ST(1); | |
| 685 | |
| 686 if (SvROK(sv) && SvTYPE(SvRV(sv)) == SVt_PV) { | |
| 687 sv = SvRV(sv); | |
| 688 } | |
| 689 | |
|
1703
43747661804d
*) copy regex captures $1, $2, etc.
Igor Sysoev <igor@sysoev.ru>
parents:
1565
diff
changeset
|
690 if (SvREADONLY(sv) && SvPOK(sv)) { |
| 599 | 691 |
| 692 p = (u_char *) SvPV(sv, len); | |
| 693 | |
| 694 if (len == 0) { | |
| 633 | 695 XSRETURN_EMPTY; |
| 599 | 696 } |
| 697 | |
| 698 b = ngx_calloc_buf(r->pool); | |
| 699 if (b == NULL) { | |
|
7526
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
700 ctx->error = 1; |
|
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
701 croak("ngx_calloc_buf() failed"); |
| 599 | 702 } |
| 703 | |
| 704 b->memory = 1; | |
| 705 b->pos = p; | |
| 706 b->last = p + len; | |
| 707 b->start = p; | |
| 708 b->end = b->last; | |
| 709 | |
| 601 | 710 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
| 711 "$r->print: read-only SV: %z", len); | |
| 712 | |
| 599 | 713 goto out; |
| 714 } | |
| 715 } | |
| 716 | |
| 717 size = 0; | |
| 718 | |
| 719 for (i = 1; i < items; i++) { | |
| 720 | |
| 721 sv = ST(i); | |
| 722 | |
| 723 if (SvROK(sv) && SvTYPE(SvRV(sv)) == SVt_PV) { | |
| 724 sv = SvRV(sv); | |
| 725 } | |
| 726 | |
| 601 | 727 (void) SvPV(sv, len); |
| 599 | 728 |
| 601 | 729 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
| 730 "$r->print: copy SV: %z", len); | |
| 599 | 731 |
| 732 size += len; | |
| 733 } | |
| 734 | |
| 735 if (size == 0) { | |
| 633 | 736 XSRETURN_EMPTY; |
| 599 | 737 } |
| 738 | |
| 739 b = ngx_create_temp_buf(r->pool, size); | |
| 740 if (b == NULL) { | |
|
7526
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
741 ctx->error = 1; |
|
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
742 croak("ngx_create_temp_buf() failed"); |
| 599 | 743 } |
| 744 | |
| 745 for (i = 1; i < items; i++) { | |
| 746 sv = ST(i); | |
| 747 | |
| 748 if (SvROK(sv) && SvTYPE(SvRV(sv)) == SVt_PV) { | |
| 749 sv = SvRV(sv); | |
| 750 } | |
| 751 | |
| 752 p = (u_char *) SvPV(sv, len); | |
| 753 b->last = ngx_cpymem(b->last, p, len); | |
| 754 } | |
| 755 | |
| 756 out: | |
| 757 | |
| 7525 | 758 rc = ngx_http_perl_output(r, ctx, b); |
| 759 | |
| 760 if (rc == NGX_ERROR) { | |
| 761 ctx->error = 1; | |
| 762 croak("ngx_http_perl_output() failed"); | |
| 763 } | |
| 599 | 764 |
| 765 | |
| 633 | 766 void |
| 613 | 767 sendfile(r, filename, offset = -1, bytes = 0) |
| 633 | 768 CODE: |
| 769 | |
| 1454 | 770 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
|
771 ngx_http_perl_ctx_t *ctx; |
| 1454 | 772 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
|
773 off_t offset; |
| 1454 | 774 size_t bytes; |
| 7525 | 775 ngx_int_t rc; |
| 1454 | 776 ngx_str_t path; |
| 777 ngx_buf_t *b; | |
| 778 ngx_open_file_info_t of; | |
| 779 ngx_http_core_loc_conf_t *clcf; | |
| 599 | 780 |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
781 ngx_http_perl_set_request(r, ctx); |
| 633 | 782 |
| 7525 | 783 if (ctx->error) { |
| 784 croak("sendfile(): called after error"); | |
| 785 } | |
| 786 | |
|
7528
0cb693b4cbbb
Perl: disabled unrelated calls from variable handlers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7527
diff
changeset
|
787 if (ctx->variable) { |
|
0cb693b4cbbb
Perl: disabled unrelated calls from variable handlers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7527
diff
changeset
|
788 croak("sendfile(): cannot be used in variable handler"); |
|
0cb693b4cbbb
Perl: disabled unrelated calls from variable handlers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7527
diff
changeset
|
789 } |
|
0cb693b4cbbb
Perl: disabled unrelated calls from variable handlers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7527
diff
changeset
|
790 |
|
7531
ede052c67512
Perl: additional ctx->header_sent checks.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7530
diff
changeset
|
791 if (!ctx->header_sent) { |
|
ede052c67512
Perl: additional ctx->header_sent checks.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7530
diff
changeset
|
792 croak("sendfile(): header not sent"); |
|
ede052c67512
Perl: additional ctx->header_sent checks.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7530
diff
changeset
|
793 } |
|
ede052c67512
Perl: additional ctx->header_sent checks.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7530
diff
changeset
|
794 |
| 633 | 795 filename = SvPV_nolen(ST(1)); |
| 599 | 796 |
| 797 if (filename == NULL) { | |
| 798 croak("sendfile(): NULL filename"); | |
| 799 } | |
| 800 | |
| 633 | 801 offset = items < 3 ? -1 : SvIV(ST(2)); |
| 802 bytes = items < 4 ? 0 : SvIV(ST(3)); | |
| 803 | |
| 599 | 804 b = ngx_calloc_buf(r->pool); |
| 805 if (b == NULL) { | |
|
7526
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
806 ctx->error = 1; |
|
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
807 croak("ngx_calloc_buf() failed"); |
| 599 | 808 } |
| 809 | |
| 810 b->file = ngx_pcalloc(r->pool, sizeof(ngx_file_t)); | |
| 811 if (b->file == NULL) { | |
|
7526
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
812 ctx->error = 1; |
|
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
813 croak("ngx_pcalloc() failed"); |
| 599 | 814 } |
| 815 | |
| 1454 | 816 path.len = ngx_strlen(filename); |
| 817 | |
|
2061
b0a1c84725cf
change useless ngx_pcalloc() to ngx_pnalloc()
Igor Sysoev <igor@sysoev.ru>
parents:
2049
diff
changeset
|
818 path.data = ngx_pnalloc(r->pool, path.len + 1); |
| 1454 | 819 if (path.data == NULL) { |
|
7526
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
820 ctx->error = 1; |
|
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
821 croak("ngx_pnalloc() failed"); |
| 599 | 822 } |
| 823 | |
| 3870 | 824 (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
|
825 |
|
2063
67a29af877ed
initialize of.uniq in ngx_open_cached_file()
Igor Sysoev <igor@sysoev.ru>
parents:
2061
diff
changeset
|
826 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
|
827 |
|
2068
75a8d34459c5
ngx_memzero() ngx_open_file_info_t
Igor Sysoev <igor@sysoev.ru>
parents:
2063
diff
changeset
|
828 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
|
829 |
| 3178 | 830 of.read_ahead = clcf->read_ahead; |
| 2129 | 831 of.directio = clcf->directio; |
|
2063
67a29af877ed
initialize of.uniq in ngx_open_cached_file()
Igor Sysoev <igor@sysoev.ru>
parents:
2061
diff
changeset
|
832 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
|
833 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
|
834 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
|
835 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
|
836 |
|
13e09cf11d4e
Disable symlinks: initialization of the "disable_symlinks" field in
Valentin Bartenev <vbart@nginx.com>
parents:
4478
diff
changeset
|
837 if (ngx_http_set_disable_symlinks(r, clcf, &path, &of) != NGX_OK) { |
|
7526
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
838 ctx->error = 1; |
|
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
839 croak("ngx_http_set_disable_symlinks() failed"); |
|
4494
13e09cf11d4e
Disable symlinks: initialization of the "disable_symlinks" field in
Valentin Bartenev <vbart@nginx.com>
parents:
4478
diff
changeset
|
840 } |
|
2063
67a29af877ed
initialize of.uniq in ngx_open_cached_file()
Igor Sysoev <igor@sysoev.ru>
parents:
2061
diff
changeset
|
841 |
| 1799 | 842 if (ngx_open_cached_file(clcf->open_file_cache, &path, &of, r->pool) |
| 843 != NGX_OK) | |
| 844 { | |
| 1454 | 845 if (of.err == 0) { |
|
7526
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
846 ctx->error = 1; |
|
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
847 croak("ngx_open_cached_file() failed"); |
| 1454 | 848 } |
| 849 | |
| 599 | 850 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
|
851 "%s \"%s\" failed", of.failed, filename); |
|
7526
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
852 |
|
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
853 ctx->error = 1; |
|
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
854 croak("ngx_open_cached_file() failed"); |
| 599 | 855 } |
| 856 | |
| 613 | 857 if (offset == -1) { |
| 858 offset = 0; | |
| 859 } | |
| 860 | |
| 861 if (bytes == 0) { | |
| 1454 | 862 bytes = of.size - offset; |
| 599 | 863 } |
| 864 | |
| 865 b->in_file = 1; | |
| 613 | 866 |
| 867 b->file_pos = offset; | |
| 868 b->file_last = offset + bytes; | |
| 599 | 869 |
| 1454 | 870 b->file->fd = of.fd; |
| 599 | 871 b->file->log = r->connection->log; |
|
2231
8564129d49b6
*) handle unaligned file part for directio
Igor Sysoev <igor@sysoev.ru>
parents:
2136
diff
changeset
|
872 b->file->directio = of.is_directio; |
| 599 | 873 |
| 7525 | 874 rc = ngx_http_perl_output(r, ctx, b); |
| 875 | |
| 876 if (rc == NGX_ERROR) { | |
| 877 ctx->error = 1; | |
| 878 croak("ngx_http_perl_output() failed"); | |
| 879 } | |
| 599 | 880 |
| 881 | |
| 633 | 882 void |
|
1178
a77f6980de50
rename $r->rflush to $r->flush
Igor Sysoev <igor@sysoev.ru>
parents:
1075
diff
changeset
|
883 flush(r) |
| 633 | 884 CODE: |
| 599 | 885 |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
886 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
|
887 ngx_http_perl_ctx_t *ctx; |
| 7525 | 888 ngx_int_t rc; |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
889 ngx_buf_t *b; |
| 599 | 890 |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
891 ngx_http_perl_set_request(r, ctx); |
| 599 | 892 |
| 7525 | 893 if (ctx->error) { |
| 894 croak("flush(): called after error"); | |
| 895 } | |
| 896 | |
|
7528
0cb693b4cbbb
Perl: disabled unrelated calls from variable handlers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7527
diff
changeset
|
897 if (ctx->variable) { |
|
0cb693b4cbbb
Perl: disabled unrelated calls from variable handlers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7527
diff
changeset
|
898 croak("flush(): cannot be used in variable handler"); |
|
0cb693b4cbbb
Perl: disabled unrelated calls from variable handlers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7527
diff
changeset
|
899 } |
|
0cb693b4cbbb
Perl: disabled unrelated calls from variable handlers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7527
diff
changeset
|
900 |
|
7531
ede052c67512
Perl: additional ctx->header_sent checks.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7530
diff
changeset
|
901 if (!ctx->header_sent) { |
|
ede052c67512
Perl: additional ctx->header_sent checks.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7530
diff
changeset
|
902 croak("flush(): header not sent"); |
|
ede052c67512
Perl: additional ctx->header_sent checks.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7530
diff
changeset
|
903 } |
|
ede052c67512
Perl: additional ctx->header_sent checks.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7530
diff
changeset
|
904 |
| 599 | 905 b = ngx_calloc_buf(r->pool); |
| 906 if (b == NULL) { | |
|
7526
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
907 ctx->error = 1; |
|
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
908 croak("ngx_calloc_buf() failed"); |
| 599 | 909 } |
| 910 | |
| 911 b->flush = 1; | |
| 912 | |
|
1178
a77f6980de50
rename $r->rflush to $r->flush
Igor Sysoev <igor@sysoev.ru>
parents:
1075
diff
changeset
|
913 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "$r->flush"); |
| 601 | 914 |
| 7525 | 915 rc = ngx_http_perl_output(r, ctx, b); |
| 916 | |
| 917 if (rc == NGX_ERROR) { | |
| 918 ctx->error = 1; | |
| 919 croak("ngx_http_perl_output() failed"); | |
| 920 } | |
| 599 | 921 |
| 633 | 922 XSRETURN_EMPTY; |
| 599 | 923 |
| 924 | |
| 925 void | |
| 926 internal_redirect(r, uri) | |
| 633 | 927 CODE: |
| 599 | 928 |
| 633 | 929 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
|
930 ngx_http_perl_ctx_t *ctx; |
| 633 | 931 SV *uri; |
| 599 | 932 |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
933 ngx_http_perl_set_request(r, ctx); |
| 633 | 934 |
|
7528
0cb693b4cbbb
Perl: disabled unrelated calls from variable handlers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7527
diff
changeset
|
935 if (ctx->variable) { |
|
0cb693b4cbbb
Perl: disabled unrelated calls from variable handlers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7527
diff
changeset
|
936 croak("internal_redirect(): cannot be used in variable handler"); |
|
0cb693b4cbbb
Perl: disabled unrelated calls from variable handlers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7527
diff
changeset
|
937 } |
|
0cb693b4cbbb
Perl: disabled unrelated calls from variable handlers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7527
diff
changeset
|
938 |
|
7531
ede052c67512
Perl: additional ctx->header_sent checks.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7530
diff
changeset
|
939 if (ctx->header_sent) { |
|
ede052c67512
Perl: additional ctx->header_sent checks.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7530
diff
changeset
|
940 croak("internal_redirect(): header already sent"); |
|
ede052c67512
Perl: additional ctx->header_sent checks.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7530
diff
changeset
|
941 } |
|
ede052c67512
Perl: additional ctx->header_sent checks.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7530
diff
changeset
|
942 |
| 633 | 943 uri = ST(1); |
| 599 | 944 |
| 945 if (ngx_http_perl_sv2str(aTHX_ r, &ctx->redirect_uri, uri) != NGX_OK) { | |
|
7526
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
946 ctx->error = 1; |
|
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
947 croak("ngx_http_perl_sv2str() failed"); |
| 599 | 948 } |
| 949 | |
| 601 | 950 |
| 633 | 951 void |
| 811 | 952 allow_ranges(r) |
| 953 CODE: | |
| 954 | |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
955 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
|
956 ngx_http_perl_ctx_t *ctx; |
| 811 | 957 |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
958 ngx_http_perl_set_request(r, ctx); |
| 811 | 959 |
|
7528
0cb693b4cbbb
Perl: disabled unrelated calls from variable handlers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7527
diff
changeset
|
960 if (ctx->variable) { |
|
0cb693b4cbbb
Perl: disabled unrelated calls from variable handlers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7527
diff
changeset
|
961 croak("allow_ranges(): cannot be used in variable handler"); |
|
0cb693b4cbbb
Perl: disabled unrelated calls from variable handlers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7527
diff
changeset
|
962 } |
|
0cb693b4cbbb
Perl: disabled unrelated calls from variable handlers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7527
diff
changeset
|
963 |
| 811 | 964 r->allow_ranges = 1; |
| 965 | |
| 966 | |
| 967 void | |
| 601 | 968 unescape(r, text, type = 0) |
| 969 CODE: | |
| 970 | |
| 633 | 971 dXSTARG; |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
972 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
|
973 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
|
974 SV *text; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
975 int type; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
976 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
|
977 STRLEN len; |
| 601 | 978 |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
979 ngx_http_perl_set_request(r, ctx); |
| 633 | 980 |
| 981 text = ST(1); | |
| 982 | |
| 983 src = (u_char *) SvPV(text, len); | |
| 984 | |
| 2049 | 985 p = ngx_pnalloc(r->pool, len + 1); |
| 601 | 986 if (p == NULL) { |
|
7526
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
987 ctx->error = 1; |
|
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
988 croak("ngx_pnalloc() failed"); |
| 601 | 989 } |
| 990 | |
| 991 dst = p; | |
| 992 | |
| 633 | 993 type = items < 3 ? 0 : SvIV(ST(2)); |
| 994 | |
| 995 ngx_unescape_uri(&dst, &src, len, (ngx_uint_t) type); | |
| 601 | 996 *dst = '\0'; |
| 997 | |
|
1739
5b7baef2e11e
copy return values to perl's allocated memory
Igor Sysoev <igor@sysoev.ru>
parents:
1703
diff
changeset
|
998 ngx_http_perl_set_targ(p, dst - p); |
| 601 | 999 |
| 633 | 1000 ST(0) = TARG; |
| 833 | 1001 |
| 1002 | |
| 1003 void | |
| 1004 variable(r, name, value = NULL) | |
| 1005 CODE: | |
| 1006 | |
| 1007 dXSTARG; | |
| 1008 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
|
1009 ngx_http_perl_ctx_t *ctx; |
| 833 | 1010 SV *name, *value; |
| 1011 u_char *p, *lowcase; | |
| 1012 STRLEN len; | |
| 1013 ngx_str_t var, val; | |
| 1014 ngx_uint_t i, hash; | |
|
912
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
1015 ngx_http_perl_var_t *v; |
| 833 | 1016 ngx_http_variable_value_t *vv; |
| 1017 | |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
1018 ngx_http_perl_set_request(r, ctx); |
| 833 | 1019 |
| 1020 name = ST(1); | |
| 1021 | |
| 1022 if (SvROK(name) && SvTYPE(SvRV(name)) == SVt_PV) { | |
| 1023 name = SvRV(name); | |
| 1024 } | |
| 1025 | |
| 1026 if (items == 2) { | |
| 1027 value = NULL; | |
| 1028 | |
| 1029 } else { | |
| 1030 value = ST(2); | |
| 1031 | |
| 1032 if (SvROK(value) && SvTYPE(SvRV(value)) == SVt_PV) { | |
| 1033 value = SvRV(value); | |
| 1034 } | |
| 1035 | |
| 1036 if (ngx_http_perl_sv2str(aTHX_ r, &val, value) != NGX_OK) { | |
|
7526
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
1037 ctx->error = 1; |
|
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
1038 croak("ngx_http_perl_sv2str() failed"); |
| 833 | 1039 } |
| 1040 } | |
| 1041 | |
| 1042 p = (u_char *) SvPV(name, len); | |
| 1043 | |
| 2049 | 1044 lowcase = ngx_pnalloc(r->pool, len); |
| 833 | 1045 if (lowcase == NULL) { |
|
7526
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
1046 ctx->error = 1; |
|
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
1047 croak("ngx_pnalloc() failed"); |
| 833 | 1048 } |
| 1049 | |
| 2136 | 1050 hash = ngx_hash_strlow(lowcase, p, len); |
| 833 | 1051 |
| 1052 var.len = len; | |
| 1053 var.data = lowcase; | |
|
5306
43900b822890
Perl: fixed syntax usage for C preprocessor directives.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5248
diff
changeset
|
1054 #if (NGX_DEBUG) |
|
912
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
1055 |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
1056 if (value) { |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
1057 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
|
1058 "perl variable: \"%V\"=\"%V\"", &var, &val); |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
1059 } else { |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
1060 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
|
1061 "perl variable: \"%V\"", &var); |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
1062 } |
|
5306
43900b822890
Perl: fixed syntax usage for C preprocessor directives.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5248
diff
changeset
|
1063 #endif |
|
912
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
1064 |
|
3500
0eb46e3c5c02
change processing variables accessed by SSI and perl module:
Igor Sysoev <igor@sysoev.ru>
parents:
3447
diff
changeset
|
1065 vv = ngx_http_get_variable(r, &var, hash); |
| 833 | 1066 if (vv == NULL) { |
|
7526
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
1067 ctx->error = 1; |
|
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
1068 croak("ngx_http_get_variable() failed"); |
| 833 | 1069 } |
| 1070 | |
| 1071 if (vv->not_found) { | |
|
912
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
1072 |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
1073 if (ctx->variables) { |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
1074 |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
1075 v = ctx->variables->elts; |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
1076 for (i = 0; i < ctx->variables->nelts; i++) { |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
1077 |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
1078 if (hash != v[i].hash |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
1079 || len != v[i].name.len |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
1080 || 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
|
1081 { |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
1082 continue; |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
1083 } |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
1084 |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
1085 if (value) { |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
1086 v[i].value = val; |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
1087 XSRETURN_UNDEF; |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
1088 } |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
1089 |
|
1739
5b7baef2e11e
copy return values to perl's allocated memory
Igor Sysoev <igor@sysoev.ru>
parents:
1703
diff
changeset
|
1090 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
|
1091 |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
1092 goto done; |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
1093 } |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
1094 } |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
1095 |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
1096 if (value) { |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
1097 if (ctx->variables == NULL) { |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
1098 ctx->variables = ngx_array_create(r->pool, 1, |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
1099 sizeof(ngx_http_perl_var_t)); |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
1100 if (ctx->variables == NULL) { |
|
7526
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
1101 ctx->error = 1; |
|
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
1102 croak("ngx_array_create() failed"); |
|
912
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
1103 } |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
1104 } |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
1105 |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
1106 v = ngx_array_push(ctx->variables); |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
1107 if (v == NULL) { |
|
7526
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
1108 ctx->error = 1; |
|
8125552a10ca
Perl: handling of allocation errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7525
diff
changeset
|
1109 croak("ngx_array_push() failed"); |
|
912
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
1110 } |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
1111 |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
1112 v->hash = hash; |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
1113 v->name.len = len; |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
1114 v->name.data = lowcase; |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
1115 v->value = val; |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
1116 |
| 833 | 1117 XSRETURN_UNDEF; |
| 1118 } | |
| 1119 | |
| 1120 XSRETURN_UNDEF; | |
| 1121 } | |
| 1122 | |
| 1123 if (value) { | |
| 1124 vv->len = val.len; | |
| 1125 vv->valid = 1; | |
| 1565 | 1126 vv->no_cacheable = 0; |
| 833 | 1127 vv->not_found = 0; |
| 1128 vv->data = val.data; | |
| 1129 | |
| 1130 XSRETURN_UNDEF; | |
| 1131 } | |
| 1132 | |
|
1739
5b7baef2e11e
copy return values to perl's allocated memory
Igor Sysoev <igor@sysoev.ru>
parents:
1703
diff
changeset
|
1133 ngx_http_perl_set_targ(vv->data, vv->len); |
| 833 | 1134 |
|
912
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
1135 done: |
|
7fa926a7926d
$r->variable() supports perl only variables
Igor Sysoev <igor@sysoev.ru>
parents:
911
diff
changeset
|
1136 |
| 833 | 1137 ST(0) = TARG; |
| 907 | 1138 |
| 1139 | |
| 1140 void | |
| 911 | 1141 sleep(r, sleep, next) |
| 1142 CODE: | |
| 1143 | |
| 1144 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
|
1145 ngx_http_perl_ctx_t *ctx; |
| 1897 | 1146 ngx_msec_t sleep; |
| 911 | 1147 |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
1148 ngx_http_perl_set_request(r, ctx); |
| 911 | 1149 |
|
7528
0cb693b4cbbb
Perl: disabled unrelated calls from variable handlers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7527
diff
changeset
|
1150 if (ctx->variable) { |
|
0cb693b4cbbb
Perl: disabled unrelated calls from variable handlers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7527
diff
changeset
|
1151 croak("sleep(): cannot be used in variable handler"); |
|
0cb693b4cbbb
Perl: disabled unrelated calls from variable handlers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7527
diff
changeset
|
1152 } |
|
0cb693b4cbbb
Perl: disabled unrelated calls from variable handlers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7527
diff
changeset
|
1153 |
|
7527
02cd116ebe2a
Perl: protection against duplicate $r->sleep() calls.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7526
diff
changeset
|
1154 if (ctx->next) { |
|
02cd116ebe2a
Perl: protection against duplicate $r->sleep() calls.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7526
diff
changeset
|
1155 croak("sleep(): another handler active"); |
|
02cd116ebe2a
Perl: protection against duplicate $r->sleep() calls.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7526
diff
changeset
|
1156 } |
|
02cd116ebe2a
Perl: protection against duplicate $r->sleep() calls.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7526
diff
changeset
|
1157 |
| 1898 | 1158 sleep = (ngx_msec_t) SvIV(ST(1)); |
| 1897 | 1159 |
| 1160 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 1161 "perl sleep: %M", sleep); | |
| 1162 | |
| 911 | 1163 ctx->next = SvRV(ST(2)); |
| 1164 | |
|
6960
1c5e5e5b008d
Perl: fixed delaying subrequests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6233
diff
changeset
|
1165 r->connection->write->delayed = 1; |
| 1897 | 1166 ngx_add_timer(r->connection->write, sleep); |
| 1167 | |
| 1168 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
|
1169 r->main->count++; |
| 911 | 1170 |
| 1171 | |
| 1172 void | |
| 907 | 1173 log_error(r, err, msg) |
| 1174 CODE: | |
| 1175 | |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
1176 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
|
1177 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
|
1178 SV *err, *msg; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
1179 u_char *p; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
1180 STRLEN len; |
|
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
1181 ngx_err_t e; |
| 907 | 1182 |
|
7524
deebe988cbd7
Perl: reworked perl module to pass ctx instead of request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7516
diff
changeset
|
1183 ngx_http_perl_set_request(r, ctx); |
| 907 | 1184 |
| 1185 err = ST(1); | |
| 1186 | |
| 1187 if (SvROK(err) && SvTYPE(SvRV(err)) == SVt_PV) { | |
| 1188 err = SvRV(err); | |
| 1189 } | |
| 1190 | |
| 1191 e = SvIV(err); | |
| 1192 | |
| 1193 msg = ST(2); | |
| 1194 | |
| 1195 if (SvROK(msg) && SvTYPE(SvRV(msg)) == SVt_PV) { | |
| 1196 msg = SvRV(msg); | |
| 1197 } | |
| 1198 | |
| 1199 p = (u_char *) SvPV(msg, len); | |
| 1200 | |
| 910 | 1201 ngx_log_error(NGX_LOG_ERR, r->connection->log, e, "perl: %s", p); |