Checkout Tools
  • last updated 1 hour ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Changeset 1686271 is being indexed.

Merge r1685345, r1685347, r1685349, r1685350 from trunk:

Follow up to r1684513: allow spaces before and after chunk-size.

Slightly modified version of trawick's proposal.

Follow up to r1685345: don't accept spaces *before* the chunk-size.

Follow up to r1685345: CHANGES entry.

Follow up to r1685349: remove a tab.

Submitted by: ylavic

Reviewed/backported by: jim

  1. … 4 more files in changeset.
Merge r1680895, r1680900, r1680942 from trunk:

mod_log_config: instead of using the new dedicated

pattern format "%M" for duration milliseconds,

overload the existing "%D" to choose the time precision

("%{s}D" for seconds, "%{ms}D" for milliseconds and

"%{us}D" for microseconds).

The existing %T and %D without precision are kept for

compatibility.

The previously introduced "%M" (r1677187) is removed,

it has not yet been released. Format pattern characters

are rare, so we should only use a new one if an

existing one isn't a good fit.

Fix syntax.

Follow-up to r1680895:

Let %T be the format character which accepts time resolution

arguments.

Submitted by: rjung, trawick

Reviewed/backported by: jim

  1. … 5 more files in changeset.
Merge r1666468, r1666618, r1674697 from trunk:

mpm_event: Allow for timer events duplicates.

Meanwhile ap[r]_skiplist_add()...

mpm_event: follow up to r1666468.

We only need one compare function for add semantic with apr_skiplist_insert()

and unique timers (pointers). It also should work with apr_skiplist_remove()

and apr_skiplist_find(), be they used some day.

mpm_event: follow up to r1666468 and r1666618.

We don't need to return 0 in the compare function, but for debugging purpose

which we could implement later if necessary (in a separate function).

For now, keep the function simple as in 2.4.x to ease backport, and add a

comment about why we never return 0 here.

Submitted by: ylavic

Reviewed/backported by: jim

  1. … 3 more files in changeset.
Merge r1671397, r1672466, r1672564 from trunk:

Add output for "?auto" version of server-status

to proxy status, mod_ssl session cache info,

mod_cache_socache and the status hook of the

individual socache implementations.

Followon to r1671397 for proxy server-status

in auto mode:

- don't show HTML legend

- Show correct worker name

More followon to r1671397 for proxy server-status

in auto mode:

- remove remaining HTML markup

Submitted by: rjung

Reviewed/backported by: jim

  1. … 8 more files in changeset.
Merge r1671396, r1672289, r1672453 from trunk:

Add more data to "?auto" view of server-status.

Although mod_status source code calls this the

"short_report", the docs and the API flag call

it "Machine Readable" resp. "STAT_OPT_AUTO".

So IMHO the data shown should be on par with

the html version.

Followon to r1671396:

Remove unwanted redundant output introduced

by that commit.

Followon to r1671396: add misiing newline in

new server-status output.

Submitted by: rjung

Reviewed/backported by: jim

  1. … 3 more files in changeset.
Related to httpd-doc bug 53530; uniform use of quotation marks.

Put quotation marks around most arbitrary-text or filesystem

strings for directives:

* {Alias,Redirect,Proxy*}{,Match}

* <{Directory,Files,Location}{,Match}>

  1. … 85 more files in changeset.
Merge r1664071, r1664299 from trunk:

core: If explicitly configured, use the KeepaliveTimeout value of the

virtual host which handled the latest request on the connection, or by

default the one of the first virtual host bound to the same IP:port.

For non-async MPMs, use either r->server's or c->base_server's value in

ap_process_http_sync_connection() depending on a new server_rec's flag

called keep_alive_timeout_set and determined at config time.

For event MPM, use a queue per timeout value, chaining the queues per

type (keepalive wrt KeepAliveTimeout, write completion wrt to Timeout)

so that maintenance can be done on all the queues from the head, and such

that insertions/maintenance remain in O(1).

A server config is created and pointing to the queue of each vhost at

post_config time, hence the config can be associated to the connection

state (cs) at post_read_request time (keep_alive_timeout_set is used to

determine r->server vs c->base_server here), and we can simply insert

with TO_QUEUE_INSERT(cs->sc->q, cs). PR56226.

While at it, since each queue now embeds it own timeout and hence the

expiration_time of the cs has changed to a queue_timestamp (the time it

was queued), we can detect clock skews and expire entries immediatly if

the system is set (eg. far) in the past during runtime and we want to

avoid waiting for (eg.) centuries before the current logic kills them.

Any entry which is registered above now + q->timeout is concerned, and

is now cleaned from the queue when encountered. PR57374.

core: Follow up to r1664071: comments on new keep_alive_timeout_set flag.

Submitted by: ylavic

Reviewed/backported by: jim

  1. … 8 more files in changeset.
Merge r1657636, r1657638, r1669130 from trunk:

mod_proxy_connect/wstunnel: If both client and backend sides get readable

at the same time, don't lose errors occuring while forwarding on the first

side when none occurs next on the other side, and abort.

CHANGES: Follow up to r1657636, clarify message.

mod_proxy_{connect,wstunnel}: follow up to r1657636.

Since rv is not used as an apr_status_t in the loop (it's logging is done by

proxy_{connect,wstunnel}_transfer() when necessary/relevent), use a boolean

instead to avoid the ugly ORs between APR error codes.

Submitted by: ylavic

Reviewed/backported by: jim

  1. … 4 more files in changeset.
Merge r1661448 from trunk:

core: Add expression support to ErrorDocument. Switch from a fixed

sized 664 byte array per merge to a hash table.

Submitted by: minfrin

Reviewed/backported by: jim

  1. … 8 more files in changeset.
Merge r1658760 from trunk:

mod_proxy_http: Don't expect the backend to ack the "Connection: close" to

finally close those not meant to be kept alive by SetEnv proxy-nokeepalive

or force-proxy-request-1.0, and respond with 502 instead of 400 if its

Connection header is invalid.

Submitted by: ylavic

Reviewed/backported by: jim

  1. … 3 more files in changeset.
Merge r1619383, r1619444, r1662245, r1662246 from trunk:

A misplaced check for inflation limits prevented limiting relatively

small inputs. PR56872

Submitted By: Edward Lu

Committed By: covener

mod_deflate: follow up to r1619383.

deflate_in_filter():

- use inflated bytes per inflate() call to compute the total output bytes,

- check zlib errors before limits,

- add missing check_ratio() when asked to flush.

deflate_out_filter():

- check ratio after each inflate() call.

mod_deflate: follow up to r1619383 and r1619444: CHANGES entry.

CHANGES: follow up to r1662245: Add PR number.

Submitted by: covener, ylavic, ylavic, ylavic

Reviewed/backported by: jim

  1. … 4 more files in changeset.
Merge r1663017 from trunk:

mpm_event: follow up to r1538490, r1545736, r1604350, r1639614 and r1642868.

Clear and restore sbh in notify_suspend() and notify_resume() respectively.

Submitted by: ylavic

Reviewed/backported by: jim

  1. … 4 more files in changeset.
revert r1642852 for 2.4.x release purposes. It appears to break

too much DirectoryMatch matching and is not critical to have in.

Discussion on dev@ on trunk rev commit msg for r1635428

Also, I don't think the addition in the middle of the core_dir_config

given that the core_dir_config is exposed to modules as kind

of a special case.

  1. … 5 more files in changeset.
Merge r1648201 from trunk:

Add class attributes for empty descriptions

Submitted by: druggeri

Reviewed/backported by: jim

  1. … 3 more files in changeset.
Merge r1598946, r1602989 from trunk:

Fix computation of the size of 'struct sockaddr_un' when passed to 'connect()'.

Use the same logic as the one in ' in 'proxy_util.c'.

mod_proxy: Don't limit the size of the connectable Unix Domain Socket paths.

Since connect() to UDS path is used at several places, introduce

ap_proxy_connect_uds() in proxy_util.

Submitted by: jailletc36, ylavic

Reviewed/backported by: jim

  1. … 7 more files in changeset.
Merge r1601291, r1601630 from trunk:

mod_proxy: Shutdown (eg. SSL close notify) the backend connection

before closing.

mod_proxy: follow up to r1601291.

Since deferred_write_pool is needed by the core_output_filter and is a subpool

of the connection, shutdown in a pre_cleanup of the connection's pool to avoid

a freed memory access (SEGV).

Reported By: takashi

Submitted by: ylavic

Reviewed/backported by: jim

  1. … 3 more files in changeset.
Merge r1601184, r1601274, r1601185 from trunk:

mod_ssl: Ensure that the SSL close notify alert is flushed to the client.

PR54998.

Submitted By: Tim Kosse <tim.kosse filezilla-project.org>, ylavic

Committed By: ylavic

mod_ssl: SSL_smart_shutdown(): follow up to r1601184.

Use SSL_get_wbio() to comply with OPENSSL_NO_SSL_INTERN.

Stop SSL shutdown loop when flush fails.

mpm_event[opt]: Send the SSL close notify alert when the KeepAliveTimeout

expires. PR54998.

Submitted by: ylavic

Reviewed/backported by: jim

  1. … 7 more files in changeset.
Merge r1635644 from trunk:

mod_proxy_wstunnel: abort backend connection on polling error to avoid

further processing (lingering close, SSL shutdown).

Submitted by: ylavic

Reviewed/backported by: jim

  1. … 4 more files in changeset.
Merge r1635428 from trunk:

core: Do not match files when using DirectoryMatch. PR41867.

Submitted by: jkaluza

Reviewed/backported by: jim

  1. … 5 more files in changeset.
Merge r1632740 from trunk:

mod_cache: avoid unlikely access to freed memory.

Submitted by: ylavic

Reviewed/backported by: jim

  1. … 4 more files in changeset.
Merge r1629372, r1629485, r1629519 from trunk:

Move OCSP stapling information from a per-certificate store

(ex_data attached to an X509 *) to a per-server hash which is

allocated from the pconf pool. Fixes PR 54357, PR 56919 and

a leak with the certinfo_free cleanup function (missing

OCSP_CERTID_free).

* modules/ssl/ssl_util_stapling.c: drop certinfo_free, and add

ssl_stapling_certid_free (used with apr_pool_cleanup_register).

Switch to a stapling_certinfo hash which is keyed by the SHA-1

digest of the certificate's DER encoding, rework ssl_stapling_init_cert

to only store info once per certificate (allocated from the pconf

to the extent possible) and extend the logging.

* modules/ssl/ssl_private.h: adjust prototype for

ssl_stapling_init_cert, replace ssl_stapling_ex_init with

ssl_stapling_certinfo_hash_init

* modules/ssl/ssl_engine_init.c: adjust ssl_stapling_* calls

Based on initial work by Alex Bligh <alex alex.org.uk>

Follow up to r1629372: ensure compatibily with OpenSSL < 1.0 (sk_OPENSSL_STRING_value).

Follow up to r1629372 and r1629485: ensure compatibily with OpenSSL < 1.0 (sk_OPENSSL_STRING_[num|value|pop] macros).

Submitted by: kbrand, ylavic, ylavic

Reviewed/backported by: jim

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

add OCSP Stapling configuration, disabled by default

Submitted by: trawick

Reviewed/backported by: jim

  1. … 3 more files in changeset.
Merge r1621367, r1621372, r1625952 from trunk:

PR53218

Allow for longer worker names and make truncation a non-fatal

error...

Correct loglevel.

oops... prepend 0

Reviewed/backported by: jim

  1. … 4 more files in changeset.
Merge r1597642, r1608999, r1605207, r1610366, r1610353, r1611871 from trunk:

Rename module name in doxygen + partly revert r832442 which skipped doxygen doc generation for 'mod_watchdog.h'

s/apr_pstrndup/apr_pstrmemdup/ to save a few cycles

Use ap_remove_input_filter_byhandle instead of duplicating the code.

Remove some 'register' in variable declaration.

Remove some 'register' in variable declaration.

Save a few cycles by calling 'apr_isalnum' instead of 'apr_isalpha' and 'apr_isdigit'.

Do not use deprecated define.

No change in generated code because MODULE_MAGIC_NUMBER is defined as:

#define MODULE_MAGIC_NUMBER MODULE_MAGIC_NUMBER_MAJOR

Submitted by: jailletc36

Reviewed/backported by: jim

  1. … 12 more files in changeset.
Merges some corrections from trunk

fix broken references

  1. … 28 more files in changeset.
backport: Tidy up examples
  1. … 1 more file in changeset.
backport whitespace/newline changes to 2.4
  1. … 3 more files in changeset.
Backporting syntax highlighting for rewrite/
  1. … 14 more files in changeset.