Checkout Tools
  • last updated 1 hour ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merged /httpd/httpd/trunk:r1864435,1864438,1864450-1864451,1864464 from trunk:

*) modules/filters: PR 63633: Fix broken compilation when using old GCC (<4.2.x).

  1. … 5 more files in changeset.
Merge r1829038, r1829039, r1830523 from trunk:

mod_xml2enc: Fix forwarding of error metadata/responses. PR 62180.

All meta buckets are now aggregated (besides FLUSH) and forwarded down

the chain, and the output filter bails out on EOS.

Proposed by: Micha Lenk <micha lenk.info>

mod_xml2enc: follow up to r1829038.

If any, pass pending meta bucket down the chain before leaving.

mod_xml2enc: follow up to r1829038 and r1829039.

Use below pending_data logic for EOS bucket.

This closes #48

Submitted by: ylavic

Reviewed by: ylavic, jim, rpluem

  1. … 2 more files in changeset.
Merge r1704099 from trunk:

Fix a spurious test where a condition is always true:

if ((cfg->skipto != NULL) && (ctx->flags | ENC_SKIPTO)) {

^^^^^^^^^^^^^^^^^^^^^^^

This is apparently harmless because, in 'xml2enc_filter_init', the ENC_SKIPTO bit of 'flags' is set to ENC_SKIPTO if 'skipto' is non-NULL.

Submitted by: jailletc36

Reviewed/backported by: jim

  1. … 2 more files in changeset.
Merge r1615026 from trunk:

Turn some APR_BUCKET_REMOVE(e)+apr_bucket_destroy(e) into the equivalent apr_bucket_delete(e) to reduce code verbosity

Submitted by: jailletc36

Reviewed/backported by: jim

  1. … 6 more files in changeset.
Merge r1407248 from trunk:

*) mod_xml2enc: Fix problems with charset conversion altering the

Content-Length. [Micha Lenk <micha lenk info>]

Reviewed/backported by: jim

  1. … 3 more files in changeset.
fix various property issues

  1. … 38 more files in changeset.
Merge r1293717 from trunk:

Pass the EOS bucket down the filter chain

PR: 52766

Submitted by: sf

Reviewed/backported by: jim

  1. … 2 more files in changeset.
Merge r1293708:

Enable per-module loglevel for mod_xml2enc and mod_proxy_html

  1. … 4 more files in changeset.
Backport r1209766, r1210252, r1210284:

Add lots of unique tags to error log messages

ssl_util.c: Downgrade some dynamic locking messages from level DEBUG

to TRACE1-3

  1. … 164 more files in changeset.
Merge r1206850:

- Add some error handling for writing to the output filter chain.

- Add some ap_assert()s for error cases that probably should not happen (and

the following code would break).

These fix some compiler warnings about "variable 'rv' set but not used".

- Prevent a leak of a bucket in one error case.

  1. … 1 more file in changeset.