1
0
mirror of https://github.com/apache/httpd.git synced 2026-10-23 22:49:01 +03:00
Commit Graph

17940 Commits

Author SHA1 Message Date
Philip M. Gollucci
a736c6c16d sync with trunk before I start mucking in the waters themselves
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/apreq-integration@725390 13f79535-47bb-0310-9956-ffa450edef68
2008-12-10 19:18:59 +00:00
Philip M. Gollucci
1ddd51491f relocate so that we don't need to rename apreq_ to ap_
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/apreq-integration@725386 13f79535-47bb-0310-9956-ffa450edef68
2008-12-10 19:13:23 +00:00
Philip M. Gollucci
ab179a9267 copy the apreq module itself over to httpd server core modules
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/apreq-integration@725384 13f79535-47bb-0310-9956-ffa450edef68
2008-12-10 19:07:36 +00:00
Philip M. Gollucci
94fcb7f5b0 copy the library over to the httpd server core
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/apreq-integration@725379 13f79535-47bb-0310-9956-ffa450edef68
2008-12-10 18:52:48 +00:00
Takashi Sato
a550230f1a Fix meta-file link error introduced in r725291
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@725334 13f79535-47bb-0310-9956-ffa450edef68
2008-12-10 16:50:58 +00:00
Takashi Sato
ddc69e1140 update for sync with English docs.
English Revison: 420990

Submitted by: kawai
Reviewed by:  takashi

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@725327 13f79535-47bb-0310-9956-ffa450edef68
2008-12-10 16:31:31 +00:00
Takashi Sato
9cff7c3cbc Add an incomplete document for mod_lbmethod_heartbeat.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@725291 13f79535-47bb-0310-9956-ffa450edef68
2008-12-10 14:09:15 +00:00
Takashi Sato
0543d26b30 Add incomplete documents for mod_heartbeat and mod_heartmonitor.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@725289 13f79535-47bb-0310-9956-ffa450edef68
2008-12-10 14:06:02 +00:00
Jim Jagielski
6777364613 Hopefully the final fix for the subreq/filter issue. The
prob was that we at this point could still have some
stale and incorrect refs when we adjusted the f-stack.
So move the update earlier so when we adjust, we're
affecting r. RŸdiger and Jim pretty much
simultaneously :)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@725077 13f79535-47bb-0310-9956-ffa450edef68
2008-12-10 13:01:31 +00:00
Nick Kew
33623e8548 Add security section to mod_privileges docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724959 13f79535-47bb-0310-9956-ffa450edef68
2008-12-10 02:26:48 +00:00
Philip M. Gollucci
1a3928abab branch to integrate libapreq and mod_apreq2 to httpd core
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/apreq-integration@724895 13f79535-47bb-0310-9956-ffa450edef68
2008-12-09 21:17:23 +00:00
Chris Darroch
85e7288fb5 whitespace cleanup
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724813 13f79535-47bb-0310-9956-ffa450edef68
2008-12-09 18:40:18 +00:00
Jim Jagielski
a36484e4e0 reset chain if we need to...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724805 13f79535-47bb-0310-9956-ffa450edef68
2008-12-09 18:19:20 +00:00
Joe Orton
5a83c545be * modules/ssl/ssl_private.h: Add a big fat warning about
the SSLModConfigRec lifetime.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724802 13f79535-47bb-0310-9956-ffa450edef68
2008-12-09 18:11:36 +00:00
Joe Orton
61d7e254c9 * modules/ssl/ssl_engine_config.c (ssl_cmd_SSLSessionCache): Don't fix
the socache instance for the lifetime of the process since it is
  allocated out of pconf.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724789 13f79535-47bb-0310-9956-ffa450edef68
2008-12-09 17:26:50 +00:00
Joe Orton
172d563455 * include/ap_socache.h: Use C++ safety wrappers, and rename ->delete
to ->remove since the former is a C++ reserved word.

* modules/ssl/ssl_scache.c (ssl_scache_remove): Update accordingly.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724745 13f79535-47bb-0310-9956-ffa450edef68
2008-12-09 15:19:08 +00:00
Joe Orton
b078f2374e * include/ap_socache.h: Define AP_SOCACHE_DEFAULT_PROVIDER as a
default provider name, to allow consumers to use a default provider
  if not configured otherwise.

* modules/cache/mod_socache_shmcb.c (register_hooks): Register shmcb
  as the default provider.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724723 13f79535-47bb-0310-9956-ffa450edef68
2008-12-09 14:52:59 +00:00
Joe Orton
778a79de65 Improve mod_ssl's environment variable extraction to correctly handle
DNs with duplicate tags:

* modules/ssl/ssl_engine_vars.c:
  Augment the ssl_var_lookup_ssl_cert_dn_rec table with a flag
  to indicate whether RDNs of the given NID should be extracted
  to the environment.
  (extract_dn, modssl_var_extract_dns): New functions.

* modules/ssl/ssl_private.h (modssl_var_extract_dns): Add prototype.

* modules/ssl/ssl_engine_kernel.c: Remove SSL_*_DN_ from the list
  of variables to insert into the environment.
  (ssl_hook_Fixup): Use modssl_var_extract_dns to insert the
  SSL_*_DN_ variables efficiently and accurately, handling
  certs with duplicate RDN tags correctly.

PR: 45875


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724717 13f79535-47bb-0310-9956-ffa450edef68
2008-12-09 14:41:21 +00:00
Joe Orton
dce91079c1 Reduce config overhead for use of socache interface by allowing
default paths to be used if none are configured:

* include/ap_socache.h (ap_socache_provider_t::create):
  Allow arg to be NULL to force use of defaults.
  (ap_socache_provider_t::init): Rename 'namespace' parameter to
  'cname' and restrict to allow use in filesystem paths.
  
* modules/cache/mod_socache_dbm.c (socache_dbm_create, 
  socache_dbm_init),
  modules/cache/mod_socache_shmcb.c (socache_shmcb_create, 
  socache_shmcb_init): 
  Default to use of runtimedir-relative paths if no
  explicit path is configured.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724682 13f79535-47bb-0310-9956-ffa450edef68
2008-12-09 13:11:45 +00:00
Takashi Sato
066449386f Increment version.ent. We are at 2.3.1-dev.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724667 13f79535-47bb-0310-9956-ffa450edef68
2008-12-09 11:50:45 +00:00
Roy T. Fielding
bd3f025d91 missing line breaks
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724569 13f79535-47bb-0310-9956-ffa450edef68
2008-12-09 00:56:14 +00:00
Ruediger Pluem
206fa0e2f4 * Correctly remove the SUBREQ_CORE filter from the filter chain if we do an
internal fast redirect and if the new redirected request is NO subrequest.
  This fixes at least one of the possible subtle issues mentioned in the
  comment to r620133.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724515 13f79535-47bb-0310-9956-ffa450edef68
2008-12-08 22:18:27 +00:00
Jim Jagielski
0b645bf324 OK, instead of an igly hack, just use the normal
build system impl to force balancer's config to
happen post proxy 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724367 13f79535-47bb-0310-9956-ffa450edef68
2008-12-08 14:51:50 +00:00
Jim Jagielski
c27585f6e4 Explain some things
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724360 13f79535-47bb-0310-9956-ffa450edef68
2008-12-08 14:31:30 +00:00
Jim Jagielski
826cb7f002 Force the lbmethod submodules to be loaded AFTER
mod_proxy.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724358 13f79535-47bb-0310-9956-ffa450edef68
2008-12-08 14:28:28 +00:00
Ruediger Pluem
c7d3363295 * Remove unused variable
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724332 13f79535-47bb-0310-9956-ffa450edef68
2008-12-08 12:54:51 +00:00
Graham Leggett
45a2a06018 Make sure the htdocs directory appears in the RPM build.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724168 13f79535-47bb-0310-9956-ffa450edef68
2008-12-07 18:43:43 +00:00
Graham Leggett
fb3873d4f2 Remove the obsolete serial attribute from the RPM spec file. Compile
against the external pcre. Add missing binaries fcgistarter, and
mod_socache* and mod_session*.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724162 13f79535-47bb-0310-9956-ffa450edef68
2008-12-07 17:47:53 +00:00
Takashi Sato
6a33aa0896 Add a note that these are under development.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724103 13f79535-47bb-0310-9956-ffa450edef68
2008-12-07 09:14:15 +00:00
Paul Querna
c4c3eaf2d1 2.3.1 is now in development.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724097 13f79535-47bb-0310-9956-ffa450edef68
2008-12-07 07:19:35 +00:00
Paul Querna
432d1edf3b Roll on trunk to 2.3.1-dev.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724096 13f79535-47bb-0310-9956-ffa450edef68
2008-12-07 06:37:14 +00:00
Paul Querna
14623a3daf Remove -dev flag to prepare for 2.3.0.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724094 13f79535-47bb-0310-9956-ffa450edef68
2008-12-07 06:36:20 +00:00
Paul Querna
24f396ce76 When an expires or cache-control header are sent, the RFC does allow us to cache normally non-cacheable response statuses.
Submitted by: Alex Polvi <alex polvi.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724093 13f79535-47bb-0310-9956-ffa450edef68
2008-12-07 06:33:02 +00:00
Paul Querna
0a0ac63f29 Use cmd->temp_pool for temp allocations during configuration.
Suggested by: Takashi Sato <takashi lans-tv.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724092 13f79535-47bb-0310-9956-ffa450edef68
2008-12-07 06:23:04 +00:00
Paul Querna
5aa5f9850d Make ctx:status an apr_status_t, and be consistent about checking and setting it.
Suggested by: Takashi Sato <takashi lans-tv.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724091 13f79535-47bb-0310-9956-ffa450edef68
2008-12-07 06:15:40 +00:00
Paul Querna
d9ceaf6a9b Use APR_THREAD_FUNC for heart{beat,monitor} thread workers.
Suggested by: Takashi Sato <takashi lans-tv.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724090 13f79535-47bb-0310-9956-ffa450edef68
2008-12-07 06:11:42 +00:00
Paul Querna
7ff39c3567 Remove commented out block that wouldn't even work in this context.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724084 13f79535-47bb-0310-9956-ffa450edef68
2008-12-07 05:51:23 +00:00
Paul Querna
a3c055552e bump minor for new apis
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724083 13f79535-47bb-0310-9956-ffa450edef68
2008-12-07 05:50:07 +00:00
Paul Querna
2b494140a5 Don't pass in a pool to to argstr_to_table, and duplicate r->args before sending it in.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724080 13f79535-47bb-0310-9956-ffa450edef68
2008-12-07 05:45:31 +00:00
Takashi Sato
746e3a6e1f update transformations
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724013 13f79535-47bb-0310-9956-ffa450edef68
2008-12-06 17:09:42 +00:00
Takashi Sato
c73a91e509 fix XML errors of r723560
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724007 13f79535-47bb-0310-9956-ffa450edef68
2008-12-06 16:51:28 +00:00
Takashi Sato
02fe31e6c5 Sync with the codes about the independence of load balancing scheduler algorithms. (r722948 - r722952)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724006 13f79535-47bb-0310-9956-ffa450edef68
2008-12-06 16:42:42 +00:00
Ruediger Pluem
487f3bd805 * Don't enable mod_wombat by default for now.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@723960 13f79535-47bb-0310-9956-ffa450edef68
2008-12-06 09:22:55 +00:00
Eric Covener
75ffcceaec provide a little more context in the multiple hostnames example
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@723890 13f79535-47bb-0310-9956-ffa450edef68
2008-12-05 22:04:40 +00:00
Paul Querna
453059c24a Merge mod_wombat from the wombat branch:
<https://svn.apache.org/repos/asf/httpd/httpd/branches/wombat-integration>
Into trunk.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@723843 13f79535-47bb-0310-9956-ffa450edef68
2008-12-05 20:09:32 +00:00
Paul Querna
54d13fef11 Make the max time from when we last saw a host a compile time option.
Suggested by: Ruediger Pluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@723685 13f79535-47bb-0310-9956-ffa450edef68
2008-12-05 09:29:52 +00:00
Paul Querna
778042daaa Add a note that the ratelimit module was added
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@723682 13f79535-47bb-0310-9956-ffa450edef68
2008-12-05 09:26:11 +00:00
Paul Querna
ab548fbcbb Always break out if the connection is aborted.
Notced by: Ruediger Pluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@723681 13f79535-47bb-0310-9956-ffa450edef68
2008-12-05 09:24:29 +00:00
Paul Querna
b2d3c5d5a5 Also init mutex_path in hm_create_config.
Suggested by: Ruediger Pluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@723679 13f79535-47bb-0310-9956-ffa450edef68
2008-12-05 09:20:19 +00:00
Paul Querna
c283a61afb Print the correct enum value for the lock mech.
Suggested by: Ruediger Pluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@723677 13f79535-47bb-0310-9956-ffa450edef68
2008-12-05 09:16:20 +00:00