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
17,940 Commits 62 Branches 313 Tags
apreq-integration
Commit Graph

6098 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
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
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
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
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
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
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
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
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
Paul Querna
d9370018b8 Add a comment explaining the start mutex. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@723675 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-05 09:14:14 +00:00
Paul Querna
e5c05b8707 Log the correct function name. 
Suggested by: Ruediger Pluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@723674 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-05 09:12:52 +00:00
Paul Querna
609f1d7aeb D'oh. Fix r723672 and use the correct define. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@723673 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-05 09:12:09 +00:00
Paul Querna
7b55419d4e Make the frequency with how often we write the stats file a compile time option. 
Suggested by: Ruediger Pluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@723672 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-05 09:08:53 +00:00
Paul Querna
88c3dd9d66 Make hm_ctx_t:keep_running a volatile. 
Suggested by: Ruediger Pluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@723669 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-05 09:06:06 +00:00
Paul Querna
b23b3ec7f8 Show the correct mutex type (even if its just the enum id) rather than the default one, if it fails. 
Suggested by: Ruediger Pluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@723666 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-05 09:03:57 +00:00
Paul Querna
4a8f5f80c5 Add comment explaining the startup mutex. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@723665 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-05 08:57:16 +00:00
Paul Querna
24bbbd088e Use correct function name in log message. 
Suggested By: Ruediger Pluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@723663 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-05 08:52:50 +00:00
Paul Querna
8b2f6257e4 Don't overcount busy servers from previous generations. 
Suggested by: Ruediger Pluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@723661 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-05 08:50:08 +00:00
Paul Querna
33f371102e Make hb_ctx_t:keep_running volatile. 
Suggested by: Ruediger Pluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@723660 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-05 08:47:36 +00:00
Paul Querna
11c4538ebb Finish removing dependecy on apreq 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/wombat-integration@723654 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-05 08:37:56 +00:00
Paul Querna
96dacc63db Build the right objects for wombat. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/wombat-integration@723653 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-05 08:37:42 +00:00
Paul Querna
b337e10ae2 Use ap_args_to_table instead of apreq for GET query params. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/wombat-integration@723631 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-05 07:17:07 +00:00
Paul Querna
5cc222ff42 Remove apreq includes 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/wombat-integration@723630 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-05 07:16:35 +00:00
Paul Querna
b560421e74 Use only c89 style comments 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/wombat-integration@723628 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-05 07:16:10 +00:00
Paul Querna
81df07c6ea Add wombat to build system. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/wombat-integration@723618 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-05 07:03:41 +00:00
Paul Querna
d1a48094dc Initial import of mod_wombat to the modules directory. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/wombat-integration@723615 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-05 06:45:13 +00:00
Paul Querna
e70a4ba68c Remove X-Pad work around. 
Submitted by: Takashi Sato <takashi lans-tv.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@723585 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-05 05:10:13 +00:00
Paul Querna
f47b6f394e Import the core parts of the DTrace patch. This is a modified and updated 
version of what was submited by Theo before:
 <http://mail-archives.apache.org/mod_mbox/httpd-dev/200805.mbox/%3C6AFBCFE8-4CCA-4A02-8A43-F9170689695D@omniti.com%3E>

Note, this does not hook it up into the build system at this time, because
the original patch was a little too creative there.

Submitted By: Theo Schlossnagle <jesus omniti.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@723565 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-05 03:34:52 +00:00
Eric Covener
1691affda8 unixd_config/ap_unixd_config rename for mod_privileges 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@723078 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-03 21:14:50 +00:00
Eric Covener
da1c66ba05 unixd_config->ap_unixd_config renames for mod_suexec 
Submitted By: Dan Poirier
Reviewed By: covener


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@722958 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-03 16:29:07 +00:00
Jim Jagielski
653ac709cc All lbmethods are now ind submodules... 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@722952 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-03 16:08:26 +00:00
Jim Jagielski
c26d704939 Allow for ind lbs to build 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@722951 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-03 16:07:50 +00:00
Jim Jagielski
7945337ff0 Add in independent bytraffic lbmethod 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@722950 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-03 16:07:11 +00:00
Jim Jagielski
49c39903be Add in independent byrequests lbmethod 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@722949 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-03 16:06:43 +00:00