summaryrefslogtreecommitdiffstats
path: root/ap.d (unfollow)
Commit message (Collapse)AuthorFilesLines
2017-10-16Fix format pattern (%lu => %APR_SIZE_T_FMT).Rainer Jung1-2/+3
Detected by maintainer mode compilation and GCC error: .../modules/metadata/mod_remoteip.c: In function 'remoteip_input_filter': .../include/http_log.h:117:33: error: format '%lu' expects argument of type 'long unsigned int', but argument 8 has type 'apr_size_t {aka unsigned int}' [-Werror=format=] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1812332 13f79535-47bb-0310-9956-ffa450edef68
2017-10-16* server/util_expr_eval.c (ap_expr_eval_re_backref): Fix gcc 7.x warning.Joe Orton1-2/+2
util_expr_eval.c: In function ‘ap_expr_eval_re_backref’: util_expr_eval.c:265:63: error: comparison between pointer and zero character constant [-Werror=pointer-compare] if (!ctx->re_pmatch || !ctx->re_source || *ctx->re_source == '\0' || git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1812307 13f79535-47bb-0310-9956-ffa450edef68
2017-10-16Follow up to r1812263.Yann Ylavic2-19/+28
As suggested by Joe, add --maintainer/debugger-mode's CFLAGS in NOTEST_CFLAGS to avoid interractions with autoconf's AC_LANG_PROGRAM. APACHE_ADD_GCC_CFLAG now also forces -Wno-strict-prototypes for -Werror to work despite AC_LANG_PROGRAM generating this warning by itself. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1812301 13f79535-47bb-0310-9956-ffa450edef68
2017-10-16Fix maintainer mode with GCC/Clang.Rainer Jung1-0/+4
Setting -Wstrict-prototypes in combination with -Werror leads to compiler errors during configure checks (autoconf generates incomplete prototypes). Adding -Wno-error=strict-prototypes lets the compiler tolerate those. Possible future enhancement: remember such "configure time only" flags and remove them from CFLAGS before generating our build time files (Makefile, config_vars.mk etc.), so that the full -Werror is in place during building. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1812263 13f79535-47bb-0310-9956-ffa450edef68
2017-10-16GCC/Clang strict-prototypes handling in configure:Rainer Jung1-10/+0
revert r1810998 and r1810448 before applying a more general solution. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1812261 13f79535-47bb-0310-9956-ffa450edef68
2017-10-14Follow up to r1812193: really change MMN major.Yann Ylavic1-2/+2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1812197 13f79535-47bb-0310-9956-ffa450edef68
2017-10-14Follow up to r1740928: including NOT_IN_PROXY in NOT_IN_DIR_LOC_FILE is bothYann Ylavic8-32/+33
incomplete and not backportable, fix it by introducing NOT_IN_DIR_CONTEXT and restoring NOT_IN_DIR_LOC_FILE to its previous value. Per ap_check_cmd_context(), NOT_IN_DIR_LOC_FILE actually/really means "not in any directory context", while the definition itself does not include all the existing directory contexts (e.g. <Limit>, or <Proxy> before r1740928). This is a bit of a misnomer, at least, so instead of (ab)using it by adding the missing contexts (in an incompatible way), let's define NOT_IN_DIR_CONTEXT to really exclude all directory context (i.e. NOT_IN_DIR_LOC_FILE + NOT_IN_LIMIT + NOT_IN_PROXY) and use it wherever NOT_IN_DIR_LOC_FILE was used. This is by itself a major MMN bump (modules not compiled with this commit and having directives checked against NOT_IN_DIR_LOC_FILE won't be caught the same way by NOT_IN_DIR_CONTEXT in the new ap_check_cmd_context() code), but with the below change, 2.4.x should work as before: - if ((forbidden & NOT_IN_DIR_CONTEXT) == NOT_IN_DIR_CONTEXT) { + if ((forbidden & NOT_IN_DIR_LOC_FILE) == NOT_IN_DIR_LOC_FILE) { if (cmd->path != NULL) { return apr_pstrcat(cmd->pool, cmd->cmd->name, gt, - " cannot occur within directory context", NULL); + " cannot occur within <Directory/Location/Files/Proxy> " + "section", NULL); } ... } git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1812193 13f79535-47bb-0310-9956-ffa450edef68
2017-10-13Follow up to r1809881: CHANGES entry.Yann Ylavic1-0/+3
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1812075 13f79535-47bb-0310-9956-ffa450edef68
2017-10-12Entry for 2.4.28 regression (r1808855 missing r1805195).Yann Ylavic1-0/+3
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1812004 13f79535-47bb-0310-9956-ffa450edef68
2017-10-12Add optional _RAW suffix to SSL_*_DN_xx attribute names, allowingJoe Orton4-17/+38
users to convert an attribute value without conversion to UTF-8. (A public CA has issued certs with attributes tagged as the wrong ASN.1 string types.) * modules/ssl/ssl_util_ssl.c (asn1_string_convert): Rename from asn1_string_to_utf8; add raw argument. Reimplement _to_utf8 as macro. (modssl_X509_NAME_ENTRY_to_string): Add raw argument. * modules/ssl/ssl_engine_vars.c (ssl_var_lookup_ssl_cert_dn): Use raw string conversion if _RAW suffix is present in DN component. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1811976 13f79535-47bb-0310-9956-ffa450edef68
2017-10-11* server/util_script.c (ap_add_common_vars): Allow mod_env to overrideJoe Orton1-25/+29
all system path environment variables, not just PATH. (The behaviour for PATH alone was changed in r965679 for PR 43906.) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1811831 13f79535-47bb-0310-9956-ffa450edef68
2017-10-11Documentation rebuildLuca Toscano3-351/+370
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1811813 13f79535-47bb-0310-9956-ffa450edef68
2017-10-11On the trunk:Stefan Eissing9-12/+151
mod_md: v1.0.0, new config directive 'MDNotifyCmd' to hook in a program when Managed Domains have obtained/renewed their certificates successfully. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1811812 13f79535-47bb-0310-9956-ffa450edef68
2017-10-10core, mod_rewrite: introduce the 'redirect-keeps-vary' noteLuca Toscano3-0/+17
to allow proper Vary header insertion when dealing with a RewriteRule in a directory context. This change is an attempt to fix a long standing problem, brought up while working on PR 58231. Our documentation clearly states the following: "If a HTTP header is used in a condition this header is added to the Vary header of the response in case the condition evaluates to true for the request." This is currently not true for RewriteCond/Rules working in a directory context, since when an internal redirect happens all the outstanding response headers get dropped. There might be a better solution so I am looking forward to hear more opinions and comments. My goal for a delicate change like this one would be to affect the least amount of configurations possible, without triggering unwanted side effects. If the solution is good for everybody tests will be written in the suite asap. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1811744 13f79535-47bb-0310-9956-ffa450edef68
2017-10-10Rebuild.Lucien Gentis4-36/+109
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1811666 13f79535-47bb-0310-9956-ffa450edef68
2017-10-10XML updates.Lucien Gentis2-32/+109
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1811665 13f79535-47bb-0310-9956-ffa450edef68
2017-10-10ab: Make the TLS layer aware that the underlying socket is nonblocking,Yann Ylavic2-18/+53
and use/handle POLLOUT where needed to avoid busy IOs and recover write errors when appropriate. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1811664 13f79535-47bb-0310-9956-ffa450edef68
2017-10-10ab: Keep reading nonblocking to exhaust TCP or SSL buffers when previousYann Ylavic2-0/+9
read was incomplete (the SSL case can cause the next poll() to timeout since data are buffered already). PR 61301 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1811649 13f79535-47bb-0310-9956-ffa450edef68
2017-10-09* Make it compatible with Python 3Ruediger Pluem1-4/+7
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1811570 13f79535-47bb-0310-9956-ffa450edef68
2017-10-09* The calculation of the sizes was flawed:Ruediger Pluem1-5/+5
The index tells us the size of the node in 4096 byte pages minus 1. Hence we need to multiply back with 4096 aka << 12 (plus adding the missing page). git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1811569 13f79535-47bb-0310-9956-ffa450edef68
2017-10-09* Convert to int before usingRuediger Pluem1-1/+1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1811541 13f79535-47bb-0310-9956-ffa450edef68
2017-10-09* It needs to be the dereferenced nodeRuediger Pluem1-1/+1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1811540 13f79535-47bb-0310-9956-ffa450edef68
2017-10-08mod_ssl: fix add_policy() w.r.t. OPENSSL_NO_COMP. PR 61592.Yann Ylavic1-0/+2
Proposed by: Bernard Spil <brnrd freebsd.org> Reviewed by: ylavic git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1811475 13f79535-47bb-0310-9956-ffa450edef68
2017-10-06* Take the pointer from Yann: s/childs/children/Ruediger Pluem1-4/+4
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1811285 13f79535-47bb-0310-9956-ffa450edef68
2017-10-05* Add dump_all_pools and dump_pool_and_childs.Ruediger Pluem1-0/+92
- dump_all_pools: Dump the whole pool hierarchy starting from apr_global_pool. Requires an arbitrary pool as starting parameter. - dump_pool_and_childs: Dump the whole pool hierarchy starting from the given pool. dump_pool_and_childs is written in Python using the GDB Python API as doing recursive stuff in standard GDB macros is very difficult. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1811192 13f79535-47bb-0310-9956-ffa450edef68
2017-10-05fix propertiesAndré Malo1-1/+1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1811163 13f79535-47bb-0310-9956-ffa450edef68
2017-10-04make docs.Yann Ylavic4-31/+98
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1811115 13f79535-47bb-0310-9956-ffa450edef68
2017-10-04Follow up to r1810358: add html files.Yann Ylavic2-0/+115
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1811113 13f79535-47bb-0310-9956-ffa450edef68
2017-10-04Follow up to r1810605.Yann Ylavic1-29/+93
Update docs' BNF, provide a short description of the new %{::} syntax and a few examples. To be continued.. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1811111 13f79535-47bb-0310-9956-ffa450edef68
2017-10-04Follow up to rr1810605 and r1811104.Yann Ylavic3-621/+583
Generated parser files. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1811105 13f79535-47bb-0310-9956-ffa450edef68
2017-10-04ap_expr: follow up to r1810605.Yann Ylavic4-222/+127
The "split" and "join" operators are now a prefix, ala perl. Add the "sub" operator for string substitutions, prefix still. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1811104 13f79535-47bb-0310-9956-ffa450edef68
2017-10-04On the trunk:Stefan Eissing8-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
2017-10-03ap_expr: follow up to r1810605.Yann Ylavic2-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
2017-10-03Axe backported entries.Yann Ylavic1-30/+0
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1811007 13f79535-47bb-0310-9956-ffa450edef68
2017-10-03Also affects official clang 5 (maybe older ones too...)Jim Jagielski1-2/+2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1810998 13f79535-47bb-0310-9956-ffa450edef68
2017-10-03httpdunit: include .h to avoid code duplication.Yann Ylavic1-17/+1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1810761 13f79535-47bb-0310-9956-ffa450edef68
2017-10-03Follow up to r1804123 r1809633.Yann Ylavic3-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
2017-10-03apr_expr: follow up to r1810605.Yann Ylavic1-3/+2
Not necessarily ASCII here.. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1810702 13f79535-47bb-0310-9956-ffa450edef68
2017-10-02ap_expr: open string expressions to the <word>.Yann Ylavic9-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
2017-10-02xformsJim Jagielski28-3/+29
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1810570 13f79535-47bb-0310-9956-ffa450edef68
2017-10-02Get maintainer-mode working again w/ clang-900Jim Jagielski1-0/+10
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1810448 13f79535-47bb-0310-9956-ffa450edef68
2017-10-02More C90 stuff...Jim Jagielski1-5/+8
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1810447 13f79535-47bb-0310-9956-ffa450edef68
2017-10-02Final comment-format changesJim Jagielski1-9/+9
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1810365 13f79535-47bb-0310-9956-ffa450edef68
2017-10-02And standard format - no functional changeJim Jagielski1-195/+212
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1810363 13f79535-47bb-0310-9956-ffa450edef68
2017-10-02C changes / C90/C89Jim Jagielski1-18/+27
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1810362 13f79535-47bb-0310-9956-ffa450edef68
2017-10-02Userland changeJim Jagielski1-1/+3
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1810360 13f79535-47bb-0310-9956-ffa450edef68
2017-10-02Fold in ALv2 licensed UWSGI proxy (sub)module as acknowledged viaJim Jagielski5-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
2017-10-02Add a warning for host starting with a letter.Jean-Frederic Clere2-0/+17
Fix for PR 61540. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1810316 13f79535-47bb-0310-9956-ffa450edef68
2017-09-30Fix ascii art :)Yann Ylavic1-1/+1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1810233 13f79535-47bb-0310-9956-ffa450edef68
2017-09-30Rebuild.Lucien Gentis2-3/+3
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1810204 13f79535-47bb-0310-9956-ffa450edef68