www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-01-06 09:01:14 +03:00
Code Activity
22,926 Commits 62 Branches 306 Tags
67efe11db4fefaf2aa9ffdec39524f7df6919321
Commit Graph

7888 Commits

Author SHA1 Message Date
Stefan Fritsch
879c6541a4 Return an error code from a previous input filter 
This likely fixes PR 52914


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1301111 13f79535-47bb-0310-9956-ffa450edef68
 2012-03-15 17:36:17 +00:00
Stefan Fritsch
03a8b1b4c2 Fix some typos 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1300766 13f79535-47bb-0310-9956-ffa450edef68
 2012-03-14 22:21:50 +00:00
Stefan Fritsch
4a60b16326 some more trace logging for AddOutputFilterByType 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1299783 13f79535-47bb-0310-9956-ffa450edef68
 2012-03-12 18:51:52 +00:00
Eric Covener
b0a64838ac Stray/confusing "recovery" in this failonstatus=XXX error message seems 
to be a copy/paste error.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1299738 13f79535-47bb-0310-9956-ffa450edef68
 2012-03-12 17:03:39 +00:00
Jim Jagielski
5caa336986 Move away from DEFAULT_REL_RUNTIMEDIR and use ap_runtime_dir_relative() 
API

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1299718 13f79535-47bb-0310-9956-ffa450edef68
 2012-03-12 15:45:03 +00:00
Jim Jagielski
e7fdd879a7 Use new ap_runtime_dir_relative() API 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1298433 13f79535-47bb-0310-9956-ffa450edef68
 2012-03-08 15:40:42 +00:00
Eric Covener
7ab4cfe81a PR52845: "DirectoryIndex disabled" should blow away the DirectoryIndex settings 
in the current config section, not just override previous config sections.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1297958 13f79535-47bb-0310-9956-ffa450edef68
 2012-03-07 12:42:09 +00:00
Jim Jagielski
04ed74941a Allow for DEFAULT_REL_RUNTIMEDIR ala socache... prevent perm issues 
with some configs

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1297560 13f79535-47bb-0310-9956-ffa450edef68
 2012-03-06 16:20:17 +00:00
Kaspar Brand
ec3dcc172f properly free the GENERAL_NAMEs, as pointed out in PR 32652 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1294471 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-28 06:01:23 +00:00
Stefan Fritsch
960f0a63cd Initialize EC temporary key on server startup, as for DH and 
RSA. This fixes a race condition that could lead to a crash with threaded
MPMs.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1294306 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-27 20:01:40 +00:00
Stefan Fritsch
ac4effde8d Pass the EOS bucket down the filter chain 
PR: 52766


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1293717 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-25 22:51:33 +00:00
Stefan Fritsch
a1cbd5ddfb Enable per-module loglevel for mod_xml2enc and mod_proxy_html 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1293708 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-25 22:15:42 +00:00
Graham Leggett
720f5f4e43 mod_session: Sessions are encoded as application/x-www-form-urlencoded strings, however we 
do not handle the encoding of spaces properly. Fixed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1293658 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-25 18:10:56 +00:00
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