3 Changes with Apache 2.3.11
5 *) mod_authn_socache: change directive name from AuthnCacheProvider
6 to AuthnCacheProvideFor. The term "provider" is overloaded in
7 this module, and we should avoid confusion between the provider
8 of a backend (AuthnCacheSOCache) and the authn provider(s) for
9 which this module provides cacheing (AuthnCacheProvideFor).
12 *) mod_proxy_http: Allocate the fake backend request from a child pool
13 of the backend connection, instead of misusing the pool of the frontend
14 request. Fixes a thread safety issue where buckets set aside in the
15 backend connection leak into other threads, and then disappear when
16 the frontend request is cleaned up, in turn causing corrupted buckets
17 to make other threads spin. [Graham Leggett]
19 *) mod_ssl: Change the format of the SSL_{CLIENT,SERVER}_{I,S}_DN variables
20 to be RFC 2253 compatible, convert non-ASCII characters to UTF8, and
21 escape other special characters with backslashes. The old format can
22 still be used with the LegacyDNStringFormat argument to SSLOptions.
24 *) core, mod_rewrite: Make the REQUEST_SCHEME variable available to
25 scripts and mod_rewrite. [Stefan Fritsch]
27 *) mod_rewrite: Allow to use arbitrary boolean expressions (ap_expr) in
28 RewriteCond. [Stefan Fritsch]
30 *) mod_rewrite: Allow to unset environment variables using E=!VAR.
31 PR 49512. [Mark Drayton <mark markdrayton info>, Stefan Fritsch]
33 *) mod_headers: Restore the 2.3.8 and earlier default for the first
34 argument of the Header directive ("onsuccess"). [Eric Covener]
36 *) core: Disallow the mixing of relative and absolute Options PR 33708.
37 [Sönke Tesch <st kino-fahrplan.de>]
39 *) core: When exporting request headers to HTTP_* environment variables,
40 drop variables whose names contain invalid characters. Describe in the
41 docs how to restore the old behaviour. [Malte S. Stretz <mss apache org>]
43 *) core: When selecting an IP-based virtual host, favor an exact match for
44 the port over a wildcard (or omitted) port instead of favoring the one
45 that came first in the configuration file. [Eric Covener]
47 *) core: Overlapping virtual host address/port combinations now implicitly
48 enable name-based virtual hosting for that address. The NameVirtualHost
49 directive has no effect, and _default_ is interpreted the same as "*".
52 *) core: In the absence of any Options directives, the default is now
53 "FollowSymlinks" instead of "All". [Igor Galić]
55 *) rotatelogs: Add -e option to write logs through to stdout for optional
56 further processing. [Graham Leggett]
58 *) mod_ssl: Correctly read full lines in input filter when the line is
59 incomplete during first read. PR 50481. [Ruediger Pluem]
61 *) mod_authz_core: Add AuthzSendForbiddenOnFailure directive to allow
62 sending '403 FORBIDDEN' instead of '401 UNAUTHORIZED' if authorization
63 fails for an authenticated user. PR 40721. [Stefan Fritsch]
65 Changes with Apache 2.3.10
67 *) mod_rewrite: Don't implicitly URL-escape the original query string
68 when no substitution has changed it. PR 50447. [Eric Covener]
70 *) core: Honor 'AcceptPathInfo OFF' during internal redirects,
71 such as per-directory mod_rewrite substitutions. PR 50349.
74 *) mod_rewrite: Add 'RewriteOptions InheritBefore' to put the base
75 rules/conditions before the overridden rules/conditions. PR 39313.
76 [Jérôme Grandjanny <jerome.grandjanny cea.fr>]
78 *) mod_autoindex: add IndexIgnoreReset to reset the list of IndexIgnored
79 filenames in higher precedence configuration sections. PR 24243.
82 *) mod_cgid: RLimit* directive support for mod_cgid. PR 42135
85 *) core: Fail startup when the argument to ServerName looks like a glob
86 or a regular expression instead of a hostname (*?[]). PR 39863
87 [Rahul Nair <rahul.g.nair gmail.com>]
89 *) mod_userdir: Add merging of enable, disable, and filename arguments
90 to UserDir directive, leaving enable/disable of userlists unmerged.
91 PR 44076 [Eric Covener]
93 *) httpd: When no -k option is provided on the httpd command line, the server
94 was starting without checking for an existing pidfile. PR 50350
97 *) mod_proxy: Put the worker in error state if the SSL handshake with the
98 backend fails. PR 50332.
99 [Daniel Ruggeri <DRuggeri primary.net>, Ruediger Pluem]
101 *) mod_cache_disk: Fix Windows build which was broken after renaming
102 the module. [Gregg L. Smith]
104 Changes with Apache 2.3.9
106 *) SECURITY: CVE-2010-1623 (cve.mitre.org)
107 Fix a denial of service attack against mod_reqtimeout.
110 *) mod_headers: Change default first argument of Header directive
111 from "onsuccess" to "always". [Eric Covener]
113 *) mod_include: Add the onerror attribute to the include element,
114 allowing an URL to be specified to include on error. [Graham
117 *) mod_cache_disk: mod_disk_cache renamed to mod_cache_disk, to be
118 consistent with the naming of other modules. [Graham Leggett]
120 *) mod_setenvif: Add SetEnvIfExpr directive to set env var depending on
121 expression. [Stefan Fritsch]
123 *) mod_proxy: Fix ProxyPassInterpolateEnv directive. PR 50292.
126 *) suEXEC: Add Suexec directive to disable suEXEC without renaming the
127 binary (Suexec Off), or force startup failure if suEXEC is required
128 but not supported (Suexec On). Change SuexecUserGroup to fail
129 startup instead of just printing a warning if suEXEC is disabled.
132 *) core: Add Error directive for aborting startup or htaccess processing
133 with a specified error message. [Jeff Trawick]
135 *) mod_rewrite: Fix the RewriteEngine directive to work within a
136 location. Previously, once RewriteEngine was switched on globally,
137 it was impossible to switch off. [Graham Leggett]
139 *) core, mod_include, mod_ssl: Move the expression parser derived from
140 mod_include back into mod_include. Replace ap_expr with a parser
141 derived from mod_ssl's parser. Make mod_ssl use the new parser. Rework
142 ap_expr's public interface and provide hooks for modules to add variables
143 and functions. [Stefan Fritsch]
145 *) core: Do the hook sorting earlier so that the hooks are properly sorted
146 for the pre_config hook and during parsing the config. [Stefan Fritsch]
148 *) core: In the absence of any AllowOverride directives, the default is now
149 "None" instead of "All". PR49823 [Eric Covener]
151 *) mod_proxy: Don't allow ProxyPass or ProxyPassReverse in
152 <Directory> or <Files>. PR47765 [Eric Covener]
154 *) prefork/worker/event MPMS: default value (when no directive is present)
155 of MaxConnectionsPerChild/MaxRequestsPerChild is changed to 0 from 10000
156 to match default configuration and manual. PR47782 [Eric Covener]
158 *) proxy_connect: Don't give up in the middle of a CONNECT tunnel
159 when the child process is starting to exit. PR50220. [Eric Covener]
161 *) mod_autoindex: Fix inheritance of mod_autoindex directives into
162 contexts that don't have any mod_autoindex directives. PR47766.
165 *) mod_rewrite: Add END flag for RewriteRule to prevent further rounds
166 of rewrite processing when a per-directory substitution occurs.
169 *) mod_ssl: Make sure to always log an error if loading of CA certificates
170 fails. PR 40312. [Paul Tiemann <issues apache org ourdetour com>]
172 *) mod_dav: Send 501 error if unknown Content-* header is received for a PUT
173 request (RFC 2616 9.6). PR 42978. [Stefan Fritsch]
175 *) mod_dav: Send 400 error if malformed Content-Range header is received for
176 a put request (RFC 2616 14.16). PR 49825. [Stefan Fritsch]
178 *) mod_proxy: Release the backend connection as soon as EOS is detected,
179 so the backend isn't forced to wait for the client to eventually
180 acknowledge the data. [Graham Leggett]
182 *) mod_proxy: Optimise ProxyPass within a Location so that it is stored
183 per-directory, and chosen during the location walk. Make ProxyPass
184 work correctly from within a LocationMatch. [Graham Leggett]
186 *) core: Fix segfault if per-module LogLevel is on virtual host
187 scope. PR 50117. [Stefan Fritsch]
189 *) mod_proxy: Move the ProxyErrorOverride directive to have per
190 directory scope. [Graham Leggett]
192 *) mod_allowmethods: New module to deny certain HTTP methods without
193 interfering with authentication/authorization. [Paul Querna,
194 Igor Galić, Stefan Fritsch]
196 *) mod_ssl: Log certificate information and improve error message if client
197 cert verification fails. PR 50093, PR 50094. [Lassi Tuura <lat cern ch>,
200 *) htcacheclean: Teach htcacheclean to limit cache size by number of
201 inodes in addition to size of files. Prevents a cache disk from
202 running out of space when many small files are cached.
205 *) core: Rename MaxRequestsPerChild to MaxConnectionsPerChild, which
206 describes more accurately what the directive does. The old name
207 still works but logs a warning. [Stefan Fritsch]
209 *) mod_cache: Optionally serve stale data when a revalidation returns a
210 5xx response, controlled by the CacheStaleOnError directive.
213 *) htcacheclean: Allow the listing of valid URLs within the cache, with
214 the option to list entry metadata such as sizes and times. [Graham
217 *) mod_cache: correctly parse quoted strings in cache headers.
220 *) mod_cache: Allow control over the base URL of reverse proxied requests
221 using the CacheKeyBaseURL directive, so that the cache key can be
222 calculated from the endpoint URL instead of the server URL. [Graham
225 *) mod_cache: CacheLastModifiedFactor, CacheStoreNoStore, CacheStorePrivate,
226 CacheStoreExpired, CacheIgnoreNoLastMod, CacheDefaultExpire,
227 CacheMinExpire and CacheMaxExpire can be set per directory/location.
230 *) mod_disk_cache: CacheMaxFileSize, CacheMinFileSize, CacheReadSize and
231 CacheReadTime can be set per directory/location. [Graham Leggett]
233 *) core: Speed up config parsing if using a very large number of config
234 files. PR 50002 [andrew cloudaccess net]
236 *) mod_cache: Support the caching of HEAD requests. [Graham Leggett]
238 *) htcacheclean: Allow the option to round up file sizes to a given
239 block size, improving the accuracy of disk usage. [Graham Leggett]
241 *) mod_ssl: Add authz providers for use with mod_authz_core and its
242 RequireAny/RequireAll containers: 'ssl' (equivalent to SSLRequireSSL),
243 'ssl-verify-client' (for use with 'SSLVerifyClient optional'), and
244 'ssl-require' (expressions with same syntax as SSLRequire).
247 *) mod_ssl: Make the ssl expression parser thread-safe. It now requires
248 bison instead of yacc. [Stefan Fritsch]
250 *) mod_disk_cache: Change on-disk header file format to support the
251 link of the device/inode of the data file to the matching header
252 file, and to support the option of not writing a data file when
253 the data file is empty. [Graham Leggett]
255 *) core/mod_unique_id: Add generate_log_id hook to allow to use
256 the ID generated by mod_unique_id as error log ID for requests.
259 *) mod_cache: Make sure that we never allow a 304 Not Modified response
260 that we asked for to leak to the client should the 304 response be
261 uncacheable. PR45341 [Graham Leggett]
263 *) mod_cache: Add the cache_status hook to register the final cache
264 decision hit/miss/revalidate. Add optional support for an X-Cache
265 and/or an X-Cache-Detail header to add the cache status to the
266 response. PR48241 [Graham Leggett]
268 *) mod_authz_host: Add 'local' provider that matches connections originating
269 on the local host. PR 19938. [Stefan Fritsch]
271 *) Event MPM: Fix crash accessing pollset on worker thread when child
272 process is exiting. [Jeff Trawick]
274 *) core: For process invocation (cgi, fcgid, piped loggers and so forth)
275 pass the system library path (LD_LIBRARY_PATH or platform-specific
276 variables) along with the system PATH, by default. Both should be
277 overridden together as desired using PassEnv etc; see mod_env.
280 *) mod_cache: Introduce CacheStoreExpired, to allow administrators to
281 capture a stale backend response, perform If-Modified-Since requests
282 against the backend, and serving from the cache all 304 responses.
283 This restores pre-2.2.4 cache behavior. [William Rowe]
285 *) mod_rewrite: Introduce <=, >= string comparison operators, and integer
286 comparators -lt, -le, -eq, -ge, and -gt. To help bash users and drop
287 the ambiguity of the symlink test "-ltest", introduce -h or -L as
288 symlink test operators. [William Rowe]
290 *) mod_cache: Give the cache provider the opportunity to choose to cache
291 or not cache based on the buckets present in the brigade, such as the
292 presence of a FILE bucket.
295 *) mod_authz_core: Allow authz providers to check args while reading the
296 config and allow to cache parsed args. Move 'all' and 'env' authz
297 providers from mod_authz_host to mod_authz_core. Add 'method' authz
298 provider depending on the HTTP method. [Stefan Fritsch]
300 *) mod_include: Move the request_rec within mod_include to be
301 exposed within include_ctx_t. [Graham Leggett]
303 *) mod_include: Reinstate support for UTF-8 character sets by allowing a
304 variable being echoed or set to be decoded and then encoded as separate
305 steps. PR47686 [Graham Leggett]
307 *) mod_cache: Add a discrete commit_entity() provider function within the
308 mod_cache provider interface which is called to indicate to the
309 provider that caching is complete, giving the provider the opportunity
310 to commit temporary files permanently to the cache in an atomic
311 fashion. Replace the inconsistent use of error cleanups with a formal
312 set of pool cleanups attached to a subpool, which is destroyed on error.
315 *) mod_cache: Change the signature of the store_body() provider function
316 within the mod_cache provider interface to support an "in" brigade
317 and an "out" brigade instead of just a single input brigade. This
318 gives a cache provider the option to consume only part of the brigade
319 passed to it, rather than the whole brigade as was required before.
320 This fixes an out of memory and a request timeout condition that would
321 occur when the original document was a large file. Introduce
322 CacheReadSize and CacheReadTime directives to mod_disk_cache to control
323 the amount of data to attempt to cache at a time. [Graham Leggett]
325 *) core: Add ErrorLogFormat to allow configuring error log format, including
326 additional information that is logged once per connection or request. Add
327 error log IDs for connections and request to allow correlating error log
328 lines and the corresponding access log entry. [Stefan Fritsch]
330 *) core: Disable sendfile by default. [Stefan Fritsch]
332 *) mod_cache: Check the request to determine whether we are allowed
333 to return cached content at all, and respect a "Cache-Control:
334 no-cache" header from a client. Previously, "no-cache" would
335 behave like "max-age=0". [Graham Leggett]
337 *) mod_cache: Use a proper filter context to hold filter data instead
338 of misusing the per-request configuration. Fixes a segfault on trunk
339 when the normal handler is used. [Graham Leggett]
341 *) mod_cgid: Log a warning if the ScriptSock path is truncated because
342 it is too long. PR 49388. [Stefan Fritsch]
344 *) vhosts: Do not allow _default_ in NameVirtualHost, or mixing *
345 and non-* ports on NameVirtualHost, or multiple NameVirtualHost
346 directives for the same address:port, or NameVirtualHost
347 directives with no matching VirtualHosts, or multiple ip-based
348 VirtualHost sections for the same address:port. These were
349 previously accepted with a warning, but the behavior was
350 undefined. [Dan Poirier]
352 *) mod_remoteip: Fix a segfault when using mod_remoteip in conjunction with
353 Allow/Deny. PR 49838. [Andrew Skalski <voltara gmail.com>]
355 *) core: DirectoryMatch can now match on the end of line character ($),
356 and sub-directories of matched directories are no longer implicitly
357 matched. PR49809 [Eric Covener]
359 *) Regexps: introduce new higher-level regexp utility including parsing
360 and executing perl-style regexp ops (e.g s/foo/bar/i) and regexp memory
363 *) Proxy: support setting source address. PR 29404
364 [Multiple contributors iterating through bugzilla,
365 Aron Ujvari <xanco nikhok.hu>, Aleksey Midenkov <asm uezku.kemsu.ru>,
366 <dan listening-station.net; trunk version Nick Kew]
368 *) HTTP protocol: return 400 not 503 if we have to abort due to malformed
369 chunked encoding. [Nick Kew]
371 Changes with Apache 2.3.8
373 *) suexec: Support large log files. PR 45856. [Stefan Fritsch]
375 *) core: Abort with sensible error message if no or more than one MPM is
376 loaded. [Stefan Fritsch]
378 *) mod_proxy: Rename erroronstatus to failonstatus.
379 [Daniel Ruggeri <DRuggeri primary.net>]
381 *) mod_dav_fs: Fix broken "creationdate" property.
382 Regression in version 2.3.7. [Rainer Jung]
384 Changes with Apache 2.3.7
386 *) SECURITY: CVE-2010-1452 (cve.mitre.org)
387 mod_dav, mod_cache, mod_session: Fix Handling of requests without a path
388 segment. PR: 49246 [Mark Drayton, Jeff Trawick]
390 *) mod_ldap: Properly check the result returned by apr_ldap_init. PR 46076.
393 *) mod_rewrite: Log errors if rewrite map files cannot be opened. PR 49639.
396 *) mod_proxy_http: Support the 'ping' property for backend HTTP/1.1 servers
397 via leveraging 100-Continue as the initial "request".
400 *) core/mod_authz_core: Introduce new access_checker_ex hook that enables
401 mod_authz_core to bypass authentication if access should be allowed by
402 IP address/env var/... [Stefan Fritsch]
404 *) core: Introduce note_auth_failure hook to allow modules to add support
405 for additional auth types. This makes ap_note_auth_failure() work with
406 mod_auth_digest again. PR 48807. [Stefan Fritsch]
408 *) socache modules: return APR_NOTFOUND when a lookup is not found [Nick Kew]
410 *) mod_authn_socache: new module [Nick Kew]
412 *) configure: Add reallyall option for --enable-mods-shared. [Stefan Fritsch]
414 *) Fix Windows build when using VC6. [Gregg L. Smith <lists glewis com>]
416 *) mod_rewrite: Allow to set environment variables without explicitly
417 giving a value. [Rainer Jung]
419 *) mod_rewrite: Remove superfluous EOL from rewrite logging. [Rainer Jung]
421 *) mod_include: recognise "text/html; parameters" as text/html
422 PR 49616 [Andrey Chernov <ache nagual.pp.ru>]
424 *) CGI vars: allow PATH to be set by SetEnv, consistent with LD_LIBRARY_PATH
427 *) Core: Extra robustness: don't try authz and segfault if authn
428 fails to set r->user. Log bug and return 500 instead.
431 *) HTTP protocol filter: fix handling of longer chunk extensions
432 PR 49474 [<tee.bee gmx.de>]
434 *) Update SSL cipher suite and add example for SSLHonorCipherOrder.
435 [Lars Eilebrecht, Rainer Jung]
437 *) move AddOutputFilterByType from core to mod_filter. This should
438 fix nasty side-effects that happen when content_type is set
439 more than once in processing a request, and make it fully
440 compatible with dynamic and proxied contents. [Nick Kew]
442 *) mod_log_config: Implement logging for sub second timestamps and
443 request end time. [Rainer Jung]
445 Changes with Apache 2.3.6
447 *) SECURITY: CVE-2009-3555 (cve.mitre.org)
448 mod_ssl: Comprehensive fix of the TLS renegotiation prefix injection
449 attack when compiled against OpenSSL version 0.9.8m or later. Introduces
450 the 'SSLInsecureRenegotiation' directive to reopen this vulnerability
451 and offer unsafe legacy renegotiation with clients which do not yet
452 support the new secure renegotiation protocol, RFC 5746.
453 [Joe Orton, and with thanks to the OpenSSL Team]
455 *) SECURITY: CVE-2009-3555 (cve.mitre.org)
456 mod_ssl: A partial fix for the TLS renegotiation prefix injection attack
457 by rejecting any client-initiated renegotiations. Forcibly disable
458 keepalive for the connection if there is any buffered data readable. Any
459 configuration which requires renegotiation for per-directory/location
460 access control is still vulnerable, unless using OpenSSL >= 0.9.8l.
461 [Joe Orton, Ruediger Pluem, Hartmut Keil <Hartmut.Keil adnovum.ch>]
463 *) SECURITY: CVE-2010-0408 (cve.mitre.org)
464 mod_proxy_ajp: Respond with HTTP_BAD_REQUEST when the body is not sent
465 when request headers indicate a request body is incoming; not a case of
466 HTTP_INTERNAL_SERVER_ERROR. [Niku Toivola <niku.toivola sulake.com>]
468 *) SECURITY: CVE-2010-0425 (cve.mitre.org)
469 mod_isapi: Do not unload an isapi .dll module until the request
470 processing is completed, avoiding orphaned callback pointers.
471 [Brett Gervasoni <brettg senseofsecurity.com>, Jeff Trawick]
473 *) core: Filter init functions are now run strictly once per request
474 before handler invocation. The init functions are no longer run
475 for connection filters. PR 49328. [Joe Orton]
477 *) core: Adjust the output filter chain correctly in an internal
478 redirect from a subrequest, preserving filters from the main
479 request as necessary. PR 17629. [Joe Orton]
481 *) mod_cache: Explicitly allow cache implementations to cache a 206 Partial
482 Response if they so choose to do so. Previously an attempt to cache a 206
483 was arbitrarily allowed if the response contained an Expires or
484 Cache-Control header, and arbitrarily denied if both headers were missing.
487 *) core: Add microsecond timestamp fractions, process id and thread id
488 to the error log. [Rainer Jung]
490 *) configure: The "most" module set gets build by default. [Rainer Jung]
492 *) configure: Building dynamic modules (DSO) by default. [Rainer Jung]
494 *) configure: Fix broken VPATH build when using included APR.
497 *) mod_session_crypto: Fix configure problem when building
498 with APR 2 and for VPATH builds with included APR.
501 *) mod_session_crypto: API compatibility with APR 2 crypto and
502 APR Util 1.x crypto. [Rainer Jung]
504 *) ab: Fix memory leak with -v2 and SSL. PR 49383.
505 [Pavel Kankovsky <peak argo troja mff cuni cz>]
507 *) core: Add per-module and per-directory loglevel configuration.
508 Add some more trace logging.
509 mod_rewrite: Replace RewriteLog/RewriteLogLevel with trace log levels.
510 mod_ssl: Replace LogLevelDebugDump with trace log levels.
511 mod_ssl/mod_proxy*: Adjust loglevels to be less verbose at levels info
513 mod_dumpio: Replace DumpIOLogLevel with trace log levels.
516 *) mod_ldap: LDAP caching was suppressed (and ldap-status handler returns
517 title page only) when any mod_ldap directives were used in VirtualHost
518 context. [Eric Covener]
520 *) mod_disk_cache: Decline the opportunity to cache if the response is
521 a 206 Partial Content. This stops a reverse proxied partial response
522 from becoming cached, and then being served in subsequent responses.
525 *) mod_deflate: avoid the risk of forwarding data before headers are set.
526 PR 49369 [Matthew Steele <mdsteele google.com>]
528 *) mod_authnz_ldap: Ensure nested groups are checked when the
529 top-level group doesn't have any direct non-group members
530 of attributes in AuthLDAPGroupAttribute. [Eric Covener]
532 *) mod_authnz_ldap: Search or Comparison during authorization phase
533 can use the credentials from the authentication phase
534 (AuthLDAPSearchAsUSer,AuthLDAPCompareAsUser).
535 PR 48340 [Domenico Rotiroti, Eric Covener]
537 *) mod_authnz_ldap: Allow the initial DN search during authentication
538 to use the HTTP username/pass instead of an anonymous or hard-coded
539 LDAP id (AuthLDAPInitialBindAsUser, AuthLDAPInitialBindPattern).
542 *) mod_authnz_ldap: Publish requested LDAP data with an AUTHORIZE_ prefix
543 when this module is used for authorization. See AuthLDAPAuthorizePrefix.
544 PR 45584 [Eric Covener]
546 *) apxs -q: Stop filtering out ':' characters from the reported values.
547 PR 45343. [Bill Cole]
549 *) prefork MPM: Work around possible crashes on child exit in APR reslist
550 cleanup code. PR 43857. [Tom Donovan]
552 *) ab: fix number of requests sent by ab when keepalive is enabled. PR 48497.
553 [Bryn Dole <dole blekko.com>]
555 *) Log an error for failures to read a chunk-size, and return 408 instead of
556 413 when this is due to a read timeout. This change also fixes some cases
557 of two error documents being sent in the response for the same scenario.
558 [Eric Covener] PR49167
560 *) mod_proxy_balancer: Add new directive BalancerNonce to allow admin
561 to control/set the nonce used in the balancer-manager application.
564 *) mod_proxy_connect: Support port ranges in AllowConnect. PR 23673.
567 *) Proxy balancer: support setting error status according to HTTP response
568 code from a backend. PR 48939. [Daniel Ruggeri <DRuggeri primary.net>]
570 *) htcacheclean: Introduce the ability to clean specific URLs from the
571 cache, if provided as an optional parameter on the command line.
574 *) core: Introduce the IncludeStrict directive, which explicitly fails
575 server startup if no files or directories match a wildcard path.
578 *) htcacheclean: Report additional statistics about entries deleted.
579 PR 48944. [Mark Drayton mark markdrayton.info]
581 *) Introduce SSLFIPS directive to support OpenSSL FIPS_mode; permits all
582 builds of mod_ssl to use 'SSLFIPS off' for portability, but the proper
583 build of openssl is required for 'SSLFIPS on'. PR 46270.
584 [Dr Stephen Henson <steve openssl.org>, William Rowe]
586 *) mod_proxy_http: Log the port of the remote server in various messages.
587 PR 48812. [Igor Galić <i galic brainsware org>]
589 *) mod_reqtimeout: Do not wrongly enforce timeouts for mod_proxy's backend
590 connections and other protocol handlers (like mod_ftp). [Stefan Fritsch]
592 *) mod_proxy_ajp: Really regard the operation a success, when the client
593 aborted the connection. In addition adjust the log message if the client
594 aborted the connection. [Ruediger Pluem]
596 *) mod_ssl: Add the 'SSLInsecureRenegotiation' directive, which
597 allows insecure renegotiation with clients which do not yet
598 support the secure renegotiation protocol. [Joe Orton]
600 *) mod_ssl: Fix a potential I/O hang if a long list of trusted CAs
601 is configured for client cert auth. PR 46952. [Joe Orton]
603 *) core: Only log a 408 if it is no keepalive timeout. PR 39785
604 [Ruediger Pluem, Mark Montague <markmont umich.edu>]
606 *) support/rotatelogs: Add -L option to create a link to the current
607 log file. PR 48761 [<lyndon orthanc.ca>, Dan Poirier]
609 *) mod_ldap: Update LDAPTrustedClientCert to consistently be a per-directory
610 setting only, matching most of the documentation and examples.
611 PR 46541 [Paul Reder, Eric Covener]
613 *) mod_ldap: LDAPTrustedClientCert now accepts CA_DER/CA_BASE64 argument
614 types previously allowed only in LDAPTrustedGlobalCert. [Eric Covener]
616 *) mod_negotiation: Preserve query string over multiviews negotiation.
617 This buglet was fixed for type maps in 2.2.6, but the same issue
618 affected multiviews and was overlooked.
619 PR 33112 [Joergen Thomsen <apache jth.net>]
621 *) mod_ldap: Eliminate a potential crash with multiple LDAPTrustedClientCert
622 when some are not password-protected. [Eric Covener]
624 *) Fix startup segfault when the Mutex directive is used but no loaded
625 modules use httpd mutexes. PR 48787. [Jeff Trawick]
627 *) Proxy: get the headers right in a HEAD request with
628 ProxyErrorOverride, by checking for an overridden error
629 before not after going into a catch-all code path.
630 PR 41646. [Nick Kew, Stuart Children]
632 *) support/rotatelogs: Support the simplest log rotation case, log
633 truncation. Useful when the log is being processed in real time
634 using a command like tail. [Graham Leggett]
636 *) support/htcacheclean: Teach it how to write a pid file (modelled on
637 httpd's writing of a pid file) so that it becomes possible to run
638 more than one instance of htcacheclean on the same machine.
641 *) Log command line on startup, so there's a record of command line
642 arguments like -f. PR 48752. [Dan Poirier]
644 *) Introduce mod_reflector, a handler capable of reflecting POSTed
645 request bodies back within the response through the output filter
646 stack. Can be used to turn an output filter into a web service.
649 *) mod_proxy_http: Make sure that when an ErrorDocument is served
650 from a reverse proxied URL, that the subrequest respects the status
651 of the original request. This brings the behaviour of proxy_handler
652 in line with default_handler. PR 47106. [Graham Leggett]
654 *) Support wildcards in both the directory and file components of
655 the path specified by the Include directive. [Graham Leggett]
657 *) mod_proxy, mod_proxy_http: Support remote https proxies
658 by using HTTP CONNECT. PR 19188.
659 [Philippe Dutrueux <lilas evidian.com>, Rainer Jung]
661 *) apxs: Fix -A and -a options to ignore whitespace in httpd.conf
664 *) worker: Don't report server has reached MaxClients until it has.
665 Add message when server gets within MinSpareThreads of MaxClients.
666 PR 46996. [Dan Poirier]
668 *) mod_session: Session expiry was being initialised, but not updated
669 on each session save, resulting in timed out sessions when there
670 should not have been. Fixed. [Graham Leggett]
672 *) mod_log_config: Add the R option to log the handler used within the
673 request. [Christian Folini <christian.folini netnea com>]
675 *) mod_include: Allow fine control over the removal of Last-Modified and
676 ETag headers within the INCLUDES filter, making it possible to cache
677 responses if desired. Fix the default value of the SSIAccessEnable
678 directive. [Graham Leggett]
680 *) Add new UnDefine directive to undefine a variable. PR 35350.
683 *) Make ap_pregsub(), used by AliasMatch and friends, use the same syntax
684 for regex backreferences as mod_rewrite and mod_include: Remove the use
685 of '&' as an alias for '$0' and allow to escape any character with a
686 backslash. PR 48351. [Stefan Fritsch]
688 *) mod_authnz_ldap: If AuthLDAPCharsetConfig is set, also convert the
689 password to UTF-8. PR 45318.
690 [Johannes Müller <joh_m gmx.de>, Stefan Fritsch]
692 *) ab: Fix calculation of requests per second in HTML output. PR 48594.
695 *) mod_authnz_ldap: Failures to map a username to a DN, or to check a user
696 password now result in an informational level log entry instead of
697 warning level. [Eric Covener]
699 Changes with Apache 2.3.5
701 *) SECURITY: CVE-2010-0434 (cve.mitre.org)
702 Ensure each subrequest has a shallow copy of headers_in so that the
703 parent request headers are not corrupted. Eliminates a problematic
704 optimization in the case of no request body. PR 48359
705 [Jake Scott, William Rowe, Ruediger Pluem]
707 *) Turn static function get_server_name_for_url() into public
708 ap_get_server_name_for_url() and use it where appropriate. This
709 fixes mod_rewrite generating invalid URLs for redirects to IPv6
710 literal addresses. [Stefan Fritsch]
712 *) mod_ldap: Introduce new config option LDAPTimeout to set the timeout
713 for LDAP operations like bind and search. [Stefan Fritsch]
715 *) mod_proxy, mod_proxy_ftp: Move ProxyFtpDirCharset from mod_proxy to
716 mod_proxy_ftp. [Takashi Sato]
718 *) mod_proxy, mod_proxy_connect: Move AllowCONNECT from mod_proxy to
719 mod_proxy_connect. [Takashi Sato]
721 *) mod_cache: Do an exact match of the keys defined by
722 CacheIgnoreURLSessionIdentifiers against the querystring instead of
723 a partial match. PR 48401.
724 [Dodou Wang <wangdong.08 gmail.com>, Ruediger Pluem]
726 *) mod_proxy_balancer: Fix crash in balancer-manager. [Rainer Jung]
728 *) Core HTTP: disable keepalive when the Client has sent
730 but we respond directly with a non-100 response.
731 Keepalive here led to data from clients continuing being treated as
735 *) Core: reject NULLs in request line or request headers.
738 *) Core: (re)-introduce -T commandline option to suppress documentroot
740 PR 41887 [Jan van den Berg <janvdberg gmail.com>]
742 *) mod_autoindex: support XHTML as equivalent to HTML in IndexOptions,
743 ScanHTMLTitles, ReadmeName, HeaderName
744 PR 48416 [Dmitry Bakshaev <dab18 izhnet.ru>, Nick Kew]
746 *) Proxy: Fix ProxyPassReverse with relative URL
747 Derived (slightly erroneously) from PR 38864 [Nick Kew]
749 *) mod_headers: align Header Edit with Header Set when used on Content-Type
750 PR 48422 [Cyril Bonté <cyril.bonte free.fr>, Nick Kew>]
752 *) mod_headers: Enable multi-match-and-replace edit option
755 *) mod_filter: enable it to act on non-200 responses.
758 Changes with Apache 2.3.4
760 *) Replace AcceptMutex, LockFile, RewriteLock, SSLMutex, SSLStaplingMutex,
761 and WatchdogMutexPath with a single Mutex directive. Add APIs to
762 simplify setup and user customization of APR proc and global mutexes.
763 (See util_mutex.h.) Build-time setting DEFAULT_LOCKFILE is no longer
764 respected; set DEFAULT_REL_RUNTIMEDIR instead. [Jeff Trawick]
766 *) http_core: KeepAlive no longer accepts other than On|Off.
769 *) mod_dav: Remove errno from dav_error interface. Calls to dav_new_error()
770 and dav_new_error_tag() must be adjusted to add an apr_status_t parameter.
773 *) mod_authnz_ldap: Add AuthLDAPBindAuthoritative to allow Authentication to
774 try other providers in the case of an LDAP bind failure.
775 PR 46608 [Justin Erenkrantz, Joe Schaefer, Tony Stevenson]
777 *) Build: fix --with-module to work as documented
778 PR 43881 [Gez Saunders <gez.saunders virgin.net>]
780 Changes with Apache 2.3.3
782 *) SECURITY: CVE-2009-3095 (cve.mitre.org)
783 mod_proxy_ftp: sanity check authn credentials.
784 [Stefan Fritsch <sf fritsch.de>, Joe Orton]
786 *) SECURITY: CVE-2009-3094 (cve.mitre.org)
787 mod_proxy_ftp: NULL pointer dereference on error paths.
788 [Stefan Fritsch <sf fritsch.de>, Joe Orton]
789 *) mod_ssl: enable support for ECC keys and ECDH ciphers. Tested against
790 OpenSSL 1.0.0b3. [Vipul Gupta <vipul.gupta sun.com>, Sander Temme]
792 *) mod_dav: Include uri when logging a PUT error due to connection abort.
793 PR 38149. [Stefan Fritsch]
795 *) mod_dav: Return 409 instead of 500 for a LOCK request if the parent
796 resource does not exist or is not a collection. PR 43465. [Stefan Fritsch]
798 *) mod_dav_fs: Return 409 instead of 500 for Litmus test case copy_nodestcoll
799 (a COPY request where the parent of the destination resource does not
800 exist). PR 39299. [Stefan Fritsch]
802 *) mod_dav_fs: Don't delete the whole file if a PUT with content-range failed.
803 PR 42896. [Stefan Fritsch]
805 *) mod_dav_fs: Make PUT create files atomically and no longer destroy the
806 old file if the transfer aborted. PR 39815. [Paul Querna, Stefan Fritsch]
808 *) mod_dav_fs: Remove inode keyed locking as this conflicts with atomically
809 creating files. On systems with inode numbers, this is a format change of
810 the DavLockDB. The old DavLockDB must be deleted on upgrade.
813 *) mod_log_config: Make ${cookie}C correctly match whole cookie names
814 instead of substrings. PR 28037. [Dan Franklin <dan dan-franklin.com>,
817 *) vhost: A purely-numeric Host: header should not be treated as a port.
820 *) mod_ldap: Avoid 500 errors with "Unable to set LDAP_OPT_REFHOPLIMIT option to 5"
821 when built against openldap by using SDK LDAP_OPT_REFHOPLIMIT defaults unless
822 LDAPReferralHopLimit is explicitly configured.
825 *) mod_charset_lite: Honor 'CharsetOptions NoImplicitAdd'.
828 *) mod_ssl: Add support for OCSP Stapling. PR 43822.
829 [Dr Stephen Henson <shenson oss-institute.org>]
831 *) mod_socache_shmcb: Allow parens in file name if cache size is given.
832 Fixes SSLSessionCache directive mis-parsing parens in pathname.
833 PR 47945. [Stefan Fritsch]
835 *) htpasswd: Improve out of disk space handling. PR 30877. [Stefan Fritsch]
837 *) htpasswd: Use MD5 hash by default on all platforms. [Stefan Fritsch]
839 *) mod_sed: Reduce memory consumption when processing very long lines.
840 PR 48024 [Basant Kumar Kukreja <basant.kukreja sun.com>]
842 *) ab: Fix segfault in case the argument for -n is a very large number.
843 PR 47178. [Philipp Hagemeister <oss phihag.de>]
845 *) Allow ProxyPreserveHost to work in <Proxy> sections. PR 34901.
848 *) configure: Fix THREADED_MPMS so that mod_cgid is enabled again
849 for worker MPM. [Takashi Sato]
851 *) mod_dav: Provide a mechanism to obtain the request_rec and pathname
852 from the dav_resource. [Jari Urpalainen <jari.urpalainen nokia.com>,
853 Brian France <brian brianfrance.com>]
855 *) Build: Use install instead of cp if available on installing
856 modules to avoid segmentation fault. PR 47951. [hirose31 gmail.com]
858 *) mod_cache: correctly consider s-maxage in cacheability
859 decisions. [Dan Poirier]
861 *) mod_logio/core: Report more accurate byte counts in mod_status if
862 mod_logio is loaded. PR 25656. [Stefan Fritsch]
864 *) mod_ldap: If LDAPSharedCacheSize is too small, try harder to purge
865 some cache entries and log a warning. Also increase the default
866 LDAPSharedCacheSize to 500000. This is a more realistic size suitable
867 for the default values of 1024 for LdapCacheEntries/LdapOpCacheEntries.
868 PR 46749. [Stefan Fritsch]
870 *) mod_rewrite: Make sure that a hostname:port isn't fully qualified if
871 the request is a CONNECT request. [Bill Zajac <billz consultla.com>]
873 *) mod_cache: Teach CacheEnable and CacheDisable to work from within a
874 Location section, in line with how ProxyPass works. [Graham Leggett]
876 *) mod_reqtimeout: New module to set timeouts and minimum data rates for
877 receiving requests from the client. [Stefan Fritsch]
879 *) core: Fix potential memory leaks by making sure to not destroy
880 bucket brigades that have been created by earlier filters.
883 *) core, mod_deflate, mod_sed: Reduce memory usage by reusing bucket
884 brigades in several places. [Stefan Fritsch]
886 *) mod_cache: Fix uri_meets_conditions() so that CacheEnable will
887 match by scheme, or by a wildcarded hostname. PR 40169
888 [Peter Grandi <pg_asf asf.for.sabi.co.uk>, Graham Leggett]
890 *) suxec: Allow to log an error if exec fails by setting FD_CLOEXEC
891 on the log file instead of closing it. PR 10744. [Nicolas Rachinsky]
893 *) mod_mime: Make RemoveType override the info from TypesConfig.
894 PR 38330. [Stefan Fritsch]
896 *) mod_cache: Introduce the option to run the cache from within the
897 normal request handler, and to allow fine grained control over
898 where in the filter chain content is cached. [Graham Leggett]
900 *) core: Treat timeout reading request as 408 error, not 400.
901 Log 408 errors in access log as was done in Apache 1.3.x.
902 PR 39785 [Nobutaka Mantani <nobutaka nobutaka.org>,
903 Stefan Fritsch <sf fritsch.de>, Dan Poirier]
905 *) mod_ssl: Reintroduce SSL_CLIENT_S_DN, SSL_CLIENT_I_DN, SSL_SERVER_S_DN,
906 SSL_SERVER_I_DN back to the environment variables to be set by mod_ssl.
907 [Peter Sylvester <peter.sylvester edelweb.fr>]
909 *) mod_disk_cache: don't cache incomplete responses, per RFC 2616, 13.8.
910 PR15866. [Dan Poirier]
912 *) ab: ab segfaults in verbose mode on https sites
913 PR46393. [Ryan Niebur]
915 *) mod_dav: Allow other modules to become providers and add resource types
916 to the DAV response. [Jari Urpalainen <jari.urpalainen nokia.com>,
917 Brian France <brian brianfrance.com>]
919 *) mod_dav: Allow other modules to add things to the DAV or Allow headers
920 of an OPTIONS request. [Jari Urpalainen <jari.urpalainen nokia.com>,
921 Brian France <brian brianfrance.com>]
923 *) core: Lower memory usage of core output filter.
924 [Stefan Fritsch <sf sfritsch.de>]
926 *) mod_mime: Detect invalid use of MultiviewsMatch inside Location and
927 LocationMatch sections. PR47754. [Dan Poirier]
929 *) mod_request: Make sure the KeptBodySize directive rejects values
930 that aren't valid numbers. [Graham Leggett]
932 *) mod_session_crypto: Sanity check should the potentially encrypted
933 session cookie be too short. [Graham Leggett]
935 *) mod_session.c: Prevent a segfault when session is added but not
936 configured. [Graham Leggett]
938 *) htcacheclean: 19 ways to fail, 1 error message. Fixed. [Graham Leggett]
940 *) mod_auth_digest: Fail server start when nonce count checking
941 is configured without shared memory, or md5-sess algorithm is
942 configured. [Dan Poirier]
944 *) mod_proxy_connect: The connect method doesn't work if the client is
945 connecting to the apache proxy through an ssl socket. Fixed.
946 PR29744. [Brad Boyer, Mark Cave-Ayland, Julian Gilbey, Fabrice Durand,
947 David Gence, Tim Dodge, Per Gunnar Hans, Emmanuel Elango,
948 Kevin Croft, Rudolf Cardinal]
950 *) mod_ssl: The error message when SSLCertificateFile is missing should
951 at least give the name or position of the problematic virtual host
952 definition. [Stefan Fritsch sf sfritsch.de]
954 *) mod_auth_digest: Fix null pointer when qop=none. [Dan Poirier]
956 *) Add support for HTTP PUT to ab. [Jeff Barnes <jbarnesweb yahoo.com>]
958 *) mod_headers: generalise the envclause to support expression
959 evaluation with ap_expr parser [Nick Kew]
961 *) mod_cache: Introduce the thundering herd lock, a mechanism to keep
962 the flood of requests at bay that strike a backend webserver as
963 a cached entity goes stale. [Graham Leggett]
965 *) mod_auth_digest: Fix usage of shared memory and re-enable it.
966 PR 16057 [Dan Poirier]
968 *) Preserve Port information over internal redirects
969 PR 35999 [Jonas Ringh <jonas.ringh cixit.se>]
971 *) Proxy: unable to connect to a backend is SERVICE_UNAVAILABLE,
972 rather than BAD_GATEWAY or (especially) NOT_FOUND.
973 PR 46971 [evanc nortel.com]
975 *) Various modules: Do better checking of pollset operations in order to
976 avoid segmentation faults if they fail. PR 46467
977 [Stefan Fritsch <sf sfritsch.de>]
979 *) mod_autoindex: Correctly create an empty cell if the description
980 for a file is missing. PR 47682 [Peter Poeml <poeml suse.de>]
982 *) ab: Fix broken error messages after resolver or connect() failures.
985 *) SECURITY: CVE-2009-1890 (cve.mitre.org)
986 Fix a potential Denial-of-Service attack against mod_proxy in a
987 reverse proxy configuration, where a remote attacker can force a
988 proxy process to consume CPU time indefinitely. [Nick Kew, Joe Orton]
990 *) SECURITY: CVE-2009-1191 (cve.mitre.org)
991 mod_proxy_ajp: Avoid delivering content from a previous request which
992 failed to send a request body. PR 46949 [Ruediger Pluem]
994 *) htdbm: Fix possible buffer overflow if dbm database has very
995 long values. PR 30586 [Dan Poirier]
997 *) core: Return APR_EOF if request body is shorter than the length announced
998 by the client. PR 33098 [ Stefan Fritsch <sf sfritsch.de>]
1000 *) mod_suexec: correctly set suexec_enabled when httpd is run by a
1001 non-root user and may have insufficient permissions.
1002 PR 42175 [Jim Radford <radford blackbean.org>]
1004 *) mod_ssl: Fix SSL_*_DN_UID variables to use the 'userID' attribute
1005 type. PR 45107. [Michael Ströder <michael stroeder.com>,
1006 Peter Sylvester <peter.sylvester edelweb.fr>]
1008 *) mod_proxy_http: fix case sensitivity checking transfer encoding
1009 PR 47383 [Ryuzo Yamamoto <ryuzo.yamamoto gmail.com>]
1011 *) mod_alias: ensure Redirect issues a valid URL.
1012 PR 44020 [Håkon Stordahl <hakon stordahl.org>]
1014 *) mod_dir: add FallbackResource directive, to enable admin to specify
1015 an action to happen when a URL maps to no file, without resorting
1016 to ErrorDocument or mod_rewrite. PR 47184 [Nick Kew]
1018 *) mod_cgid: Do not leak the listening Unix socket file descriptor to the
1019 CGI process. PR 47335 [Kornél Pál <kornelpal gmail.com>]
1021 *) mod_rewrite: Remove locking for writing to the rewritelog.
1022 PR 46942 [Dan Poirier <poirier pobox.com>]
1024 *) mod_alias: check sanity in Redirect arguments.
1025 PR 44729 [Sönke Tesch <st kino-fahrplan.de>, Jim Jagielski]
1027 *) mod_proxy_http: fix Host: header for literal IPv6 addresses.
1028 PR 47177 [Carlos Garcia Braschi <cgbraschi gmail.com>]
1030 *) mod_cache: Add CacheIgnoreURLSessionIdentifiers directive to ignore
1031 defined session identifiers encoded in the URL when caching.
1034 *) mod_rewrite: Fix the error string returned by RewriteRule.
1035 RewriteRule returned "RewriteCond: bad flag delimiters" when the 3rd
1036 argument of RewriteRule was not started with "[" or not ended with "]".
1037 PR 45082 [Vitaly Polonetsky <m_vitaly topixoft.com>]
1039 *) Windows: Fix usage message.
1042 *) apachectl: When passing through arguments to httpd in
1043 non-SysV mode, use the "$@" syntax to preserve arguments.
1046 *) mod_dbd: add DBDInitSQL directive to enable SQL statements to
1047 be run when a connection is opened. PR 46827
1048 [Marko Kevac <mkevac gmail.com>]
1050 *) mod_cgid: Improve handling of long AF_UNIX socket names (ScriptSock).
1051 PR 47037. [Jeff Trawick]
1053 *) mod_proxy_ajp: Check more strictly that the backend follows the AJP
1054 protocol. [Mladen Turk]
1056 *) mod_proxy_ajp: Forward remote port information by default.
1059 *) Allow MPMs to be loaded dynamically, as with most other modules. Use
1060 --enable-mpms-shared={list|"all"} to enable. This required changes to
1061 the MPM interfaces. Removed: mpm.h, mpm_default.h (as an installed
1062 header), APACHE_MPM_DIR, MPM_NAME, ap_threads_per_child,
1063 ap_max_daemons_limit, ap_my_generation, etc. ap_mpm_query() can't be
1064 called until after the register-hooks phase. [Jeff Trawick]
1066 *) mod_ssl: Add SSLProxyCheckPeerExpire and SSLProxyCheckPeerCN directives
1067 to enable stricter checking of remote server certificates.
1070 *) ab: Fix a 100% CPU loop on platforms where a failed non-blocking connect
1071 returns EINPROGRESS and a subsequent poll() returns only POLLERR.
1072 Observed on HP-UX. [Eric Covener]
1074 *) Remove broken support for BeOS, TPF, and even older platforms such
1075 as A/UX, Next, and Tandem. [Jeff Trawick]
1077 *) mod_proxy_ftp: Add ProxyFtpListOnWildcard directive to allow files with
1078 globbing characters to be retrieved instead of converted into a
1079 directory listing. PR 46789 [Dan Poirier <poirier pobox.com>]
1081 *) Provide ap_retained_data_create()/ap_retained_data_get() for preservation
1082 of module state across unload/load. [Jeff Trawick]
1084 *) mod_substitute: Fix a memory leak. PR 44948
1085 [Dan Poirier <poirier pobox.com>]
1087 Changes with Apache 2.3.2
1089 *) mod_mime_magic: Fix detection of compressed content. [Rainer Jung]
1091 *) mod_negotiation: Escape pathes of filenames in 406 responses to avoid
1092 HTML injections and HTTP response splitting. PR 46837.
1093 [Geoff Keating <geoffk apple.com>]
1095 *) mod_ssl: add support for type-safe STACK constructs in OpenSSL
1096 development HEAD. PR 45521. [Kaspar Brand, Sander Temme]
1098 *) ab: Fix maintenance of the pollset to resolve EALREADY errors
1099 with kqueue (BSD/OS X) and excessive CPU with event ports (Solaris).
1100 PR 44584. Use APR_POLLSET_NOCOPY for better performance with some
1101 pollset implementations. [Jeff Trawick]
1103 *) mod_disk_cache: The module now turns off sendfile support if
1104 'EnableSendfile off' is defined globally. [Lars Eilebrecht]
1106 *) mod_deflate: Adjust content metadata before bailing out on 304
1107 responses so that the metadata does not differ from 200 response.
1110 *) mod_deflate: Fix creation of invalid Etag headers. We now make sure
1111 that the Etag value is properly quoted when adding the gzip marker.
1112 PR 39727, 45023. [Lars Eilebrecht, Roy T. Fielding]
1114 *) Added 20x22 icons for ODF, SVG, and XML documents. PR 37185.
1117 *) Disabled DefaultType directive and removed ap_default_type()
1118 from core. We now exclude Content-Type from responses for which
1119 a media type has not been configured via mime.types, AddType,
1120 ForceType, or some other mechanism. PR 13986. [Roy T. Fielding]
1122 *) mod_rewrite: Add IPV6 variable to RewriteCond
1123 [Ryan Phillips <ryan-apache trolocsis.com>]
1125 *) core: Enhance KeepAliveTimeout to support a value in milliseconds.
1126 PR 46275. [Takashi Sato]
1128 *) rotatelogs: Allow size units B, K, M, G and combination of
1129 time and size based rotation. [Rainer Jung]
1131 *) rotatelogs: Add flag for verbose (debug) output. [Rainer Jung]
1133 *) mod_ssl: Fix merging of SSLRenegBufferSize directive. PR 46508
1134 [<tlhackque yahoo.com>]
1136 *) core: Translate the the status line to ASCII on EBCDIC platforms in
1137 ap_send_interim_response() and for locally generated "100 Continue"
1138 responses. [Eric Covener]
1140 *) prefork: Fix child process hang during graceful restart/stop in
1141 configurations with multiple listening sockets. PR 42829. [Joe Orton,
1144 *) mod_session_crypto: Ensure that SessionCryptoDriver can only be
1145 set in the global scope. [Graham Leggett]
1147 *) mod_ext_filter: We need to detect failure to startup the filter
1148 program (a mangled response is not acceptable). Fix to detect
1149 failure, and offer configuration option either to abort or
1150 to remove the filter and continue.
1153 *) mod_session_crypto: Rewrite the session_crypto module against the
1154 apr_crypto API. [Graham Leggett]
1156 *) mod_auth_form: Fix a pool lifetime issue, don't remove the subrequest
1157 until the main request is cleaned up. [Graham Leggett]
1159 Changes with Apache 2.3.1
1161 *) ap_slotmem: Add in new slot-based memory access API impl., including
1162 2 providers (mod_sharedmem and mod_plainmem) [Jim Jagielski,
1163 Jean-Frederic Clere, Brian Akins <brian.akins turner.com>]
1165 *) mod_include: support generating non-ASCII characters as entities in SSI
1168 *) core/utils: Enhance ap_escape_html API to support escaping non-ASCII chars
1171 *) mod_rewrite: fix "B" flag breakage by reverting r5589343
1172 PR 45529 [Bob Ionescu <bobsiegen googlemail.com>]
1174 *) CGI: return 504 (Gateway timeout) rather than 500 when a script
1175 times out before returning status line/headers.
1178 *) mod_cgid: fix segfault problem on solaris.
1179 PR 39332 [Masaoki Kobayashi <masaoki techfirm.co.jp>]
1181 *) mod_proxy_scgi: Added. [André Malo]
1183 *) mod_cache: Introduce 'no-cache' per-request environment variable
1184 to prevent the saving of an otherwise cacheable response.
1187 *) mod_rewrite: Introduce DiscardPathInfo|DPI flag to stop the troublesome
1188 way that per-directory rewrites append the previous notion of PATH_INFO
1189 to each substitution before evaluating subsequent rules.
1190 PR 38642 [Eric Covener]
1192 *) mod_cgid: Do not add an empty argument when calling the CGI script.
1193 PR 46380 [Ruediger Pluem]
1195 *) scoreboard: Remove unused sb_type from process_score.
1196 [Torsten Foertsch <torsten.foertsch gmx.net>, Chris Darroch]
1198 *) mod_ssl: Add SSLRenegBufferSize directive to allow changing the
1199 size of the buffer used for the request-body where necessary
1200 during a per-dir renegotiation. PR 39243. [Joe Orton]
1202 *) mod_proxy_fdpass: New module to pass a client connection over to a separate
1203 process that is reading from a unix daemon socket.
1205 *) mod_ssl: Improve environment variable extraction to be more
1206 efficient and to correctly handle DNs with duplicate tags.
1207 PR 45975. [Joe Orton]
1209 *) Remove the obsolete serial attribute from the RPM spec file. Compile
1210 against the external pcre. Add missing binaries fcgistarter, and
1211 mod_socache* and mod_session*. [Graham Leggett]
1213 Changes with Apache 2.3.0
1215 *) mod_ratelimit: New module to do bandwidth rate limiting. [Paul Querna]
1217 *) Remove X-Pad header which was added as a work around to a bug in
1218 Netscape 2.x to 4.0b2. [Takashi Sato <takashi lans-tv.com>]
1220 *) Add DTrace Statically Defined Tracing (SDT) probes.
1221 [Theo Schlossnagle <jesus omniti.com>, Paul Querna]
1223 *) mod_proxy_balancer: Move all load balancing implementations
1224 as individual, self-contained mod_proxy submodules under
1225 modules/proxy/balancers [Jim Jagielski]
1227 *) Rename APIs to include ap_ prefix:
1228 find_child_by_pid -> ap_find_child_by_pid
1229 suck_in_APR -> ap_suck_in_APR
1230 sys_privileges_handlers -> ap_sys_privileges_handlers
1231 unixd_accept -> ap_unixd_accept
1232 unixd_config -> ap_unixd_config
1233 unixd_killpg -> ap_unixd_killpg
1234 unixd_set_global_mutex_perms -> ap_unixd_set_global_mutex_perms
1235 unixd_set_proc_mutex_perms -> ap_unixd_set_proc_mutex_perms
1236 unixd_set_rlimit -> ap_unixd_set_rlimit
1239 *) mod_lbmethod_heartbeat: New module to load balance mod_proxy workers
1240 based on heartbeats. [Paul Querna]
1242 *) mod_heartmonitor: New module to collect heartbeats, and write out a file
1243 so that other modules can load balance traffic as needed. [Paul Querna]
1245 *) mod_heartbeat: New module to generate multicast heartbeats to know if a
1246 server is online. [Paul Querna]
1248 *) mod_buffer: Honour the flush bucket and flush the buffer in the
1249 input filter. Make sure that metadata buckets are written to
1250 the buffer, not to the final brigade. [Graham Leggett]
1252 *) mod_buffer: Optimise the buffering of heap buckets when the heap
1253 buckets stay exactly APR_BUCKET_BUFF_SIZE long. [Graham Leggett,
1256 *) mod_buffer: Optional support for buffering of the input and output
1257 filter stacks. Can collapse many small buckets into fewer larger
1258 buckets, and prevents excessively small chunks being sent over
1259 the wire. [Graham Leggett]
1261 *) mod_privileges: new module to make httpd on Solaris privileges-aware
1262 and to enable different virtualhosts to run with different
1263 privileges and Unix user/group IDs [Nick Kew]
1265 *) mod_mem_cache: this module has been removed. [William Rowe]
1267 *) authn/z: Remove mod_authn_default and mod_authz_default.
1270 *) authz: Fix handling of authz configurations, make default authz
1271 logic replicate 2.2.x authz logic, and replace <Satisfy*>, Reject,
1272 and AuthzMergeRules directives with Match, <Match*>, and AuthzMerge
1273 directives. [Chris Darroch]
1275 *) mod_authn_core: Prevent crash when provider alias created to
1276 provider which is not yet registered. [Chris Darroch]
1278 *) mod_authn_core: Add AuthType of None to support disabling
1279 authentication. [Chris Darroch]
1281 *) core: Allow <Limit> and <LimitExcept> directives to nest, and
1282 constrain their use to conform with that of other access control
1283 and authorization directives. [Chris Darroch]
1285 *) unixd: turn existing code into a module, and turn the set user/group
1286 and chroot into a child_init function. [Nick Kew]
1288 *) mod_dir: Support "DirectoryIndex disabled"
1289 Suggested By André Warnier <aw ice-sa.com> [Eric Covener]
1291 *) mod_ssl: Send Content-Type application/ocsp-request for POST requests to
1292 OSCP responders. PR 46014 [Dr Stephen Henson <steve openssl.org>]
1294 *) mod_authnz_ldap: don't return NULL-valued environment variables to
1295 other modules. PR 39045 [Francois Pesce <francois.pesce gmail.com>]
1297 *) Don't adjust case in pathname components that are not of interest
1298 to mod_mime. Fixes mod_negotiation's use of such components.
1299 PR 43250 [Basant Kumar Kukreja <basant.kukreja sun.com>]
1301 *) Be tolerant in what you accept - accept slightly broken
1302 status lines from a backend provided they include a valid status code.
1303 PR 44995 [Rainer Jung <rainer.jung kippdata.de>]
1305 *) New module mod_sed: filter Request/Response bodies through sed
1306 [Basant Kumar Kukreja <basant.kukreja sun.com>]
1308 *) mod_auth_form: Make sure that basic authentication is correctly
1309 faked directly after login. [Graham Leggett]
1311 *) mod_session_cookie, mod_session_dbd: Make sure cookies are set both
1312 within the output headers and error output headers, so that the
1313 session is maintained across redirects. [Graham Leggett]
1315 *) mod_auth_form: Make sure the logged in user is populated correctly
1316 after a form login. Fixes a missing REMOTE_USER variable directly
1317 following a login. [Graham Leggett]
1319 *) mod_session_cookie: Make sure that cookie attributes are correctly
1320 included in the blank cookie when cookies are removed. This fixes an
1321 inability to log out when using mod_auth_form. [Graham Leggett]
1323 *) mod_session: Prevent a segfault when a CGI script sets a cookie with a
1324 null value. [David Shane Holden <dpejesh apache.org>]
1326 *) core, authn/z: Determine registered authn/z providers directly in
1327 ap_setup_auth_internal(), which allows optional functions that just
1328 wrapped ap_list_provider_names() to be removed from authn/z modules.
1331 *) authn/z: Convert common provider version strings to macros.
1334 *) core: When testing for slash-terminated configuration paths in
1335 ap_location_walk(), don't look past the start of an empty string
1336 such as that created by a <Location ""> directive.
1339 *) core, mod_proxy: If a kept_body is present, it becomes safe for
1340 subrequests to support message bodies. Make sure that safety
1341 checks within the core and within the proxy are not triggered
1342 when kept_body is present. This makes it possible to embed
1343 proxied POST requests within mod_include. [Graham Leggett]
1345 *) mod_auth_form: Make sure the input filter stack is properly set
1346 up before reading the login form. Make sure the kept body filter
1347 is correctly inserted to ensure the body can be read a second
1348 time safely should the authn be successful. [Graham Leggett,
1351 *) mod_request: Insert the KEPT_BODY filter via the insert_filter
1352 hook instead of during fixups. Add a safety check to ensure the
1353 filters cannot be inserted more than once. [Graham Leggett,
1356 *) ap_cache_cacheable_headers_out() will (now) always
1357 merge an error headers _before_ clearing them and _before_
1358 merging in the actual entity headers and doing normal
1359 hop-by-hop cleansing. [Dirk-Willem van Gulik].
1361 *) cache: retire ap_cache_cacheable_hdrs_out() which was used
1362 for both in- and out-put headers; and replace it by a single
1363 ap_cache_cacheable_headers() wrapped in a in- and out-put
1364 specific ap_cache_cacheable_headers_in()/out(). The latter
1365 which will also merge error and ensure content-type. To keep
1366 cache modules consistent with ease. This API change bumps
1367 up the minor MM by one [Dirk-Willem van Gulik].
1369 *) Move the KeptBodySize directive, kept_body filters and the
1370 ap_parse_request_body function out of the http module and into a
1371 new module called mod_request, reducing the size of the core.
1374 *) mod_dbd: Handle integer configuration directive parameters with a
1377 *) Change the directives within the mod_session* modules to be valid
1378 both inside and outside the location/directory sections, as
1379 suggested by wrowe. [Graham Leggett]
1381 *) mod_auth_form: Add a module capable of allowing end users to log
1382 in using an HTML form, storing the credentials within mod_session.
1385 *) Add a function to the http filters that is able to parse an HTML
1386 form request with the type of application/x-www-form-urlencoded.
1389 *) mod_session_crypto: Initialise SSL in the post config hook.
1390 [Ruediger Pluem, Graham Leggett]
1392 *) mod_session_dbd: Add a session implementation capable of storing
1393 session information in a SQL database via the dbd interface. Useful
1394 for sites where session privacy is important. [Graham Leggett]
1396 *) mod_session_crypto: Add a session encoding implementation capable
1397 of encrypting and decrypting sessions wherever they may be stored.
1398 Introduces a level of privacy when sessions are stored on the
1399 browser. [Graham Leggett]
1401 *) mod_session_cookie: Add a session implementation capable of storing
1402 session information within cookies on the browser. Useful for high
1403 volume sites where server bound sessions are too resource intensive.
1406 *) mod_session: Add a generic session interface to unify the different
1407 attempts at saving persistent sessions across requests.
1410 *) core, authn/z: Avoid calling access control hooks for internal requests
1411 with configurations which match those of initial request. Revert to
1412 original behaviour (call access control hooks for internal requests
1413 with URIs different from initial request) if any access control hooks or
1414 providers are not registered as permitting this optimization.
1415 Introduce wrappers for access control hook and provider registration
1416 which can accept additional mode and flag data. [Chris Darroch]
1418 *) Introduced ap_expr API for expression evaluation.
1419 This is adapted from mod_include, which is the first module
1423 *) mod_authz_dbd: When redirecting after successful login/logout per
1424 AuthzDBDRedirectQuery, do not report authorization failure, and use
1425 first row returned by database query instead of last row.
1428 *) mod_ldap: Correctly return all requested attribute values
1429 when some attributes have a null value.
1430 PR 44560 [Anders Kaseorg <anders kaseorg.com>]
1432 *) core: check symlink ownership if both FollowSymlinks and
1433 SymlinksIfOwnerMatch are set [Nick Kew]
1435 *) core: fix origin checking in SymlinksIfOwnerMatch
1436 PR 36783 [Robert L Mathews <rob-apache.org.bugs tigertech.net>]
1438 *) Activate mod_cache, mod_file_cache and mod_disk_cache as part of the
1439 'most' set for '--enable-modules' and '--enable-shared-mods'. Include
1440 mod_mem_cache in 'all' as well. [Dirk-Willem van Gulik]
1442 *) Also install mod_so.h, mod_rewrite.h and mod_cache.h; as these
1443 contain public function declarations which are useful for
1444 third party module authors. PR 42431 [Dirk-Willem van Gulik].
1446 *) mod_dir, mod_negotiation: pass the output filter information
1447 to newly created sub requests; as these are later on used
1448 as true requests with an internal redirect. This allows for
1449 mod_cache et.al. to trap the results of the redirect.
1450 [Dirk-Willem van Gulik, Ruediger Pluem]
1452 *) mod_ldap: Add support (taking advantage of the new APR capability)
1453 for ldap rebind callback while chasing referrals. This allows direct
1454 searches on LDAP servers (in particular MS Active Directory 2003+)
1455 using referrals without the use of the global catalog.
1456 PRs 26538, 40268, and 42557 [Paul J. Reder]
1458 *) ApacheMonitor.exe: Introduce --kill argument for use by the
1459 installer. This will permit the installation tool to remove
1460 all running instances before attempting to remove the .exe.
1463 *) mod_ssl: Add support for OCSP validation of client certificates.
1464 PR 41123. [Marc Stern <marc.stern approach.be>, Joe Orton]
1466 *) mod_serf: New module for Reverse Proxying. [Paul Querna]
1468 *) core: Add the option to keep aside a request body up to a certain
1469 size that would otherwise be discarded, to be consumed by filters
1470 such as mod_include. When enabled for a directory, POST requests
1471 to shtml files can be passed through to embedded scripts as POST
1472 requests, rather being downgraded to GET requests. [Graham Leggett]
1474 *) mod_ssl: Fix TLS upgrade (RFC 2817) support. PR 41231. [Joe Orton]
1476 *) scoreboard: Correctly declare ap_time_process_request.
1477 PR 43789 [Tom Donovan <Tom.Donovan acm.org>]
1479 *) core; scoreboard: ap_get_scoreboard_worker(sbh) now takes the sbh member
1480 from the connection rec, ap_get_scoreboard_worker(proc, thread) will now
1481 provide the unusual legacy lookup. [William Rowe]
1483 *) mpm winnt: fix null pointer dereference
1484 PR 42572 [Davi Arnaut]
1486 *) mod_authnz_ldap, mod_authn_dbd: Tidy up the code to expose authn
1487 parameters to the environment. Improve portability to
1488 EBCDIC machines by using apr_toupper(). [Martin Kraemer]
1490 *) mod_ldap, mod_authnz_ldap: Add support for nested groups (i.e. the ability
1491 to authorize an authenticated user via a "require ldap-group X" directive
1492 where the user is not in group X, but is in a subgroup contained in X.
1493 PR 42891 [Paul J. Reder]
1495 *) mod_ssl: Add support for caching SSL Sessions in memcached. [Paul Querna]
1497 *) apxs: Enhance -q flag to print all known variables and their values
1498 when invoked without variable name(s).
1499 [William Rowe, Sander Temme]
1501 *) apxs: Eliminate run-time check for mod_so. PR 40653.
1502 [David M. Lee <dmlee crossroads.com>]
1504 *) beos MPM: Create pmain pool and run modules' child_init hooks when
1505 entering ap_mpm_run(), then destroy pmain when exiting ap_mpm_run().
1508 *) netware MPM: Destroy pmain pool when exiting ap_mpm_run() so that
1509 cleanups registered in modules' child_init hooks are performed.
1512 *) Fix issue which could cause error messages to be written to access logs
1513 on Win32. PR 40476. [Tom Donovan <Tom.Donovan acm.org>]
1515 *) The LockFile directive, which specifies the location of
1516 the accept() mutex lockfile, is deprecated. Instead, the
1517 AcceptMutex directive now takes an optional lockfile
1518 location parameter, ala SSLMutex. [Jim Jagielski]
1520 *) mod_authn_dbd: Export any additional columns queried in the SQL select
1521 into the environment with the name AUTHENTICATE_<COLUMN>. This brings
1522 mod_authn_dbd behaviour in line with mod_authnz_ldap. [Graham Leggett]
1524 *) mod_dbd: Key the storage of prepared statements on the hex string
1525 value of server_rec, rather than the server name, as the server name
1526 may change (eg when the server name is set) at any time, causing
1527 weird behaviour in modules dependent on mod_dbd. [Graham Leggett]
1529 *) mod_proxy_fcgi: Added win32 build. [Mladen Turk]
1531 *) sendfile_nonblocking() takes the _brigade_ as an argument, gets
1532 the first bucket from the brigade, finds it not to be a FILE
1533 bucket and barfs. The fix is to pass a bucket rather than a brigade.
1534 [Niklas Edmundsson <nikke acc.umu.se>]
1536 *) mod_rewrite: support rewritemap by SQL query [Nick Kew]
1538 *) ap_get_server_version() has been removed. Third-party modules must
1539 now use ap_get_server_banner() or ap_get_server_description().
1542 *) All MPMs: Introduce a check_config phase between pre_config and
1543 open_logs, to allow modules to review interdependent configuration
1544 directive values and adjust them while messages can still be logged
1545 to the console. Handle relevant MPM directives during this phase
1546 and format messages for both the console and the error log, as
1547 appropriate. [Chris Darroch]
1549 *) core: Do not allow internal redirects like the DirectoryIndex of mod_dir
1550 to circumvent the symbolic link checks imposed by FollowSymLinks and
1551 SymLinksIfOwnerMatch. [Nick Kew, Ruediger Pluem, William Rowe]
1553 *) New SSLLogLevelDebugDump [ None (default) | IO (not bytes) | Bytes ]
1554 configures the I/O Dump of SSL traffic, when LogLevel is set to Debug.
1555 The default is none as this is far greater debugging resolution than
1556 the typical administrator is prepared to untangle. [William Rowe]
1558 *) mod_disk_cache: If possible, check if the size of an object to cache is
1559 within the configured boundaries before actually saving data.
1560 [Niklas Edmundsson <nikke acc.umu.se>]
1562 *) Worker and event MPMs: Remove improper scoreboard updates which were
1563 performed in the event of a fork() failure. [Chris Darroch]
1565 *) Add support for fcgi:// proxies to mod_rewrite.
1566 [Markus Schiegl <ms schiegl.com>]
1568 *) Remove incorrect comments from scoreboard.h regarding conditional
1569 loading of worker_score structure with mod_status, and remove unused
1570 definitions relating to old life_status field.
1571 [Chris Darroch <chrisd pearsoncmg.com>]
1573 *) Remove allocation of memory for unused array of lb_score pointers
1574 in ap_init_scoreboard(). [Chris Darroch <chrisd pearsoncmg.com>]
1576 *) Add mod_proxy_fcgi, a FastCGI back end for mod_proxy.
1577 [Garrett Rooney, Jim Jagielski, Paul Querna]
1579 *) Event MPM: Fill in the scoreboard's tid field. PR 38736.
1580 [Chris Darroch <chrisd pearsoncmg.com>]
1582 *) mod_charset_lite: Remove Content-Length when output filter can
1583 invalidate it. Warn when input filter can invalidate it.
1586 *) Authz: Add the new module mod_authn_core that will provide common
1587 authn directives such as 'AuthType', 'AuthName'. Move the directives
1588 'AuthType' and 'AuthName' out of the core module and merge mod_authz_alias
1589 into mod_authn_core. [Brad Nicholes]
1591 *) Authz: Move the directives 'Order', 'Allow', 'Deny' and 'Satisfy'
1592 into the new module mod_access_compat which can be loaded to provide
1593 support for these directives.
1596 *) Authz: Move the 'Require' directive from the core module as well as
1597 add the directives '<SatisfyAll>', '<SatisfyOne>', '<RequireAlias>'
1598 and 'Reject' to mod_authz_core. The new directives introduce 'AND/OR'
1599 logic into the authorization processing. [Brad Nicholes]
1601 *) Authz: Add the new module mod_authz_core which acts as the
1602 authorization provider vector and contains common authz
1603 directives. [Brad Nicholes]
1605 *) Authz: Renamed mod_authz_dbm authz providers from 'group' and
1606 'file-group' to 'dbm-group' and 'dbm-file-group'. [Brad Nicholes]
1608 *) Authz: Added the new authz providers 'env', 'ip', 'host', 'all' to handle
1609 host-based access control provided by mod_authz_host and invoked
1610 through the 'Require' directive. [Brad Nicholes]
1612 *) Authz: Convert all of the authz modules from hook based to
1613 provider based. [Brad Nicholes]
1615 *) mod_cache: Add CacheMinExpire directive to set the minimum time in
1616 seconds to cache a document.
1617 [Brian Akins <brian.akins turner.com>, Ruediger Pluem]
1619 *) mod_authz_dbd: SQL authz with Login/Session support [Nick Kew]
1621 *) Fix typo in ProxyStatus syntax error message.
1622 [Christophe Jaillet <christophe.jaillet wanadoo.fr>]
1624 *) Asynchronous write completion for the Event MPM. [Brian Pane]
1626 *) Added an End-Of-Request bucket type. The logging of a request and
1627 the freeing of its pool are now done when the EOR bucket is destroyed.
1628 This has the effect of delaying the logging until right after the last
1629 of the response is sent; ap_core_output_filter() calls the access logger
1630 indirectly when it destroys the EOR bucket. [Brian Pane]
1632 *) Rewrite of logresolve support utility: IPv6 addresses are now supported
1633 and the format of statistical output has changed. [Colm MacCarthaigh]
1635 *) Rewrite of ap_coreoutput_filter to do nonblocking writes [Brian Pane]
1637 *) Added new connection states for handler and write completion
1640 *) mod_cgid: Refuse to work on Solaris 10 due to OS bugs. PR 34264.
1643 *) Teach mod_ssl to use arbitrary OIDs in an SSLRequire directive,
1644 allowing string-valued client certificate attributes to be used for
1645 access control, as in: SSLRequire "value" in OID("1.3.6.1.4.1.18060.1")
1646 [Martin Kraemer, David Reid]
1648 [Apache 2.3.0-dev includes those bug fixes and changes with the
1649 Apache 2.2.xx tree as documented, and except as noted, below.]
1651 Changes with Apache 2.2.x and later:
1653 *) http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?view=markup
1655 Changes with Apache 2.0.x and later:
1657 *) http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/CHANGES?view=markup
1659 Changes with Apache 1.3.x and later:
1661 *) http://svn.apache.org/viewvc/httpd/httpd/branches/1.3.x/src/CHANGES?view=markup