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
22,821 Commits 62 Branches 313 Tags
mpm-event-optimization
Commit Graph

7875 Commits

Author SHA1 Message Date
Stefan Fritsch
3c92125e3a Fix AddOutputFilterByType brown paper bag crash bug 
Initialize pointers, fix off-by-one.

PR: 52755


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1293405 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-24 20:42:24 +00:00
Stefan Fritsch
cfccfe5aea Check during config test that directories for access logs exist 
PR 29941


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1243651 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-13 18:50:16 +00:00
Kaspar Brand
4060b48fcb Fix regression introduced in r1222917: in ssl_find_vhost(), we must use 
the *new* SSL_CTX settings for the SSL_set_options/SSL_set_verify calls.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1243246 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-12 12:44:16 +00:00
Joe Orton
e16536b2cd * modules/proxy/mod_proxy_http.c (ap_proxy_http_process_response): 
Treat EAGAIN as an error for a blocking read from the input filter
  stack.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1242798 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-10 14:52:25 +00:00
Jim Jagielski
732f60dc2c Handle cases, esp when using mod_proxy_fcgi, when we do not 
want SCRIPT_FILENAME to include the query string.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1242351 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-09 15:07:22 +00:00
Daniel Ruggeri
104e5a433c Add cleanup for SSLProxyMachineCertificateChainFile during init 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1242089 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-08 21:02:20 +00:00
Stefan Fritsch
d79b3c1513 Fix various filter functions to return apr_status_t instead of int 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1240315 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-03 19:48:01 +00:00
Mladen Turk
9f1045e8b5 Fix PR52402. Check if the shared memory was already created for this proxy_server_conf 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1240181 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-03 14:13:23 +00:00
Mladen Turk
a631bc9edb oops, this got forgotten when copy/paste from dev branch 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1240171 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-03 13:53:20 +00:00
Mladen Turk
7fac08440e C/C++ 101 on how to traverse the array of pointers ;). Fix core 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1240164 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-03 13:47:59 +00:00
Eric Covener
23c21127c0 revert "overloaded" recent additions to mod_rewrite 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1239872 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-02 21:51:36 +00:00
Eric Covener
67ffac76d3 add an internal sleep map function that expands to an empty string. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1239681 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-02 15:51:09 +00:00
Eric Covener
38982673f2 treat a rewriterule substitution that expands to "-" as if the rule 
had a literal "-".


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1239679 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-02 15:43:41 +00:00
Rainer Jung
dbb41e9923 No need for multi-version compatibility. 
Broke trunk, because the COOKIE was advanced
to "AP25".


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1239071 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-01 11:08:59 +00:00
Rainer Jung
7b167c68d3 Remove luaL_reg macro definition no longer needed 
and simplify lua_load compatibility macro.

Note that in order to successfully compile with
Lua 5.2.0 we still need to add LUA_COMPAT_ALL
to CPPFLAGS. Detection in config.m4 is still
missing.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1239030 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-01 09:51:59 +00:00
Rainer Jung
d0257e2db8 luaL_reg was already deprecated in Lua 5.1.4. 
It is gone in Lua 5.2.0 and was replaced by luaL_Reg
which already existed in 5.1.4. So use that one..


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1239029 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-01 09:50:14 +00:00
Rainer Jung
11ffbb51b5 Minor fixes for firehose and mod_policy: 
- err.h does not exist in Solaris. Judging
  from the expected content of err.h we don't
  use it at all, so remove inclusion of it.
- The name DEFAULT_TYPE is to generic. Use
  POLICY_DEFAULT_TYPE instead.
- Include apr header files from configured
  path instead of system path.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1239027 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-01 09:47:53 +00:00
Stefan Fritsch
6702d1e8fc Revert r1202255 to restore same behavior as in 2.4: 
disable mod_reqtimeout if not configured

There is some agreement that 2.4's behavior is fine.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1238826 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-31 21:53:17 +00:00
Rainer Jung
2f24671828 Fix copy&paste error in comment. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1238545 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-31 14:00:14 +00:00
Jim Jagielski
d052a532be https also needs QS 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1236350 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-26 19:14:58 +00:00
Stefan Fritsch
f21ee09d4a More configure time dependencies: 
mod_cache_disk depends on mod_cache
mod_heartbeat depends on mod_watchdog


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1234297 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-21 10:26:51 +00:00
Stefan Fritsch
21cc07a470 Make APACHE_MODULE() accept an optional prerequisite module for configure. 
Introduce the following configure time dependencies:
  mod_proxy_* (except proxy_html) require mod_proxy
  mod_dav_* require mod_dav
  mod_session_* require mod_session


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1234180 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-20 22:14:31 +00:00
Jeff Trawick
6635e5a3da Adjust CVE-2011-3368/CVE-2011-4317 fixes to rely solely on 
core's translate-name to fail unsupported URIs.

Rewrite and proxy now decline what they don't support rather
than fail the request.

Suggested by: trawick
Implemented by: jorton
Tweaked by: wrowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1233604 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-19 22:23:15 +00:00
Jeff Trawick
ba8bc09ce4 fix const warning with strchr->ap_strchr mapping 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1231602 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-15 00:27:57 +00:00
Jeff Trawick
89c22869f4 remove unused function 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1231601 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-15 00:27:16 +00:00
Eric Covener
5a295bfcee whitespace only: shift a block refactored in r1231255 over 8 spaces. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1231257 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-13 19:18:03 +00:00
Eric Covener
a9a720a405 *) mod_authnz_ldap: Don't try a potentially expensive nested groups 
search before exhausting all AuthLDAPGroupAttribute checks on the
     current group. PR52464



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1231255 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-13 19:16:50 +00:00
Kaspar Brand
a595ac1706 fix signedness issue with SSL_X509_NAME_to_string()'s maxlen argument 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1228816 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-08 10:08:19 +00:00
Jim Jagielski
2232c2c14b optimize this... Do strlen() ONLY if we need to check 
for overflow.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1228766 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-08 01:40:01 +00:00
William A. Rowe Jr
33d94f3328 Cure size_t abuse, curse some recent code [recommit good bits from r1227852] 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1227856 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-05 21:50:31 +00:00
William A. Rowe Jr
07e32f24db Revert a whole mess that was not ment to be committed 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1227855 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-05 21:48:21 +00:00
William A. Rowe Jr
0d1f9f658a Cure size_t abuse, curse some recent code 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1227852 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-05 21:43:24 +00:00
Eric Covener
be417c2c1e Update the comment and checks around address/connection reusability 
in mod_proxy.  

The checks and comment are a vestige of 2.0.x
mod_proxy_http where the backend proxy conn was stored in 
the frontend r->conn_config, but ap_proxy_determine_connection()
doesn't associate the frontend and backend conns like this.




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1227642 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-05 15:45:01 +00:00
Eric Covener
2293ff191f restore the generic proxy workers to not being address-reusable. 
The guts of mod_proxy is not really ready for the addr and host on a 
proxy_conn_rec to change over time and differ from the 1 cached in the worker.

* proxy_worker->cp->addr needs to know what host/port it cached
* conn->addr and conn->hostname need to be allocated from their own subpool
  so they can be cleared as they change
* ap_proxy_determine_connection needs to be more careful about which
  addr is the TCP endpoint and what we have in either cache.
* may need to avoid updating the proxy_worker addr cache if we know
  the value is flipping.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1227637 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-05 15:41:47 +00:00
Stefan Fritsch
277ee6b6fc Add a bit of debug logging 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1226375 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-02 09:00:55 +00:00
Stefan Fritsch
bb6cc59dc6 Display registered providers 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1225799 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-30 11:00:31 +00:00
Stefan Fritsch
13a94b29b6 Sort list of modules 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1225796 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-30 10:52:51 +00:00
Stefan Fritsch
92696d1b3c Display all those shiny new hooks that we have in 2.4 
Add new section "Other Hooks" for those that don't fit into "Startup Hooks"
or "Request Hooks"


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1225795 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-30 10:49:43 +00:00
Kaspar Brand
a30532d2a7 Fix another case of #ifdef-within-a-macro (which was inadvertently 
introduced a few days ago).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1225791 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-30 10:39:00 +00:00
Stefan Fritsch
a97bec21dc Don't use #ifdef inside macro calls 
The behavior is undefined according to C99 6.10.3.11 and it breaks with
xlc on AIX

PR: 52394


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1225476 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-29 08:57:55 +00:00
Stefan Fritsch
066712a8cd SECURITY: CVE-2012-0021 (cve.mitre.org) 
Fix segfault when trying to log a nameless valueless cookie

PR: 52256
Submitted by: Rainer Canavan <rainer-apache 7val com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1225380 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-28 23:15:04 +00:00
Kaspar Brand
b020069af4 add missing #ifdef in ssl_cmd_protocol_parse (should have been in r1222921) 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1222930 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-24 07:31:50 +00:00
Kaspar Brand
1af61dfb2e SSLProtocol: allow explicit control of TLSv1.1 and TLSv1.2 flavors when 
compiled against OpenSSL 1.0.1 or later. Update documentation.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1222921 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-24 06:40:10 +00:00
Kaspar Brand
9900465205 Set OPENSSL_NO_SSL_INTERN when compiling against OpenSSL 1.0.1 
or later, so that mod_ssl retains binary compatibility with future
versions when internal structures are changed. Use API functions
where available, and fall back to direct access for OpenSSL up
to 1.0.0, where needed.

Remove SSL_make_ciphersuite() from ssl_util_ssl.[ch], as it was
never used by any released version of mod_ssl.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1222917 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-24 06:31:37 +00:00
Kaspar Brand
da4b2f4513 REMOTE_ADDR is now r->useragent_ip, which is not/never available at 
SSL_CB_HANDSHAKE_DONE time. ap_log_cerror() already logs c->client_ip
for us, however, so we can simply drop REMOTE_ADDR from the message.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1222915 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-24 06:22:49 +00:00
Graham Leggett
e666d3a64e mod_mime: Don't arbitrarily bypass AddOutputFilter during a ProxyPass, 
but then allow AddOutputFilter during a RewriteRule [P]. Make mod_mime
behave identically in both cases. PR52342.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1222370 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-22 17:48:17 +00:00
Graham Leggett
a03bcce31d mod_policy: Add a new testing module to help server administrators 
enforce a configurable level of protocol compliance on their
servers and application servers behind theirs.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1221668 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-21 10:42:34 +00:00
Guenter Knauf
f180dc581c Added mod_firehose and firehose to NetWare build. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1221216 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-20 12:13:29 +00:00
Guenter Knauf
94f1766d3b Some cosmetic NetWare makefile tweaks. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1221213 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-20 11:55:03 +00:00
Guenter Knauf
3db3bf501c Make mod_lua compile with lua 5.2.x. 
MOdified patch submitted by NormW (nornw gknw net).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1221205 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-20 11:27:43 +00:00