View | Details | Raw Unified | Return to bug 56541
Collapse All | Expand All

(-)modules/proxy/proxy_util.c (-1 / +3 lines)
Lines 3235-3241 PROXY_DECLARE(int) ap_proxy_create_hdrbrgd(apr_poo Link Here
3235
        buf = apr_pstrcat(p, r->method, " ", url, " HTTP/1.1" CRLF, NULL);
3235
        buf = apr_pstrcat(p, r->method, " ", url, " HTTP/1.1" CRLF, NULL);
3236
    }
3236
    }
3237
    if (apr_table_get(r->subprocess_env, "proxy-nokeepalive")) {
3237
    if (apr_table_get(r->subprocess_env, "proxy-nokeepalive")) {
3238
        origin->keepalive = AP_CONN_CLOSE;
3238
        if (origin) {
3239
            origin->keepalive = AP_CONN_CLOSE;
3240
        }
3239
        p_conn->close = 1;
3241
        p_conn->close = 1;
3240
    }
3242
    }
3241
    ap_xlate_proto_to_ascii(buf, strlen(buf));
3243
    ap_xlate_proto_to_ascii(buf, strlen(buf));
(-)modules/proxy/mod_proxy_http.c (-78 / +216 lines)
Lines 234-240 static int stream_reqbody_chunked(apr_pool_t *p, Link Here
234
                                           proxy_conn_rec *p_conn,
234
                                           proxy_conn_rec *p_conn,
235
                                           conn_rec *origin,
235
                                           conn_rec *origin,
236
                                           apr_bucket_brigade *header_brigade,
236
                                           apr_bucket_brigade *header_brigade,
237
                                           apr_bucket_brigade *input_brigade)
237
                                           apr_bucket_brigade *input_brigade,
238
                                           int flushall)
238
{
239
{
239
    int seen_eos = 0, rv = OK;
240
    int seen_eos = 0, rv = OK;
240
    apr_size_t hdr_len;
241
    apr_size_t hdr_len;
Lines 247-260 static int stream_reqbody_chunked(apr_pool_t *p, Link Here
247
    add_te_chunked(p, bucket_alloc, header_brigade);
248
    add_te_chunked(p, bucket_alloc, header_brigade);
248
    terminate_headers(bucket_alloc, header_brigade);
249
    terminate_headers(bucket_alloc, header_brigade);
249
250
250
    while (!APR_BUCKET_IS_EOS(APR_BRIGADE_FIRST(input_brigade)))
251
    while (APR_BRIGADE_EMPTY(input_brigade) ||
252
            !APR_BUCKET_IS_EOS(APR_BRIGADE_FIRST(input_brigade)))
251
    {
253
    {
254
        int flush = flushall;
255
256
        if (!APR_BRIGADE_EMPTY(input_brigade)) {
252
        char chunk_hdr[20];  /* must be here due to transient bucket. */
257
        char chunk_hdr[20];  /* must be here due to transient bucket. */
253
258
254
        /* If this brigade contains EOS, either stop or remove it. */
259
        /* If this brigade contains EOS, either stop or remove it. */
255
        if (APR_BUCKET_IS_EOS(APR_BRIGADE_LAST(input_brigade))) {
260
        if (APR_BUCKET_IS_EOS(APR_BRIGADE_LAST(input_brigade))) {
256
            seen_eos = 1;
261
            seen_eos = 1;
257
262
263
            /* The request is flushed below this loop with the EOS chunk */
264
            flush = 0;
265
258
            /* We can't pass this EOS to the output_filters. */
266
            /* We can't pass this EOS to the output_filters. */
259
            e = APR_BRIGADE_LAST(input_brigade);
267
            e = APR_BRIGADE_LAST(input_brigade);
260
            apr_bucket_delete(e);
268
            apr_bucket_delete(e);
Lines 276-281 static int stream_reqbody_chunked(apr_pool_t *p, Link Here
276
         */
284
         */
277
        e = apr_bucket_immortal_create(ASCII_CRLF, 2, bucket_alloc);
285
        e = apr_bucket_immortal_create(ASCII_CRLF, 2, bucket_alloc);
278
        APR_BRIGADE_INSERT_TAIL(input_brigade, e);
286
        APR_BRIGADE_INSERT_TAIL(input_brigade, e);
287
        }
279
288
280
        if (header_brigade) {
289
        if (header_brigade) {
281
            /* we never sent the header brigade, so go ahead and
290
            /* we never sent the header brigade, so go ahead and
Lines 283-288 static int stream_reqbody_chunked(apr_pool_t *p, Link Here
283
             */
292
             */
284
            bb = header_brigade;
293
            bb = header_brigade;
285
294
295
            /* Flush the prefeched data now to minimize the delay between
296
             * connect (or ap_proxy_is_socket_connected) and the first bytes
297
             * sent, unless it is done below this loop with the EOS chunk.
298
             */
299
            flush = !seen_eos;
300
286
            /*
301
            /*
287
             * Save input_brigade in bb brigade. (At least) in the SSL case
302
             * Save input_brigade in bb brigade. (At least) in the SSL case
288
             * input_brigade contains transient buckets whose data would get
303
             * input_brigade contains transient buckets whose data would get
Lines 303-310 static int stream_reqbody_chunked(apr_pool_t *p, Link Here
303
            bb = input_brigade;
318
            bb = input_brigade;
304
        }
319
        }
305
320
306
        /* The request is flushed below this loop with chunk EOS header */
321
        rv = ap_proxy_pass_brigade(bucket_alloc, r, p_conn, origin, bb, flush);
307
        rv = ap_proxy_pass_brigade(bucket_alloc, r, p_conn, origin, bb, 0);
308
        if (rv != OK) {
322
        if (rv != OK) {
309
            return rv;
323
            return rv;
310
        }
324
        }
Lines 366-372 static int stream_reqbody_cl(apr_pool_t *p, Link Here
366
                                      conn_rec *origin,
380
                                      conn_rec *origin,
367
                                      apr_bucket_brigade *header_brigade,
381
                                      apr_bucket_brigade *header_brigade,
368
                                      apr_bucket_brigade *input_brigade,
382
                                      apr_bucket_brigade *input_brigade,
369
                                      char *old_cl_val)
383
                                      char *old_cl_val, int flushall)
370
{
384
{
371
    int seen_eos = 0, rv = 0;
385
    int seen_eos = 0, rv = 0;
372
    apr_status_t status = APR_SUCCESS;
386
    apr_status_t status = APR_SUCCESS;
Lines 392-399 static int stream_reqbody_cl(apr_pool_t *p, Link Here
392
    }
406
    }
393
    terminate_headers(bucket_alloc, header_brigade);
407
    terminate_headers(bucket_alloc, header_brigade);
394
408
395
    while (!APR_BUCKET_IS_EOS(APR_BRIGADE_FIRST(input_brigade)))
409
    while (APR_BRIGADE_EMPTY(input_brigade) ||
410
            !APR_BUCKET_IS_EOS(APR_BRIGADE_FIRST(input_brigade)))
396
    {
411
    {
412
        int flush = flushall;
413
414
        if (!APR_BRIGADE_EMPTY(input_brigade)) {
397
        apr_brigade_length(input_brigade, 1, &bytes);
415
        apr_brigade_length(input_brigade, 1, &bytes);
398
        bytes_streamed += bytes;
416
        bytes_streamed += bytes;
399
417
Lines 401-406 static int stream_reqbody_cl(apr_pool_t *p, Link Here
401
        if (APR_BUCKET_IS_EOS(APR_BRIGADE_LAST(input_brigade))) {
419
        if (APR_BUCKET_IS_EOS(APR_BRIGADE_LAST(input_brigade))) {
402
            seen_eos = 1;
420
            seen_eos = 1;
403
421
422
            /* Once we hit EOS, we are ready to flush. */
423
            flush = 1;
424
404
            /* We can't pass this EOS to the output_filters. */
425
            /* We can't pass this EOS to the output_filters. */
405
            e = APR_BRIGADE_LAST(input_brigade);
426
            e = APR_BRIGADE_LAST(input_brigade);
406
            apr_bucket_delete(e);
427
            apr_bucket_delete(e);
Lines 427-432 static int stream_reqbody_cl(apr_pool_t *p, Link Here
427
                          bytes_streamed, cl_val);
448
                          bytes_streamed, cl_val);
428
            return HTTP_INTERNAL_SERVER_ERROR;
449
            return HTTP_INTERNAL_SERVER_ERROR;
429
        }
450
        }
451
        }
430
452
431
        if (header_brigade) {
453
        if (header_brigade) {
432
            /* we never sent the header brigade, so go ahead and
454
            /* we never sent the header brigade, so go ahead and
Lines 434-439 static int stream_reqbody_cl(apr_pool_t *p, Link Here
434
             */
456
             */
435
            bb = header_brigade;
457
            bb = header_brigade;
436
458
459
            /* Flush prefeched data now to minimize the delay between connect,
460
             * or ap_proxy_is_socket_connected, and the first bytes sent.
461
             */
462
            flush = 1;
463
437
            /*
464
            /*
438
             * Save input_brigade in bb brigade. (At least) in the SSL case
465
             * Save input_brigade in bb brigade. (At least) in the SSL case
439
             * input_brigade contains transient buckets whose data would get
466
             * input_brigade contains transient buckets whose data would get
Lines 454-463 static int stream_reqbody_cl(apr_pool_t *p, Link Here
454
            bb = input_brigade;
481
            bb = input_brigade;
455
        }
482
        }
456
483
457
        /* Once we hit EOS, we are ready to flush. */
484
        rv = ap_proxy_pass_brigade(bucket_alloc, r, p_conn, origin, bb, flush);
458
        rv = ap_proxy_pass_brigade(bucket_alloc, r, p_conn, origin, bb, seen_eos);
459
        if (rv != OK) {
485
        if (rv != OK) {
460
            return rv ;
486
            return rv;
461
        }
487
        }
462
488
463
        if (seen_eos) {
489
        if (seen_eos) {
Lines 499-506 static int stream_reqbody_cl(apr_pool_t *p, Link Here
499
525
500
static int spool_reqbody_cl(apr_pool_t *p,
526
static int spool_reqbody_cl(apr_pool_t *p,
501
                                     request_rec *r,
527
                                     request_rec *r,
502
                                     proxy_conn_rec *p_conn,
503
                                     conn_rec *origin,
504
                                     apr_bucket_brigade *header_brigade,
528
                                     apr_bucket_brigade *header_brigade,
505
                                     apr_bucket_brigade *input_brigade,
529
                                     apr_bucket_brigade *input_brigade,
506
                                     int force_cl)
530
                                     int force_cl)
Lines 518-525 static int spool_reqbody_cl(apr_pool_t *p, Link Here
518
542
519
    limit = ap_get_limit_req_body(r);
543
    limit = ap_get_limit_req_body(r);
520
544
521
    while (!APR_BUCKET_IS_EOS(APR_BRIGADE_FIRST(input_brigade)))
545
    while (APR_BRIGADE_EMPTY(input_brigade) ||
546
            !APR_BUCKET_IS_EOS(APR_BRIGADE_FIRST(input_brigade)))
522
    {
547
    {
548
        if (!APR_BRIGADE_EMPTY(input_brigade)) {
523
        /* If this brigade contains EOS, either stop or remove it. */
549
        /* If this brigade contains EOS, either stop or remove it. */
524
        if (APR_BUCKET_IS_EOS(APR_BRIGADE_LAST(input_brigade))) {
550
        if (APR_BUCKET_IS_EOS(APR_BRIGADE_LAST(input_brigade))) {
525
            seen_eos = 1;
551
            seen_eos = 1;
Lines 612-617 static int spool_reqbody_cl(apr_pool_t *p, Link Here
612
        if (seen_eos) {
638
        if (seen_eos) {
613
            break;
639
            break;
614
        }
640
        }
641
        }
615
642
616
        status = ap_get_brigade(r->input_filters, input_brigade,
643
        status = ap_get_brigade(r->input_filters, input_brigade,
617
                                AP_MODE_READBYTES, APR_BLOCK_READ,
644
                                AP_MODE_READBYTES, APR_BLOCK_READ,
Lines 620-628 static int spool_reqbody_cl(apr_pool_t *p, Link Here
620
        if (status != APR_SUCCESS) {
647
        if (status != APR_SUCCESS) {
621
            conn_rec *c = r->connection;
648
            conn_rec *c = r->connection;
622
            ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r, APLOGNO(02610)
649
            ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r, APLOGNO(02610)
623
                          "read request body failed to %pI (%s)"
650
                          "read request body failed from %s (%s)",
624
                          " from %s (%s)", p_conn->addr,
625
                          p_conn->hostname ? p_conn->hostname: "",
626
                          c->client_ip, c->remote_host ? c->remote_host: "");
651
                          c->client_ip, c->remote_host ? c->remote_host: "");
627
            return HTTP_BAD_REQUEST;
652
            return HTTP_BAD_REQUEST;
628
        }
653
        }
Lines 640-647 static int spool_reqbody_cl(apr_pool_t *p, Link Here
640
        e = apr_bucket_immortal_create(ASCII_CRLF, 2, bucket_alloc);
665
        e = apr_bucket_immortal_create(ASCII_CRLF, 2, bucket_alloc);
641
        APR_BRIGADE_INSERT_TAIL(header_brigade, e);
666
        APR_BRIGADE_INSERT_TAIL(header_brigade, e);
642
    }
667
    }
643
    /* This is all a single brigade, pass with flush flagged */
668
    return OK;
644
    return(ap_proxy_pass_brigade(bucket_alloc, r, p_conn, origin, header_brigade, 1));
645
}
669
}
646
670
647
/*
671
/*
Lines 671-678 static apr_status_t proxy_buckets_lifetime_transfo Link Here
671
         e != APR_BRIGADE_SENTINEL(from);
695
         e != APR_BRIGADE_SENTINEL(from);
672
         e = APR_BUCKET_NEXT(e)) {
696
         e = APR_BUCKET_NEXT(e)) {
673
        if (!APR_BUCKET_IS_METADATA(e)) {
697
        if (!APR_BUCKET_IS_METADATA(e)) {
674
            apr_bucket_read(e, &data, &bytes, APR_BLOCK_READ);
698
            if (APR_BUCKET_IS_FILE(e) &&
675
            new = apr_bucket_transient_create(data, bytes, r->connection->bucket_alloc);
699
                    e->list == r->connection->bucket_alloc) {
700
                apr_bucket_copy(e, &new);
701
            }
702
            else {
703
                apr_bucket_read(e, &data, &bytes, APR_BLOCK_READ);
704
                new = apr_bucket_transient_create(data, bytes,
705
                                                  r->connection->bucket_alloc);
706
            }
676
            APR_BRIGADE_INSERT_TAIL(to, new);
707
            APR_BRIGADE_INSERT_TAIL(to, new);
677
        }
708
        }
678
        else if (APR_BUCKET_IS_FLUSH(e)) {
709
        else if (APR_BUCKET_IS_FLUSH(e)) {
Lines 694-721 static apr_status_t proxy_buckets_lifetime_transfo Link Here
694
    return rv;
725
    return rv;
695
}
726
}
696
727
697
static
728
enum rb_methods {
698
int ap_proxy_http_request(apr_pool_t *p, request_rec *r,
729
    RB_INIT,
699
                                   proxy_conn_rec *p_conn, proxy_worker *worker,
730
    RB_STREAM_CL,
700
                                   proxy_server_conf *conf,
731
    RB_STREAM_CHUNKED,
701
                                   apr_uri_t *uri,
732
    RB_SPOOL_CL
702
                                   char *url, char *server_portstr)
733
};
734
735
static int ap_proxy_http_prefetch(apr_pool_t *p, request_rec *r,
736
                                  proxy_conn_rec *p_conn, proxy_worker *worker,
737
                                  proxy_server_conf *conf,
738
                                  apr_uri_t *uri,
739
                                  char *url, char *server_portstr,
740
                                  apr_bucket_brigade *header_brigade,
741
                                  apr_bucket_brigade *input_brigade,
742
                                  char **old_cl_val, char **old_te_val,
743
                                  enum rb_methods *rb_method, int flushall)
703
{
744
{
704
    conn_rec *c = r->connection;
745
    conn_rec *c = r->connection;
705
    apr_bucket_alloc_t *bucket_alloc = c->bucket_alloc;
746
    apr_bucket_alloc_t *bucket_alloc = c->bucket_alloc;
706
    apr_bucket_brigade *header_brigade;
707
    apr_bucket_brigade *input_brigade;
708
    apr_bucket_brigade *temp_brigade;
747
    apr_bucket_brigade *temp_brigade;
709
    apr_bucket *e;
748
    apr_bucket *e;
710
    char *buf;
749
    char *buf;
711
    apr_status_t status;
750
    apr_status_t status;
712
    enum rb_methods {RB_INIT, RB_STREAM_CL, RB_STREAM_CHUNKED, RB_SPOOL_CL};
713
    enum rb_methods rb_method = RB_INIT;
714
    char *old_cl_val = NULL;
715
    char *old_te_val = NULL;
716
    apr_off_t bytes_read = 0;
751
    apr_off_t bytes_read = 0;
717
    apr_off_t bytes;
752
    apr_off_t bytes;
718
    int force10, rv;
753
    int force10, rv;
754
    apr_read_type_e block;
719
    conn_rec *origin = p_conn->connection;
755
    conn_rec *origin = p_conn->connection;
720
756
721
    if (apr_table_get(r->subprocess_env, "force-proxy-request-1.0")) {
757
    if (apr_table_get(r->subprocess_env, "force-proxy-request-1.0")) {
Lines 727-743 static apr_status_t proxy_buckets_lifetime_transfo Link Here
727
        force10 = 0;
763
        force10 = 0;
728
    }
764
    }
729
765
730
    header_brigade = apr_brigade_create(p, bucket_alloc);
731
    rv = ap_proxy_create_hdrbrgd(p, header_brigade, r, p_conn,
766
    rv = ap_proxy_create_hdrbrgd(p, header_brigade, r, p_conn,
732
                                 worker, conf, uri, url, server_portstr,
767
                                 worker, conf, uri, url, server_portstr,
733
                                 &old_cl_val, &old_te_val);
768
                                 old_cl_val, old_te_val);
734
    if (rv != OK) {
769
    if (rv != OK) {
735
        return rv;
770
        return rv;
736
    }
771
    }
737
772
738
    /* We have headers, let's figure out our request body... */
739
    input_brigade = apr_brigade_create(p, bucket_alloc);
740
741
    /* sub-requests never use keepalives, and mustn't pass request bodies.
773
    /* sub-requests never use keepalives, and mustn't pass request bodies.
742
     * Because the new logic looks at input_brigade, we will self-terminate
774
     * Because the new logic looks at input_brigade, we will self-terminate
743
     * input_brigade and jump past all of the request body logic...
775
     * input_brigade and jump past all of the request body logic...
Lines 750-758 static apr_status_t proxy_buckets_lifetime_transfo Link Here
750
    if (!r->kept_body && r->main) {
782
    if (!r->kept_body && r->main) {
751
        /* XXX: Why DON'T sub-requests use keepalives? */
783
        /* XXX: Why DON'T sub-requests use keepalives? */
752
        p_conn->close = 1;
784
        p_conn->close = 1;
753
        old_cl_val = NULL;
785
        *old_cl_val = NULL;
754
        old_te_val = NULL;
786
        *old_te_val = NULL;
755
        rb_method = RB_STREAM_CL;
787
        *rb_method = RB_STREAM_CL;
756
        e = apr_bucket_eos_create(input_brigade->bucket_alloc);
788
        e = apr_bucket_eos_create(input_brigade->bucket_alloc);
757
        APR_BRIGADE_INSERT_TAIL(input_brigade, e);
789
        APR_BRIGADE_INSERT_TAIL(input_brigade, e);
758
        goto skip_body;
790
        goto skip_body;
Lines 766-783 static apr_status_t proxy_buckets_lifetime_transfo Link Here
766
     * encoding has been done by the extensions' handler, and
798
     * encoding has been done by the extensions' handler, and
767
     * do not modify add_te_chunked's logic
799
     * do not modify add_te_chunked's logic
768
     */
800
     */
769
    if (old_te_val && strcasecmp(old_te_val, "chunked") != 0) {
801
    if (*old_te_val && strcasecmp(*old_te_val, "chunked") != 0) {
770
        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01093)
802
        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01093)
771
                      "%s Transfer-Encoding is not supported", old_te_val);
803
                      "%s Transfer-Encoding is not supported", *old_te_val);
772
        return HTTP_INTERNAL_SERVER_ERROR;
804
        return HTTP_INTERNAL_SERVER_ERROR;
773
    }
805
    }
774
806
775
    if (old_cl_val && old_te_val) {
807
    if (*old_cl_val && *old_te_val) {
776
        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01094)
808
        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01094)
777
                      "client %s (%s) requested Transfer-Encoding "
809
                      "client %s (%s) requested Transfer-Encoding "
778
                      "chunked body with Content-Length (C-L ignored)",
810
                      "chunked body with Content-Length (C-L ignored)",
779
                      c->client_ip, c->remote_host ? c->remote_host: "");
811
                      c->client_ip, c->remote_host ? c->remote_host: "");
780
        old_cl_val = NULL;
812
        *old_cl_val = NULL;
781
        origin->keepalive = AP_CONN_CLOSE;
813
        origin->keepalive = AP_CONN_CLOSE;
782
        p_conn->close = 1;
814
        p_conn->close = 1;
783
    }
815
    }
Lines 791-800 static apr_status_t proxy_buckets_lifetime_transfo Link Here
791
     * reasonable size.
823
     * reasonable size.
792
     */
824
     */
793
    temp_brigade = apr_brigade_create(p, bucket_alloc);
825
    temp_brigade = apr_brigade_create(p, bucket_alloc);
826
    block = (flushall) ? APR_NONBLOCK_READ : APR_BLOCK_READ;
794
    do {
827
    do {
795
        status = ap_get_brigade(r->input_filters, temp_brigade,
828
        status = ap_get_brigade(r->input_filters, temp_brigade,
796
                                AP_MODE_READBYTES, APR_BLOCK_READ,
829
                                AP_MODE_READBYTES, block,
797
                                MAX_MEM_SPOOL - bytes_read);
830
                                MAX_MEM_SPOOL - bytes_read);
831
        /* ap_get_brigade will return success with an empty brigade
832
         * for a non-blocking read which would block
833
         */
834
        if (block == APR_NONBLOCK_READ
835
            && (APR_STATUS_IS_EAGAIN(rv)
836
                || (rv == APR_SUCCESS && APR_BRIGADE_EMPTY(temp_brigade)))) {
837
            status = APR_SUCCESS;
838
            break;
839
        }
798
        if (status != APR_SUCCESS) {
840
        if (status != APR_SUCCESS) {
799
            ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r, APLOGNO(01095)
841
            ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r, APLOGNO(01095)
800
                          "prefetch request body failed to %pI (%s)"
842
                          "prefetch request body failed to %pI (%s)"
Lines 869-875 static apr_status_t proxy_buckets_lifetime_transfo Link Here
869
     * is absent, and the filters are unchanged (the body won't
911
     * is absent, and the filters are unchanged (the body won't
870
     * be resized by another content filter).
912
     * be resized by another content filter).
871
     */
913
     */
872
    if (APR_BUCKET_IS_EOS(APR_BRIGADE_LAST(input_brigade))) {
914
    if (!APR_BRIGADE_EMPTY(input_brigade) &&
915
            APR_BUCKET_IS_EOS(APR_BRIGADE_LAST(input_brigade))) {
873
        /* The whole thing fit, so our decision is trivial, use
916
        /* The whole thing fit, so our decision is trivial, use
874
         * the filtered bytes read from the client for the request
917
         * the filtered bytes read from the client for the request
875
         * body Content-Length.
918
         * body Content-Length.
Lines 877-920 static apr_status_t proxy_buckets_lifetime_transfo Link Here
877
         * If we expected no body, and read no body, do not set
920
         * If we expected no body, and read no body, do not set
878
         * the Content-Length.
921
         * the Content-Length.
879
         */
922
         */
880
        if (old_cl_val || old_te_val || bytes_read) {
923
        if (*old_cl_val || *old_te_val || bytes_read) {
881
            old_cl_val = apr_off_t_toa(r->pool, bytes_read);
924
            *old_cl_val = apr_off_t_toa(r->pool, bytes_read);
882
        }
925
        }
883
        rb_method = RB_STREAM_CL;
926
        *rb_method = RB_STREAM_CL;
884
    }
927
    }
885
    else if (old_te_val) {
928
    else if (*old_te_val) {
886
        if (force10
929
        if (force10
887
             || (apr_table_get(r->subprocess_env, "proxy-sendcl")
930
             || (!flushall
888
                  && !apr_table_get(r->subprocess_env, "proxy-sendchunks")
931
                 && apr_table_get(r->subprocess_env, "proxy-sendcl")
889
                  && !apr_table_get(r->subprocess_env, "proxy-sendchunked"))) {
932
                 && !apr_table_get(r->subprocess_env, "proxy-sendchunks")
890
            rb_method = RB_SPOOL_CL;
933
                 && !apr_table_get(r->subprocess_env, "proxy-sendchunked"))) {
934
            *rb_method = RB_SPOOL_CL;
891
        }
935
        }
892
        else {
936
        else {
893
            rb_method = RB_STREAM_CHUNKED;
937
            *rb_method = RB_STREAM_CHUNKED;
894
        }
938
        }
895
    }
939
    }
896
    else if (old_cl_val) {
940
    else if (*old_cl_val) {
897
        if (r->input_filters == r->proto_input_filters) {
941
        if (r->input_filters == r->proto_input_filters) {
898
            rb_method = RB_STREAM_CL;
942
            *rb_method = RB_STREAM_CL;
899
        }
943
        }
900
        else if (!force10
944
        else if (!force10
901
                  && (apr_table_get(r->subprocess_env, "proxy-sendchunks")
945
                  && (flushall
946
                      || apr_table_get(r->subprocess_env, "proxy-sendchunks")
902
                      || apr_table_get(r->subprocess_env, "proxy-sendchunked"))
947
                      || apr_table_get(r->subprocess_env, "proxy-sendchunked"))
903
                  && !apr_table_get(r->subprocess_env, "proxy-sendcl")) {
948
                  && !apr_table_get(r->subprocess_env, "proxy-sendcl")) {
904
            rb_method = RB_STREAM_CHUNKED;
949
            *rb_method = RB_STREAM_CHUNKED;
905
        }
950
        }
906
        else {
951
        else {
907
            rb_method = RB_SPOOL_CL;
952
            *rb_method = RB_SPOOL_CL;
908
        }
953
        }
909
    }
954
    }
910
    else {
955
    else {
911
        /* This is an appropriate default; very efficient for no-body
956
        /* This is an appropriate default; very efficient for no-body
912
         * requests, and has the behavior that it will not add any C-L
957
         * requests, and has the behavior that it will not add any C-L
913
         * when the old_cl_val is NULL.
958
         * when the *old_cl_val is NULL.
914
         */
959
         */
915
        rb_method = RB_SPOOL_CL;
960
        *rb_method = RB_SPOOL_CL;
916
    }
961
    }
917
962
963
    /* If we have to spool the body, do it now, before connecting/reusing
964
     * the backend connection, not in the connect/reuse-then-forward window.
965
     */
966
    if (*rb_method == RB_SPOOL_CL) {
967
        rv = spool_reqbody_cl(p, r, header_brigade, input_brigade,
968
                              (*old_cl_val != NULL)
969
                              || (*old_te_val != NULL)
970
                              || (bytes_read > 0));
971
        if (rv != OK) {
972
            return rv;
973
        }
974
    }
975
918
/* Yes I hate gotos.  This is the subrequest shortcut */
976
/* Yes I hate gotos.  This is the subrequest shortcut */
919
skip_body:
977
skip_body:
920
    /*
978
    /*
Lines 934-954 skip_body: Link Here
934
        APR_BRIGADE_INSERT_TAIL(header_brigade, e);
992
        APR_BRIGADE_INSERT_TAIL(header_brigade, e);
935
    }
993
    }
936
994
995
    return OK;
996
}
997
998
static
999
int ap_proxy_http_request(apr_pool_t *p, request_rec *r,
1000
                                   proxy_conn_rec *p_conn,
1001
                                   apr_bucket_brigade *header_brigade,
1002
                                   apr_bucket_brigade *input_brigade,
1003
                                   char *old_cl_val, char *old_te_val,
1004
                                   enum rb_methods rb_method, int flushall)
1005
{
1006
    int rv;
1007
    conn_rec *origin = p_conn->connection;
1008
937
    /* send the request body, if any. */
1009
    /* send the request body, if any. */
938
    switch(rb_method) {
1010
    switch(rb_method) {
939
    case RB_STREAM_CHUNKED:
1011
    case RB_STREAM_CHUNKED:
940
        rv = stream_reqbody_chunked(p, r, p_conn, origin, header_brigade,
1012
        rv = stream_reqbody_chunked(p, r, p_conn, origin, header_brigade,
941
                                        input_brigade);
1013
                                    input_brigade, flushall);
942
        break;
1014
        break;
943
    case RB_STREAM_CL:
1015
    case RB_STREAM_CL:
944
        rv = stream_reqbody_cl(p, r, p_conn, origin, header_brigade,
1016
        rv = stream_reqbody_cl(p, r, p_conn, origin, header_brigade,
945
                                   input_brigade, old_cl_val);
1017
                               input_brigade, old_cl_val, flushall);
946
        break;
1018
        break;
947
    case RB_SPOOL_CL:
1019
    case RB_SPOOL_CL:
948
        rv = spool_reqbody_cl(p, r, p_conn, origin, header_brigade,
1020
        /* This is all a single brigade, pass with flush flagged */
949
                                  input_brigade, (old_cl_val != NULL)
1021
        rv = ap_proxy_pass_brigade(r->connection->bucket_alloc,
950
                                              || (old_te_val != NULL)
1022
                                   r, p_conn, origin, header_brigade, 1);
951
                                              || (bytes_read > 0));
952
        break;
1023
        break;
953
    default:
1024
    default:
954
        /* shouldn't be possible */
1025
        /* shouldn't be possible */
Lines 957-962 skip_body: Link Here
957
    }
1028
    }
958
1029
959
    if (rv != OK) {
1030
    if (rv != OK) {
1031
        conn_rec *c = r->connection;
960
        /* apr_status_t value has been logged in lower level method */
1032
        /* apr_status_t value has been logged in lower level method */
961
        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01097)
1033
        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01097)
962
                      "pass request body failed to %pI (%s) from %s (%s)",
1034
                      "pass request body failed to %pI (%s) from %s (%s)",
Lines 1881-1890 static int proxy_http_handler(request_rec *r, prox Link Here
1881
    char *scheme;
1953
    char *scheme;
1882
    const char *proxy_function;
1954
    const char *proxy_function;
1883
    const char *u;
1955
    const char *u;
1956
    apr_bucket_brigade *header_brigade, *header_bb;
1957
    apr_bucket_brigade *input_brigade, *input_bb;
1884
    proxy_conn_rec *backend = NULL;
1958
    proxy_conn_rec *backend = NULL;
1885
    int is_ssl = 0;
1959
    int is_ssl = 0;
1886
    conn_rec *c = r->connection;
1960
    conn_rec *c = r->connection;
1887
    int retry = 0;
1961
    int retry = 0;
1962
    char *old_cl_val = NULL, *old_te_val = NULL;
1963
    enum rb_methods rb_method = RB_INIT;
1964
    char *locurl = url;
1965
    int flushall = 0;
1966
    int toclose = 0;
1888
    /*
1967
    /*
1889
     * Use a shorter-lived pool to reduce memory usage
1968
     * Use a shorter-lived pool to reduce memory usage
1890
     * and avoid a memory leak
1969
     * and avoid a memory leak
Lines 1951-1966 static int proxy_http_handler(request_rec *r, prox Link Here
1951
        backend->close = 1;
2030
        backend->close = 1;
1952
    }
2031
    }
1953
2032
2033
    if (apr_table_get(r->subprocess_env, "proxy-flushall")) {
2034
        flushall = 1;
2035
    }
2036
2037
    /* Step One: Determine Who To Connect To */
2038
    if ((status = ap_proxy_determine_connection(p, r, conf, worker, backend,
2039
                                            uri, &locurl, proxyname,
2040
                                            proxyport, server_portstr,
2041
                                            sizeof(server_portstr))) != OK)
2042
        goto cleanup;
2043
2044
    /* Step Once: Prefetch (partially) the request body so to increase the
2045
     * chances to get whole (or enough) body and determine Content-Length vs
2046
     * chunked or spool. By doing this before connecting or reusing a backend
2047
     * connection, minimize the delay between checking whether this connection
2048
     * is still alive and the first packet sent, should the link be slow or
2049
     * some input filter retain the data.
2050
     */
2051
    input_brigade = apr_brigade_create(p, c->bucket_alloc);
2052
    header_brigade = apr_brigade_create(p, c->bucket_alloc);
2053
    if ((status = ap_proxy_http_prefetch(p, r, backend, worker, conf, uri,
2054
                    locurl, server_portstr, header_brigade, input_brigade,
2055
                    &old_cl_val, &old_te_val, &rb_method, flushall)) != OK) {
2056
        goto cleanup;
2057
    }
2058
2059
    /* XXX: Reset backend->close now, since ap_proxy_http_prefetch() sets it to
2060
     * disable the reuse of the connection after this request (no keep-alive),
2061
     * not to close any reusable connection before this request. However assure
2062
     * what is expected later by using a local flag and do the right thing when
2063
     * ap_proxy_connect_backend (below) provides the connection to close.
2064
     */
2065
    toclose = backend->close;
2066
    backend->close = 0;
2067
1954
    while (retry < 2) {
2068
    while (retry < 2) {
1955
        char *locurl = url;
2069
        conn_rec *backconn;
1956
2070
1957
        /* Step One: Determine Who To Connect To */
2071
        if (retry) {
1958
        if ((status = ap_proxy_determine_connection(p, r, conf, worker, backend,
2072
            char *newurl = url;
1959
                                                uri, &locurl, proxyname,
1960
                                                proxyport, server_portstr,
1961
                                                sizeof(server_portstr))) != OK)
1962
            break;
1963
2073
2074
            /* Step One-Retry: Redetermine Who To Connect To */
2075
            if ((status = ap_proxy_determine_connection(p, r, conf, worker,
2076
                            backend, uri, &newurl, proxyname, proxyport,
2077
                            server_portstr, sizeof(server_portstr))) != OK)
2078
                break;
2079
2080
            /* XXX: the code assumes locurl is not changed during the loop,
2081
             * or ap_proxy_http_prefetch() would have to be called every time,
2082
             * and header_brigade be changed accordingly...
2083
             */
2084
            AP_DEBUG_ASSERT(strcmp(newurl, locurl) == 0);
2085
        }
2086
1964
        /* Step Two: Make the Connection */
2087
        /* Step Two: Make the Connection */
1965
        if (ap_proxy_connect_backend(proxy_function, backend, worker, r->server)) {
2088
        if (ap_proxy_connect_backend(proxy_function, backend, worker, r->server)) {
1966
            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01114)
2089
            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01114)
Lines 1971-1980 static int proxy_http_handler(request_rec *r, prox Link Here
1971
        }
2094
        }
1972
2095
1973
        /* Step Three: Create conn_rec */
2096
        /* Step Three: Create conn_rec */
1974
        if (!backend->connection) {
2097
        backconn = backend->connection;
2098
        if (!backconn) {
1975
            if ((status = ap_proxy_connection_create(proxy_function, backend,
2099
            if ((status = ap_proxy_connection_create(proxy_function, backend,
1976
                                                     c, r->server)) != OK)
2100
                                                     c, r->server)) != OK)
1977
                break;
2101
                break;
2102
            backconn = backend->connection;
2103
1978
            /*
2104
            /*
1979
             * On SSL connections set a note on the connection what CN is
2105
             * On SSL connections set a note on the connection what CN is
1980
             * requested, such that mod_ssl can check if it is requested to do
2106
             * requested, such that mod_ssl can check if it is requested to do
Lines 2002-2013 static int proxy_http_handler(request_rec *r, prox Link Here
2002
            }
2128
            }
2003
        }
2129
        }
2004
2130
2131
        /* Don't recycle the connection if prefetch (above) told not to do so */
2132
        if (toclose) {
2133
            backend->close = 1;
2134
            backconn->keepalive = AP_CONN_CLOSE;
2135
        }
2136
2137
        /* Preserve the header/input brigades since they may be retried. */
2138
        header_bb = apr_brigade_create(p, backconn->bucket_alloc);
2139
        proxy_buckets_lifetime_transform(r, header_brigade, header_bb);
2140
        input_bb = apr_brigade_create(p, backconn->bucket_alloc);
2141
        proxy_buckets_lifetime_transform(r, input_brigade, input_bb);
2142
2005
        /* Step Four: Send the Request
2143
        /* Step Four: Send the Request
2006
         * On the off-chance that we forced a 100-Continue as a
2144
         * On the off-chance that we forced a 100-Continue as a
2007
         * kinda HTTP ping test, allow for retries
2145
         * kinda HTTP ping test, allow for retries
2008
         */
2146
         */
2009
        if ((status = ap_proxy_http_request(p, r, backend, worker,
2147
        if ((status = ap_proxy_http_request(p, r, backend, header_bb, input_bb,
2010
                                        conf, uri, locurl, server_portstr)) != OK) {
2148
                                            old_cl_val, old_te_val, rb_method,
2149
                                            flushall)) != OK) {
2011
            proxy_run_detach_backend(r, backend);
2150
            proxy_run_detach_backend(r, backend);
2012
            if ((status == HTTP_SERVICE_UNAVAILABLE) &&
2151
            if ((status == HTTP_SERVICE_UNAVAILABLE) &&
2013
                 worker->s->ping_timeout_set &&
2152
                 worker->s->ping_timeout_set &&
Lines 2021-2027 static int proxy_http_handler(request_rec *r, prox Link Here
2021
            } else {
2160
            } else {
2022
                break;
2161
                break;
2023
            }
2162
            }
2024
2025
        }
2163
        }
2026
2164
2027
        /* Step Five: Receive the Response... Fall thru to cleanup */
2165
        /* Step Five: Receive the Response... Fall thru to cleanup */

Return to bug 56541