mod_negotiation.c

Checkout Tools
  • last updated 3 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
mod_negotiation: LanguagePriority tags must be treated case-insensitive,

per https://tools.ietf.org/html/rfc7231#section-3.1.3.1

PR: 39730

Backports: r1850989

Submitted by: jailletc36

Reviewed by: jailletc36, wrowe, jim

  1. … 3 more files in changeset.
Merge r1830816, r1830836, r1842882, r1842884 from trunk:

* modules/ssl: Add some missing logno tags.

* modules/ssl/ssl_engine_pphrase.c (ssl_load_encrypted_pkey):

Simplify code, no functional change.

* modules/slotmem/mod_slotmem_shm.c (restore_slotmem): Remove

redundant assignment (clang warning), the apr_file_eof(fp)=>APR_EOF

case assigns rv to APR_EOF and then to APR_SUCCESS after already.

* modules/mappers/mod_negotiation.c (set_language_quality): Remove

redundant branch (warning from Coverity).

Submitted by: jorton

Reviewed by: jailletc36, icing, jorton, jim

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

Fix missing spaces in messages

Submitted by: jailletc36

Reviewed by: jailletc36, minfrin, jim

  1. … 4 more files in changeset.
Fix negotiation type parsing to be strict about "*", "*/*" and "type/*"

comparisons.

Submitted by: wrowe, Robert Święcki <robert swiecki.net>

Backports: r1800917

Reviewed by: wrowe, jim, jchampion

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

Fix spelling in comments and text files.

No functional change.

PR 59990

Submitted by: rjung

Reviewed/backported by: jim

  1. … 72 more files in changeset.
Merge r1719252, r1719254, r1719255, r1720996 from trunk:

Use 'ap_array_str_contains' to simplify code.

Use 'ap_array_str_contains' to simplify code.

Use 'ap_array_str_contains' to simplify code.

Use 'ap_array_str_contains' to simplify code.

Submitted by: jailletc36

Reviewed/backported by: jim

  1. … 5 more files in changeset.
Merge r1715567, r1715568, r1715570, r1715571, r1715572, r1715576, r1715581, r1715582, r1715583, r1715584, r1715585 from trunk:

Remove some useless 'return' statements.

Remove some useless 'return' statements.

Remove some useless 'return' statements.

Remove some useless 'return' statements.

Remove some useless 'return' statements.

Add a blank line between functions.

Remove some useless 'return' statements.

Fix style and alignment.

Remove some useless 'return' statements.

Fix style.

Remove some useless 'return' statements.

Add a blank line between functions.

Remove some useless 'return' statements.

Remove some useless 'return' statements.

Remove some useless 'return' statements.

Submitted by: jailletc36

Reviewed/backported by: jim

  1. … 14 more files in changeset.
Merge r1700851 from trunk:

mod_negotiation: simplify type-map body tag lookup, and be safe

should it contain a NUL byte.

Submitted by: ylavic

Reviewed/backported by: jim

  1. … 2 more files in changeset.
Backport r1690137.

Doc and comment fix only

  1. … 11 more files in changeset.
Merge r1619297, r1621806 from trunk:

Missing va_end spotted by cppcheck

Silent some cppcheck warnings.

Submitted by: jailletc36

Reviewed/backported by: jim

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

Remove useless tests.

Turn

if (*x && apr_isspace(*x))

into

if (apr_isspace(*x))

Submitted by: jailletc36

Reviewed/backported by: jim

  1. … 11 more files in changeset.
Merge r1398970, r1407853, r1398480, r1398478, r1411862, r1397320:

1398970: Use 'ap_strcasestr' instead of a strdup/str_tolower/strstr sequence

1407853: cppCheck: Suspicious condition.

1398480: cppcheck: arrayIndexThenCheck - change the order of the tests in

order to avoid a potential out-of-bound access.

1398478: ccpcheck: duplicateExpression - 'vary_by_language' is tested twice

1411862: Use apr_is_empty_table() instead of getting a table and checking the

value of the 'nelts' field.

1397320: remove extra ';'

Submitted by: jailletc36

Reviewed by: jailletc36, minfrin, sf

  1. … 7 more files in changeset.
Merge r1349905:

SECURITY: CVE-2012-2687 (cve.mitre.org):

mod_negotiation: Escape filenames in variant list to prevent an

possible XSS for a site where untrusted users can upload files to a

location with MultiViews enabled.

* modules/mappers/mod_negotiation.c (make_variant_list): Escape

filenames in variant list.

Submitted by: Niels Heinen <heinenn google.com>

Reviewed by: covener, jorton, sf

  1. … 3 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.
Backport from trunk:

Remove unused variable.

Merge r1205423 from trunk:

Use ap_pass_brigade_fchk()

Reviewed/backported by: jim

  1. … 1 more file in changeset.
Merge r1205274 from trunk:

mod_negotiation: don't return non-AP_FILTER_ERROR filter return values

to ap_run_handler() when sending a body directly from a type-map.