Checkout Tools
  • last updated 12 mins 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 of r1850745,r1855446 from trunk:

modules/filters/config.m4: Make libxml2's inclusion of unicode/*.h files

a non-fatal warning/error under maintainer-mode.

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

Propose backportable fix to accept libxml2 path in the

base form or the absolute path to include tree form.

Nowhere does the --with-libxml2= arg suggest the path

is that of the include tree, and disagrees with httpd's

use of --with- syntax for package location.

Submitted by: wrowe

Reviewed by: wrowe, ylavic, jim

  1. … 2 more files in changeset.
This was for some reason not folded in during the larger patchset,

which had been approved and committed.

  1. … 1 more file in changeset.
Merge r1761824, r1771789, r1771827, r1779111 from trunk:

mod_brotli: Unbreak building other filter modules without libbrotlienc.

Don't add -lbrotlienc to the MOD_LDFLAGS unconditionally. And, when

adding it, use MOD_BROTLI_LDADD to avoid linking all filter modules

against this library.

mod_brotli: Rewrite the autoconf script in a, hopefully, less convoluted way.

Explicitly handle different cases when we do a pkg-config lookup

(<nothing>, --with-brotli or --with-brotli=yes) or examine the path

provided by the user (--with-brotli=PATH).

This lays the groundwork to simplify the switch to the official Brotli

library (https://github.com/google/brotli), instead of expecting the

install layout of a third-party wrapper (https://github.com/bagder/libbrotli).

mod_brotli: Update makefiles to use the library layout of the official

Brotli repository.

With the recent update (https://github.com/google/brotli/pull/464), the

official repository now produces pkg-config metadata files (brotli.pc),

and has a fixed library layout (libbrotlicommon/libbrotlienc/libbrotlidec)

on both Windows and Linux. Expect this layout in the makefiles, and take

advantage of the pkg-config metadata, if it's available.

mod_brotli: Update makefile to cope with the pkg-config layout change

in https://github.com/google/brotli/commit/fe9f9a9

There's a typo in the upstream commit [1] (s/brotlicommon/libbrotlicommon)

that currently produces an unusable libbrotlienc.pc file, but hopefully

this is going to be fixed there.

[1] https://github.com/google/brotli/commit/fe9f9a9#diff-af3b638bc2a3e6c650974192a53c7291R409

Submitted by: kotkov

Reviewed by: kotkov, covener, jim

  1. … 3 more files in changeset.
Merge r1790852, r1790853, r1790860 from trunk:

Merge r1761714, r1762512, r1762515, r1771791, r1779077, r1779091, r1779699, r1790852, r1790853, r1790860 from trunk:

mod_brotli: Add initial implementation.

This new module supports dynamic Brotli (RFC 7932) compression. Existing

mod_deflate installations can benefit from better compression ratio by

sending Brotli-compressed data to the clients that support it:

SetOutputFilter BROTLI_COMPRESS;DEFLATE

The module features zero-copy processing, which is only possible with the

new API from the upcoming 1.0.x series of brotli [1]. The Linux makefile

works against libbrotli [2], as currently the core brotli repository doesn't

offer a way to build a library [3]. Apart from that, only the CMake build

is now supported.

[1] https://github.com/google/brotli

[2] https://github.com/bagder/libbrotli

[3] https://github.com/google/brotli/pull/332

mod_brotli: Allow compression ratio logging with new BrotliFilterNote

directive.

mod_brotli: Handle new 'no-brotli' internal environment variable that

disables Brotli compression for a particular request.

This mimicks how mod_deflate handles the 'no-gzip' env variable, and

should allow seamless migration for configurations that use it.

mod_brotli: Explicitly cast 'const uint8_t *' to 'const char *' when using

the data received from Brotli to create a bucket.

This fixes a /W4 warning in my environment, and should also allow building

mod_brotli on NetWare.

Submitted by: NormW <normw gknw.net>

unused variable error could mistakenly note that brotli isn't available.

1st draft

Be more consitent in the layout, and fix the display of a multi lines <highlight> section

mod_brotli: Update makefile to allow using Brotli library >= 0.6.0.

The 0.6.0 version has just been released [1], and it contains the

necessary API required for mod_brotli.

[1] https://github.com/google/brotli/releases/tag/v0.6.0

mod_brotli: Fix a minor typo in the description of BrotliAlterETag

that has been referring to httpd 2.2.x.

There's no mod_brotli in 2.2.x.

mod_brotli: Comment on the default choice (0) for BROTLI_PARAM_LGBLOCK.

Submitted by: kotkov, jim, jim, jailletc36, kotkov, kotkov, kotkov

Reviewed by: jim, jorton, icing

mod_brotli: Update makefile to allow using Brotli library >= 0.6.0.

The 0.6.0 version has just been released [1], and it contains the

necessary API required for mod_brotli.

[1] https://github.com/google/brotli/releases/tag/v0.6.0

mod_brotli: Fix a minor typo in the description of BrotliAlterETag

that has been referring to httpd 2.2.x.

There's no mod_brotli in 2.2.x.

mod_brotli: Comment on the default choice (0) for BROTLI_PARAM_LGBLOCK.

Submitted by: kotkov

Reviewed by: jim, jorton, icing

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

m4: please any autoconf by quoting AC_DEFUN's names. PR 58126.

Submitted by: olli hauer <ohauer gmx.de>

Submitted by: ylavic

Reviewed/backported by: jim

  1. … 6 more files in changeset.
backport r1385216, r1387610 from trunk:

Spin off module-specific build options into separate build vars.

[second try, supersedes r1385214]

Add MOD_CFLAGS, MOD_LDFLAGS variables etc. to the build commands,

which are available to modules for customization on a per-subdir

basis (by adding definitions to modules.mk). Reduces the risk

of side-effects when a module needs to add CFLAGS, LDFLAGS etc.

and these would be added to the global settings (ALL_CFLAGS etc.).

Adapt build settings for mod_ssl, mod_socache_dc, mod_deflate,

mod_xml2enc, mod_proxy_html, and mod_lua to use the new MOD_xxx

build variables.

Change PICFLAGS, SHLTCFLAGS and LTCFLAGS into config vars, instead

of AC_SUBSTing them in build/rules.mk.in. For support/ab, introduce

ab_CFLAGS and ab_LDFLAGS, and define explicit make targets where

they appear at the proper position in the build commands.

Consistently use "--with-xxx=PATH" in configure help strings which

are used to specify a path to the installation directory of an

auxiliary package.

  1. … 7 more files in changeset.
Merge r1326980, r1326984, 1326991, add CHANGES entry:

mod_sed, mod_log_debug: Symbol namespace cleanups.

Submitted by: jorton

Reviewed by: jorton , jim, sf

  1. … 5 more files in changeset.
Change module sets and default activation status:

1) Promoted from "most" to "yes/few"

- mod_headers

2) Demoted from "yes/few" to "most"

- mod_actions

- mod_allowmethods

- mod_auth_form

- mod_buffer

- mod_cgi(d)

- mod_include

- mod_negotiation

- mod_ratelimit

- mod_request

- mod_userdir

Remember: default module set is "most",

but only the LoadModule lines of all

modules except "yes/few" are commented out by default.

The following modules will now be loaded by default:

- mod_access_compat

- mod_alias

- mod_auth_basic

- mod_authn_core

- mod_authn_file

- mod_authz_core

- mod_authz_groupfile

- mod_authz_host

- mod_authz_user

- mod_autoindex

- mod_dir

- mod_env

- mod_filter

- mod_headers

- mod_log_config

- mod_mime

- mod_mpm_event

- mod_reqtimeout

- mod_setenvif

- mod_status

- mod_unixd

- mod_version

Backport of r1201111 from trunk.

  1. … 8 more files in changeset.