www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-10-23 22:49:01 +03:00
Code Activity
29,900 Commits 62 Branches 313 Tags
httpdunit
Commit Graph

1022 Commits

Author SHA1 Message Date
Jacob Champion
4b2a7701b1 ab: don't call malloc_init for OpenSSL 1.1.0 
Patch by rjung.

The 1.1.0 compatibility macro for OpenSSL_malloc_init() causes problems
when mixed with procedure linkage stubs with some toolchains (e.g. GCC).
OpenSSL's malloc implementation doesn't recognize that the PLT stub
points back to it, which leads to infinite recursion.

Since the 1.1.0 documentation states that calling this function
explicitly is no longer necessary except "in certain shared-library
situations"(?), get rid of it.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1795830 13f79535-47bb-0310-9956-ffa450edef68
 2017-05-22 16:40:54 +00:00
Yann Ylavic
6b7f4310e7 htpasswd: report the right limit when get_password() overflows. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1781516 13f79535-47bb-0310-9956-ffa450edef68
 2017-02-03 09:11:03 +00:00
Yann Ylavic
ce23a724d7 htpasswd: don't point to (unused) stack memory on output 
to make static analysers happy.  PR 60634.

Reported by shqking and Zhenwei Zou.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1781509 13f79535-47bb-0310-9956-ffa450edef68
 2017-02-03 08:51:49 +00:00
Eric Covener
d7b14caa57 rotatelogs: fix -n help text 
this closes #24

Submitted By: Isaac Boukris <iboukris gmail.com>



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1780308 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-26 02:02:59 +00:00
Rainer Jung
d79b514c4b Fix spelling in comments and text files. 
No functional change.
PR 59990


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1756038 13f79535-47bb-0310-9956-ffa450edef68
 2016-08-11 19:50:02 +00:00
Yann Ylavic
1d89808eba ab: follow up to r1750854: still better naming, and a C89 fix. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1750960 13f79535-47bb-0310-9956-ffa450edef68
 2016-07-01 15:08:10 +00:00
Yann Ylavic
5259ef3f2c ab: follow up to r1750854: some comments and better naming. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1750955 13f79535-47bb-0310-9956-ffa450edef68
 2016-07-01 15:04:30 +00:00
Yann Ylavic
639c5fa352 ab: follow up to r1750854. 
Use SNI when available by default, and invert -I logic to now disable it.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1750947 13f79535-47bb-0310-9956-ffa450edef68
 2016-07-01 14:47:48 +00:00
Yann Ylavic
dd593e6c18 ab: follow up to r1750854: put the -I at the right place for apr_getopt(). 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1750855 13f79535-47bb-0310-9956-ffa450edef68
 2016-06-30 19:01:41 +00:00
Yann Ylavic
7b62ffbe80 ab: add SNI support when available. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1750854 13f79535-47bb-0310-9956-ffa450edef68
 2016-06-30 18:48:40 +00:00
William A. Rowe Jr
b89b38ae13 Prepare to backport, this is not specific to VS 2015... 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1748448 13f79535-47bb-0310-9956-ffa450edef68
 2016-06-14 18:32:27 +00:00
Stefan Fritsch
6931dd5bd9 Fix comment typo 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1745864 13f79535-47bb-0310-9956-ffa450edef68
 2016-05-28 10:45:53 +00:00
Stefan Fritsch
d48dfdec16 Fix segfault with logresolve -c and IPv6 
Due to a logic error, there could be a NULL pointer dereference.

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=823259


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1745863 13f79535-47bb-0310-9956-ffa450edef68
 2016-05-28 10:45:18 +00:00
Gregg Lewis Smith
94b38ab53b PR59630: include OpenSSL_Applink when compiling on Visual Studio 2015 and up 
Submitted By: Jan Ehrhardt <phpdev ehrhardt.nl>
Committed By: gsmith


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1745767 13f79535-47bb-0310-9956-ffa450edef68
 2016-05-27 15:47:23 +00:00
Gregg Lewis Smith
6cd0e218bf _setargv will not compile on _MSC_VER > 1700 MS documentation's example simply does not work. Disabe for now, Apachemonitor still works. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1745516 13f79535-47bb-0310-9956-ffa450edef68
 2016-05-25 16:27:59 +00:00
Yann Ylavic
f43ff54486 ab: follow up to r1738415: EC_curve_nid2nist() available in OpenSSL-1.0.2 and later. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1741566 13f79535-47bb-0310-9956-ffa450edef68
 2016-04-29 08:02:24 +00:00
Jean-Frederic Clere
fab3101178 print Server Temp Key information. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1738415 13f79535-47bb-0310-9956-ffa450edef68
 2016-04-10 10:19:51 +00:00
Rainer Jung
fc8497424b Support for OpenSSL 1.1.0: 
- ab: use new API SSL_CTX_set_max_proto_version()
  and SSL_CTX_set_min_proto_version() in
  combination with TLS_client_method() instead
  of the old deprecated methods.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735891 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-20 18:26:22 +00:00
Jeff Trawick
5b20d24ba0 Follow-up to r1734817: suexec passes through mod_include's DOCUMENT_ARGS 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1734955 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-14 16:31:36 +00:00
Yann Ylavic
7f070bafe6 ab: Use caseless matching for HTTP tokens (e.g. content-length). 
PR 59111.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1733537 13f79535-47bb-0310-9956-ffa450edef68
 2016-03-04 00:10:10 +00:00
Rainer Jung
967edd5581 Support for OpenSSL 1.1.0 
- ab


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728907 13f79535-47bb-0310-9956-ffa450edef68
 2016-02-07 01:03:15 +00:00
Eric Covener
435859e875 block bcrypt on EBCDIC -- lots of ascii-isms in apr-util's bcrypt. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1710403 13f79535-47bb-0310-9956-ffa450edef68
 2015-10-24 23:37:10 +00:00
Kaspar Brand
4c9b3c3b35 Support compilation against libssl built with OPENSSL_NO_SSL3, 
and change the compiled-in default for SSL[Proxy]Protocol to "all -SSLv3",
in accordance with RFC 7568. PR 58349, PR 57120.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1703952 13f79535-47bb-0310-9956-ffa450edef68
 2015-09-19 08:40:56 +00:00
Christophe Jaillet
01d13ed57b Silence a sparse warning about inconsistent indenting + some minor style issues 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1700338 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-31 20:46:23 +00:00
Christophe Jaillet
0a16ce1aa5 Silence a sparse warning about inconsistent indenting 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1700322 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-31 19:56:47 +00:00
Christophe Jaillet
b7cfaea90a Silence a sparse warning about inconsistent indenting 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1700321 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-31 19:51:05 +00:00
Christophe Jaillet
4ba6c05ebe Silence a sparse warning about inconsistent indenting 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1700320 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-31 19:50:19 +00:00
Gregg Lewis Smith
9db6088a18 The increased use of UuidCreate() in APR 1.5.2+ introduces an unresolved 
reference to UuidCreate() to these support applications that link with 
apr-1.lib and do not already link rpcrt4.lib.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1676654 13f79535-47bb-0310-9956-ffa450edef68
 2015-04-29 01:43:33 +00:00
Christophe Jaillet
c95e60170d tab vs space 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1674214 13f79535-47bb-0310-9956-ffa450edef68
 2015-04-17 05:48:28 +00:00
Rainer Jung
f222f9fdf0 Choose "-D" instead of "-d" for the rotatelogs 
option that creates the path to the log file.

I want to use "-d" for another directory related
option next where (I think) the "directory" "d"
makes more sense.

"-d" has not yet been backported, so changing
to "-D" is not a real compatibility issue.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1666417 13f79535-47bb-0310-9956-ffa450edef68
 2015-03-13 12:24:17 +00:00
Rainer Jung
d6cb8ec8e3 Small changes to rotatelogs: 
- add "-n num" to help text
- clarify in help text, that "program is invoked"
  is the "-p" case
- prevent crash with "-v" (verbose) if no
  "-p prog" is used
- add one space for formatting


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1666415 13f79535-47bb-0310-9956-ffa450edef68
 2015-03-13 12:15:40 +00:00
Yann Ylavic
62eef24b7f ab: Add missing longest request (100%) to CSV export. 
Submitted by: Marcin Fabrykowski <bugzilla fabrykowski.pl>
Committed by: ylavic


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1661913 13f79535-47bb-0310-9956-ffa450edef68
 2015-02-24 12:14:05 +00:00
Stefan Fritsch
4893ecda29 suexec: Filter out HTTP_PROXY 
Some programs look there for the http proxy server.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1659711 13f79535-47bb-0310-9956-ffa450edef68
 2015-02-13 23:24:10 +00:00
Eric Covener
ecf622ac2e split-logfile: Fix perl error: 'Can't use string ("example.org:80") 
as a symbol ref while "strict refs"'. PR 56329.

Submitted By: Holger Mauermann <mauermann gmail.com>
Committed By: covener




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1648719 13f79535-47bb-0310-9956-ffa450edef68
 2014-12-31 15:39:02 +00:00
Jan Kaluža
430892c1ab ab: Use only one connection to determine working destination socket address. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1628388 13f79535-47bb-0310-9956-ffa450edef68
 2014-09-30 10:39:41 +00:00
Jan Kaluža
79a0532100 ab: try all destination socket addresses returned by apr_sockaddr_info_get 
instead of failing on first one when not available.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1626956 13f79535-47bb-0310-9956-ffa450edef68
 2014-09-23 07:12:54 +00:00
Jan Kaluža
43803691a0 ab: increase request and response header size to 8192 bytes, 
fix potential buffer-overflow in Server: header handling.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1622450 13f79535-47bb-0310-9956-ffa450edef68
 2014-09-04 10:52:24 +00:00
Jan Kaluža
b19b5a54c3 * support/ab.c: Fix crash caused by integer overflow when printing stats with 
lot of requests (for example -n 500000000).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1617913 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-14 12:15:31 +00:00
Christophe Jaillet
b854d7e818 Remove some 'register' in variable declaration. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1610366 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-14 09:05:27 +00:00
Yann Ylavic
f0f9b0bfb3 ab: support custom HTTP method with -m argument. PR 56604. 
Example: ab -n 1 -m PING http://127.0.0.1/

Submitted By: Roman Jurkov <winfinit gmail com>
Committed By: ylavic


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1601076 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-07 08:45:56 +00:00
Jeff Trawick
56da5cba0a Ensure that min/max valid timestamps (milliseconds since the epoch) 
make sense:  no negative numbers, and require an input of "-" instead
of "0" to indicate that the timestamp isn't being provided.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1595034 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-15 20:19:10 +00:00
Jeff Trawick
c51e4d9cbc Add module mod_ssl_ct, which provides an implementation of Certificate 
Transparency (RFC 6962) for httpd.

mod_ssl_ct requires OpenSSL 1.0.2 (in beta) and must be explicitly
enabled via configure.

Note that support/ctauditscts is purposefully not installed; it
does not properly function due to a dependency on a 
certificate-transparency open source project tool which itself is
not sufficiently complete at this time.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1588987 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-21 21:14:21 +00:00
Joe Orton
b7d63d4da7 * support/rotatelogs.c (main): Prevent creation of zombies from 
post-rotate programs.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1587255 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-14 16:38:30 +00:00
Joe Orton
252dcdcf31 * support/ab.c: Revert accidental version bump in r1580928. 
(Although it seems likely this *should* have been bumped sometime
   since 2006?)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1580935 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-24 17:43:10 +00:00
Joe Orton
31badda9f4 * support/ab.c (write_request): Avoid redundant write(,,0) preceding 
the write() of the request.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1580928 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-24 17:20:47 +00:00
Jeff Trawick
1a3a8daf9b follow-up to r1542533: 
fix format string (unsigned vs. size_t)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1543020 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-18 12:52:03 +00:00
Stefan Fritsch
b792a83b1e Check all memory allocations and abort on failure 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1542533 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-16 17:11:55 +00:00
Jeff Trawick
30f8aa6460 more apr_file_write_full() simplification (like r1542413) 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1542416 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-15 22:03:16 +00:00
Joe Orton
00cf228909 * support/rotatelogs.c: Introduce an adjusted_time_t type to store the 
weird "adjusted time since epoch" type returned by get_now().
  Switch from int to long to fix an unnecessary Y2K38 issue.  Adjust
  use throughout and clean up other type issues.  No functional change
  intended apart from fixing Y2K38.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1537718 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-31 21:58:31 +00:00
Jeff Trawick
9f238af57d Remove unused APXS setting from template for generated Makefile 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1535699 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-25 11:36:00 +00:00