summaryrefslogtreecommitdiffstats
path: root/support (follow)
Commit message (Collapse)AuthorAgeFilesLines
* ab: Fix the detection for when the server performed a legitimateGraham Leggett2022-02-091-2/+10
| | | | | | | | | connection close as per RFC7230 6.3.1. We must check whedther the connection was previously kept alive, and not whether the current closed request is keepalive. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1897912 13f79535-47bb-0310-9956-ffa450edef68
* ab: Add an optional ramp delay when starting concurrent connections soGraham Leggett2022-02-081-7/+83
| | | | | | | | | as to not trigger denial of service protection in the network. Report levels of concurrency achieved in cases where the test completes before full concurrency is achieved. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1897866 13f79535-47bb-0310-9956-ffa450edef68
* Reinstate r1897458 accidentally reverted in r1897760.Graham Leggett2022-02-081-43/+80
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1897861 13f79535-47bb-0310-9956-ffa450edef68
* *) core/mod_ssl/mpm_event: reverting changes to nonblocing SSL handshakesStefan Eissing2022-02-041-80/+43
| | | | | | | | | | to stabilize CI tests again. Previous revision of trunk has been copied to branches/trunk-ssl-handshake-unblocking to make those into a PR where changes can be discussed and tested separately. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1897760 13f79535-47bb-0310-9956-ffa450edef68
* check BIO_new(3) return valuesGiovanni Bechis2022-02-011-3/+13
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1897662 13f79535-47bb-0310-9956-ffa450edef68
* ab: Respond appropriately to SSL_ERROR_WANT_READ and SSL_ERROR_WANT_WRITE.Graham Leggett2022-01-251-43/+80
| | | | | | | | Previously the correct event was polled for, but the response to the poll would call write instead of read, and read instead of write. PR 55952 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1897458 13f79535-47bb-0310-9956-ffa450edef68
* Revert stray modification in r1897336.Graham Leggett2022-01-241-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1897408 13f79535-47bb-0310-9956-ffa450edef68
* When failing, we need to explicitly set the connection state.Graham Leggett2022-01-221-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1897336 13f79535-47bb-0310-9956-ffa450edef68
* As in r1877467 for mod_ssl, for OpenSSL 1.1.1+ require that OpenSSL isJoe Orton2021-12-071-0/+15
| | | | | | | | | | | configured with a suitable entropy source and don't try to seed it from getpid etc. * support/ab.c (main): Check RAND_status(). (ssl_rand_seed, ssl_rand_choosenum): Drop for OpenSSL 1.1.1+. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1895659 13f79535-47bb-0310-9956-ffa450edef68
* * support/ab.c (main): Check apr_getopt() returned APR_EOF, fixing clangJoe Orton2021-12-031-2/+2
| | | | | | | | | warning: support/ab.c:2343:13: warning[deadcode.DeadStores]: Although the value stored to 'status' is used in the enclosing expression, the value is never actually read from 'status' git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1895559 13f79535-47bb-0310-9956-ffa450edef68
* * server/mpm/event/event.c, Joe Orton2021-05-171-19/+18
| | | | | | | | | | | | | | | | server/mpm/simple/simple_run.c, support/htcacheclean.c: Adjust use of APR_RING macros to ensure the APR_RING_HEAD is always embedded in a containing structure, to avoid warnings with GCC 11. (apr_ring.h also suggests this is best practice) See also: https://bugzilla.redhat.com/show_bug.cgi?id=1957353 https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98503 msgid <814cca2a-1992-3fae-bb0e-c84b3d09b73b@gmail.com> Github: closes #186 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1889957 13f79535-47bb-0310-9956-ffa450edef68
* * support/htpasswd.c: Fix typo. [skip ci]Joe Orton2020-12-161-1/+1
| | | | | | | | Submitted by: Ikko Ashimine <eltociear gmail.com> Github: closes #149 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1884509 13f79535-47bb-0310-9956-ffa450edef68
* Fix misleading crypt vs hash terminology in ht* and dbmmanage tools.Yann Ylavic2020-12-083-56/+56
| | | | | | | | | | | | | What the htpasswd, htdbm and dbmmanage tools do is hashing passwords, not encrypting them, so fix the terminology in manpages, docs, --help, comments and function names. Submitted by: Michele Preziuso <mpreziuso kaosdynamics.com> Reviewed by: ylavic Github: closes #153 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1884207 13f79535-47bb-0310-9956-ffa450edef68
* * support/htpasswd.c (usage): Fix typo. [skip ci]Joe Orton2020-06-101-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1878703 13f79535-47bb-0310-9956-ffa450edef68
* Windows : do not include ap_config_auto.h Steffen Land2020-05-131-0/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1877693 13f79535-47bb-0310-9956-ffa450edef68
* * support/passwd_common.c (mkhash): Fix salt buffer size for SHA2Joe Orton2020-05-011-1/+1
| | | | | | | (caught by gcc 10). git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1877251 13f79535-47bb-0310-9956-ffa450edef68
* sort safe_env_lst Giovanni Bechis2020-04-221-2/+2
| | | | | | | bz 65371 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1876815 13f79535-47bb-0310-9956-ffa450edef68
* * support/suexec.c (main): Report error string after failure fromJoe Orton2020-04-201-2/+4
| | | | | | | setgid/initgroups or setuid. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1876745 13f79535-47bb-0310-9956-ffa450edef68
* * support/suexec.c (safe_strtol): New function.Joe Orton2020-04-201-2/+29
| | | | | | | | | | (main): Use ^ to be avoid using atoi(); try to catch more string to integer and integer to uid/gid conversion errors/surprises. PR: 33207 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1876744 13f79535-47bb-0310-9956-ffa450edef68
* * Whitespace style fixes. No functional change.Ruediger Pluem2020-04-141-2/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1876493 13f79535-47bb-0310-9956-ffa450edef68
* PR64313 htcacheclean: Empty directories in CacheRoot are still present even ↵Jean-Frederic Clere2020-04-141-0/+9
| | | | | | after using "-t" git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1876484 13f79535-47bb-0310-9956-ffa450edef68
* silence an "uninitialized value" warningGiovanni Bechis2020-03-231-1/+6
| | | | | | | bz 63307 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1875534 13f79535-47bb-0310-9956-ffa450edef68
* fix apxs for non-destdir buildsEric Covener2020-03-191-1/+6
| | | | | | | | | | subtr(...,0, -1) chops off a character and leaves relative path. (you will need to re-run configure) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1875429 13f79535-47bb-0310-9956-ffa450edef68
* * support/suexec.c (clean_env): Revert use of ap_calloc inJoe Orton2020-02-181-1/+1
| | | | | | | | r1874156 which broke the build. https://travis-ci.org/apache/httpd/builds/651858409 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1874158 13f79535-47bb-0310-9956-ffa450edef68
* convert malloc(3) into ap_mallocGiovanni Bechis2020-02-181-1/+1
| | | | | | | bz 64049 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1874156 13f79535-47bb-0310-9956-ffa450edef68
* Fix spelling errors found by codespell. [skip ci]Mike Rumph2020-02-134-5/+5
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1873985 13f79535-47bb-0310-9956-ffa450edef68
* Allow instdso.sh to be found while cross compiling.Graham Leggett2019-12-281-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1872062 13f79535-47bb-0310-9956-ffa450edef68
* Add support for cross compiling to apxs. If apxs is being executed from ↵Graham Leggett2019-12-281-5/+10
| | | | | | | | | | somewhere other than its target location, add that prefix to includes and library directories. Without this, apxs would fail to find config_vars.mk and exit. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1872042 13f79535-47bb-0310-9956-ffa450edef68
* ab.c: Replace zeustech.net with web archive linkEric Covener2019-12-271-3/+4
| | | | | | | | | | | | | closes #84 https://github.com/apache/httpd/pull/84 https://issues.apache.org/jira/browse/LEGAL-502 Submitted By: Josua Schmid <josua.schmid renuo.ch> git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1872033 13f79535-47bb-0310-9956-ffa450edef68
* Fix a typoChristophe Jaillet2019-09-201-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1867257 13f79535-47bb-0310-9956-ffa450edef68
* -l and -L are not exclusive.Christophe Jaillet2019-08-091-11/+15
| | | | | | | Document the 'G' suffix. Fix some minor style issues. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1864784 13f79535-47bb-0310-9956-ffa450edef68
* * support/htpasswd.c (usage): More usage fixes for SHA-2; describeJoe Orton2019-07-081-6/+6
| | | | | | | as "secure", leave bcrypt only algorithm described as "very secure". git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1862724 13f79535-47bb-0310-9956-ffa450edef68
* * support/htpasswd.c (usage): Document SHA-256/512 support.Joe Orton2019-07-051-3/+7
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1862611 13f79535-47bb-0310-9956-ffa450edef68
* Add support for SHA-2 crypt() algorithm in htpasswd.Joe Orton2019-06-213-6/+57
| | | | | | | | | | | | | | | | | * configure.in: Detect SHA-2 support in crypt(). * support/passwd_common.h: Define ALG_CRYPT_SHA256, ALG_CRYPT_SHA512, include ap_config_auto.h. * support/htpasswd.c (check_args): Allow -2, -5, -r arguments for SHA-256, SHA-256 and rounds options respectively. * support/passwd_common.c (parse_common_options): Parse -2, -5, -r args. (mkhash): Generate crypt hash for SHA256/SHA512 algorithms. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1861793 13f79535-47bb-0310-9956-ffa450edef68
* * support/htpasswd.c (usage): Fix bcrypt round maximum.Joe Orton2018-11-091-1/+1
| | | | | | | | | | * docs/manual/programs/htpasswd.xml: Document that bcrypt rounds are capped at 17. PR: 62078 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1846254 13f79535-47bb-0310-9956-ffa450edef68
* * support/suexec.c (clean_env): Avoid use of sprintf; no functional change.Joe Orton2018-11-091-3/+1
| | | | | | | PR: 33207 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1846253 13f79535-47bb-0310-9956-ffa450edef68
* ab: Add client certificate support.Graham Leggett2018-09-231-1/+26
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1841784 13f79535-47bb-0310-9956-ffa450edef68
* Success of 'SHGetMalloc()' should be tested with the SUCCEEDED macro.Christophe Jaillet2018-05-241-1/+1
| | | | | | | | /!\ This commit is _NOT COMPILE TESTED_. (I don't have a windows build environment available) See PR 60086. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1832198 13f79535-47bb-0310-9956-ffa450edef68
* ab: Disable printing temp key for OpenSSL beforeRainer Jung2018-03-161-2/+6
| | | | | | | | version 1.0.2. SSL_get_server_tmp_key is not available there. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1826930 13f79535-47bb-0310-9956-ffa450edef68
* ab: follow up to r1738415: handle any tmp key id.Yann Ylavic2018-03-151-0/+5
| | | | | | | Otherwise, we print garbage (e.g. for X25519). git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1826880 13f79535-47bb-0310-9956-ffa450edef68
* LibreSSL doesn't have or require applink.cGregg Lewis Smith2018-01-211-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1821767 13f79535-47bb-0310-9956-ffa450edef68
* copy applink.c in OpenSSL 1.1.0 to from /ms to /include to match location in ↵Gregg Lewis Smith2018-01-211-0/+27
| | | | | | 1.0.2 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1821766 13f79535-47bb-0310-9956-ffa450edef68
* * support/Makefile.in, acinclude.m4: Add OpenSSL libraries at the end of theJoe Orton2017-11-281-2/+2
| | | | | | | ab link line, not the start. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1816534 13f79535-47bb-0310-9956-ffa450edef68
* ab: follow up to r1811664.Yann Ylavic2017-11-021-5/+3
| | | | | | | | | apr_socket_send() can return both an error and data, account for data in the latter case (i.e. let next call fail, if any). git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1814118 13f79535-47bb-0310-9956-ffa450edef68
* * support/htpasswd.c (main): Only check for readability if running inJoe Orton2017-10-201-1/+11
| | | | | | | | | verify (-v) mode. PR: 61631 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1812756 13f79535-47bb-0310-9956-ffa450edef68
* ab: Make the TLS layer aware that the underlying socket is nonblocking,Yann Ylavic2017-10-101-18/+49
| | | | | | | | | 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
* ab: Keep reading nonblocking to exhaust TCP or SSL buffers when previousYann Ylavic2017-10-101-0/+5
| | | | | | | | | 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
* htdigest: prevent buffer overflow when strings in lines are too long.Luca Toscano2017-09-111-7/+17
| | | | | | | | | Reported by: Hanno Böck PR: 61511 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1808008 13f79535-47bb-0310-9956-ffa450edef68
* mod_ssl, ab: compatibility with LibreSSL. PR 61184.Yann Ylavic2017-07-301-0/+8
| | | | | | | | | | | | | | | LibreSSL defines OPENSSL_VERSION_NUMBER = 2.0, but is not compatible with all of the latest OpenSSL 1.1 API. Address this by defining MODSSL_USE_OPENSSL_PRE_1_1_API which is true for anything but OpenSSL >= 1.1 (for now). Proposed by: Bernard Spil <brnrd freebsd.org> Reviewed by: ylavic git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1803396 13f79535-47bb-0310-9956-ffa450edef68
* * Do not apply the strict permissions of the temporary file to a possiblyRuediger Pluem2017-07-032-2/+2
| | | | | | | | | | existing passwd file. This long standing bug was triggered by fixing a bug in APR in r1791029. PR: 61240 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1800594 13f79535-47bb-0310-9956-ffa450edef68