summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* On the trunk:Stefan Eissing2017-10-048-97/+119
| | | | | | | | mod_md: v0.9.9, fix for applying challenge type based on available ports. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1811082 13f79535-47bb-0310-9956-ffa450edef68
* ap_expr: follow up to r1810605.Yann Ylavic2017-10-032-32/+31
| | | | | | | | Better token/type descriptors for better parsing error messages. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1811010 13f79535-47bb-0310-9956-ffa450edef68
* Axe backported entries.Yann Ylavic2017-10-031-30/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1811007 13f79535-47bb-0310-9956-ffa450edef68
* Also affects official clang 5 (maybe older ones too...)Jim Jagielski2017-10-031-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1810998 13f79535-47bb-0310-9956-ffa450edef68
* httpdunit: include .h to avoid code duplication.Yann Ylavic2017-10-031-17/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1810761 13f79535-47bb-0310-9956-ffa450edef68
* Follow up to r1804123 r1809633.Yann Ylavic2017-10-033-5/+23
| | | | | | | Silence "-Wunknown-pragmas" on GCC... git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1810723 13f79535-47bb-0310-9956-ffa450edef68
* apr_expr: follow up to r1810605.Yann Ylavic2017-10-031-3/+2
| | | | | | | | Not necessarily ASCII here.. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1810702 13f79535-47bb-0310-9956-ffa450edef68
* ap_expr: open string expressions to the <word>.Yann Ylavic2017-10-029-1170/+2049
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduces the syntax "%{:<word>:}", borrowed from the <var>'s one, and which likewise can be embedded anywhere in a string expression (the same reserved character ':' gets reused in an unambiguous manner). This allows the two types of expressions (boolean and string) to now share fully the same language set, namely: strings, lists, vars, regexes, backrefs, functions with multiple or complex arguments, and especially combinations thereof. Most of them were reserved to boolean expressions only, while complex string constructions can also benefit to, well, strings. The <word> construct allows that (say the syntax "%{:<word>:}" looks like a temporary variable constructed in a string). Since string expressions may now have to deal with lists (arrays), they also need a way to produce/extract strings from list and vice versa. This can be done with the new "join" and "split" operators, while the new substitution regexes (like "s/<pattern>/<substitute>/<flags>") may be used to manipulate strings in place. All this of course available for both string and boolean expressions. Tests and doc updates upcoming.. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1810605 13f79535-47bb-0310-9956-ffa450edef68
* xformsJim Jagielski2017-10-0228-3/+29
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1810570 13f79535-47bb-0310-9956-ffa450edef68
* Get maintainer-mode working again w/ clang-900Jim Jagielski2017-10-021-0/+10
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1810448 13f79535-47bb-0310-9956-ffa450edef68
* More C90 stuff...Jim Jagielski2017-10-021-5/+8
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1810447 13f79535-47bb-0310-9956-ffa450edef68
* Final comment-format changesJim Jagielski2017-10-021-9/+9
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1810365 13f79535-47bb-0310-9956-ffa450edef68
* And standard format - no functional changeJim Jagielski2017-10-021-195/+212
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1810363 13f79535-47bb-0310-9956-ffa450edef68
* C changes / C90/C89Jim Jagielski2017-10-021-18/+27
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1810362 13f79535-47bb-0310-9956-ffa450edef68
* Userland changeJim Jagielski2017-10-021-1/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1810360 13f79535-47bb-0310-9956-ffa450edef68
* Fold in ALv2 licensed UWSGI proxy (sub)module as acknowledged viaJim Jagielski2017-10-025-0/+736
| | | | | | | | https://github.com/unbit/uwsgi/issues/1636 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1810358 13f79535-47bb-0310-9956-ffa450edef68
* Add a warning for host starting with a letter.Jean-Frederic Clere2017-10-022-0/+17
| | | | | | | Fix for PR 61540. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1810316 13f79535-47bb-0310-9956-ffa450edef68
* Fix ascii art :)Yann Ylavic2017-09-301-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1810233 13f79535-47bb-0310-9956-ffa450edef68
* Rebuild.Lucien Gentis2017-09-302-3/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1810204 13f79535-47bb-0310-9956-ffa450edef68
* XML updates.Lucien Gentis2017-09-302-3/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1810203 13f79535-47bb-0310-9956-ffa450edef68
* RFC8081, new font/ registry as pointed out by SteffenWilliam A. Rowe Jr2017-09-291-4/+6
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1810121 13f79535-47bb-0310-9956-ffa450edef68
* mod_http2: non-dev 1.10.12 for backportStefan Eissing2017-09-291-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1810089 13f79535-47bb-0310-9956-ffa450edef68
* reverting r1807238 bc not addressing the issue ↵Stefan Eissing2017-09-292-16/+3
| | | | | | https://github.com/icing/mod_h2/issues/120 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1810088 13f79535-47bb-0310-9956-ffa450edef68
* Forward port 2.4.x change r1810016William A. Rowe Jr2017-09-281-43/+0
| | | | | | | | | | | | Drops expat LICENSE since this is no longer bundled by apr-util which is no longer bundled by httpd. Note text was stale. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1810017 13f79535-47bb-0310-9956-ffa450edef68
* On the trunk:Stefan Eissing2017-09-287-68/+14
| | | | | | | mod_http2: v0.10.12, removed optimization for mutex handling in bucket beams that could lead to assertion failure in edge cases. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1809981 13f79535-47bb-0310-9956-ffa450edef68
* MPMs unix: follow up to r1809881 and r1809973.Yann Ylavic2017-09-281-0/+4
| | | | | | | | unset_signals() is called when ap_pglobal is destroyed too. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1809976 13f79535-47bb-0310-9956-ffa450edef68
* core, MPMs unix: follow up to r1809881.Yann Ylavic2017-09-287-24/+70
| | | | | | | | | | | | | | | | | | Deregister all hooks first (in pre_cleanup), by doing it last we could still have had them run when DSOs were unloaded. Likewise, avoid double faults when handling fatal signals by restoring the default handler before pconf is cleared (we can't ap_log_error there). Finally, we need to ignore sig_term/restart (do nothing) when the main process is exiting (i.e. ap_pglobal is destroyed), since retained_data are freed. Aimed to fix all faults in PR 61558. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1809973 13f79535-47bb-0310-9956-ffa450edef68
* fixup propertiesAndré Malo2017-09-272-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1809888 13f79535-47bb-0310-9956-ffa450edef68
* update transformationAndré Malo2017-09-2713-2132/+2212
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1809885 13f79535-47bb-0310-9956-ffa450edef68
* core: deregister all hooks before leaving pconf, otherwise some late cleanupYann Ylavic2017-09-271-1/+15
| | | | | | | | | | or function call (e.g. ap_log) may use one while DSOs are unloaded. See PR 61558 (double/second fault). git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1809881 13f79535-47bb-0310-9956-ffa450edef68
* CHANGES: remove backported itemsLuca Toscano2017-09-261-13/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1809746 13f79535-47bb-0310-9956-ffa450edef68
* On the trunk: Stefan Eissing2017-09-2624-91/+197
| | | | | | | | | | | | mod_md: v0.9.7 - Use of the new module flag - Removed obsolete function from interface to mod_ssl. - Fallback certificates has version set and no longer claims to be a CA. (re issue #32) - MDRequireHttps now happens before any Redirect. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1809719 13f79535-47bb-0310-9956-ffa450edef68
* On the trunk:Stefan Eissing2017-09-261-1/+1
| | | | | | | | mod_ssl: make the new module flag used. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1809713 13f79535-47bb-0310-9956-ffa450edef68
* On the trunk:Stefan Eissing2017-09-254-2/+17
| | | | | | | | Fix for maintainer-mode compiler errors when including check.h in unit tests. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1809633 13f79535-47bb-0310-9956-ffa450edef68
* Rebuild.Lucien Gentis2017-09-232-7/+8
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1809438 13f79535-47bb-0310-9956-ffa450edef68
* XML update.Lucien Gentis2017-09-231-5/+8
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1809437 13f79535-47bb-0310-9956-ffa450edef68
* config: follow up to r1809302.Yann Ylavic2017-09-221-1/+2
| | | | | | | Associate ap_get_module_flags() to MMN bump. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1809314 13f79535-47bb-0310-9956-ffa450edef68
* config: follow up to r1809302.Yann Ylavic2017-09-223-21/+30
| | | | | | | | | Provide a convenient function to get module flags, and remove useless AP_MODULE_HAS_FLAGS checks in the core, core's version is at current MMN. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1809311 13f79535-47bb-0310-9956-ffa450edef68
* config: follow up to r1809302.Yann Ylavic2017-09-222-4/+13
| | | | | | | | We need to check that the module itself is at the right version. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1809305 13f79535-47bb-0310-9956-ffa450edef68
* mod_ssl: follow up to r1809302.Yann Ylavic2017-09-222-25/+3
| | | | | | | Make use of AP_MODULE_FLAG_ALWAYS_MERGE. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1809303 13f79535-47bb-0310-9956-ffa450edef68
* config: allow to specify flags when registering modules.Yann Ylavic2017-09-223-8/+35
| | | | | | | | First one is AP_MODULE_FLAG_ALWAYS_MERGE. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1809302 13f79535-47bb-0310-9956-ffa450edef68
* * modules/ssl/ssl_private.h: Remove unused macros.Joe Orton2017-09-221-6/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1809297 13f79535-47bb-0310-9956-ffa450edef68
* event, simple, motorz: better naming, error code checking and arrangementYann Ylavic2017-09-223-25/+19
| | | | | | | | around pending output data handing; no functional change. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1809276 13f79535-47bb-0310-9956-ffa450edef68
* event: better apr_pollset_add() failure handling to avoid an (very unlikely)Yann Ylavic2017-09-221-14/+12
| | | | | | | | worker vs listener race condition. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1809273 13f79535-47bb-0310-9956-ffa450edef68
* Fix a segmentation fault if AuthzDBDQuery is not set.Christophe Jaillet2017-09-212-2/+11
| | | | | | PR 61546 [Lubos Uhliarik <luhliari redhat.com>] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1809209 13f79535-47bb-0310-9956-ffa450edef68
* On the trunk:Stefan Eissing2017-09-211-1/+1
| | | | | | | | mpm_common.h: guarding AP_ENABLE_EXCEPTION_HOOK against use when undefined so that -Wundef does not triggger. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1809135 13f79535-47bb-0310-9956-ffa450edef68
* On the trunk:Stefan Eissing2017-09-202-33/+67
| | | | | | | | | | mod_ssl: unshare SSLSrvConfigRec instances between base server and virtual hosts. This avoids overwrites of later initializattions (vhost_id), selective disables by "SSLEngine addr-list" and certificate/key pickup from mod_md. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1809037 13f79535-47bb-0310-9956-ffa450edef68
* mod_rewrite,core: avoid Vary:Host (part 2)Luca Toscano2017-09-203-8/+13
| | | | | | | | | | | | | | | | | | This is a follow up of r1808746 after a chat with Yann on dev@: - the HTTP:Host variable suffers from the same problem - the strcasecmp should be used to allow case-sensitive comparisons. - in mod_rewrite is less cumbersome and more clean to just make the Host header check in lookup_header, so it will be automatically picked up by every part of the code that uses it. It shouldn't be a relevant overhead for mod_rewrite. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1809028 13f79535-47bb-0310-9956-ffa450edef68
* Minor corrections.Lucien Gentis2017-09-191-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1808911 13f79535-47bb-0310-9956-ffa450edef68
* mod_speling/PR 38923: don't embed Referer in link in error page.Nick Kew2017-09-182-4/+7
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1808780 13f79535-47bb-0310-9956-ffa450edef68