]>
granicus.if.org Git - apache/log
Rich Bowen [Sun, 11 Jun 2006 17:49:34 +0000 (17:49 +0000)]
Submitted by Vincent 'noodl' Bray, this adds a link from the module doc
to the caching discussion, for clarification of obscure points.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@413486
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sun, 11 Jun 2006 15:37:24 +0000 (15:37 +0000)]
Referring to stuff added in 1.1, in the 2.2 docs, seems a little
archaic. Rephrase a little.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@413465
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sun, 11 Jun 2006 15:34:12 +0000 (15:34 +0000)]
emove an appendix that hasn't really been useful since the turn of the
century.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@413464
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sun, 11 Jun 2006 12:38:13 +0000 (12:38 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@413440
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sat, 10 Jun 2006 03:55:12 +0000 (03:55 +0000)]
For quite some time now, 'graceful' and 'restart' have done a config
file syntax check prior to actually attempting to restart. These notes
are no longer true.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@413222
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sat, 10 Jun 2006 03:25:25 +0000 (03:25 +0000)]
Submitted by Matt Lewandowsky (matt@iamcode.net).
The handler name is now isapi-handler instead of isapi-isa, although
apparently both will still work, at least for now.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@413220
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sat, 10 Jun 2006 03:04:22 +0000 (03:04 +0000)]
/usr/local/apache/apache should just be /usr/local/apache
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@413218
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sat, 10 Jun 2006 02:53:11 +0000 (02:53 +0000)]
There's four of 'em, not three. I know there's a Monty Python quote in
here somewhere, I just can't find it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@413217
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sat, 10 Jun 2006 02:04:32 +0000 (02:04 +0000)]
Provide links to the two support programs that are listed on that
'other' page, rather than the nondescript and unhelpful 'other' link.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@413208
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sat, 10 Jun 2006 02:03:34 +0000 (02:03 +0000)]
Use the correct markup for the httpd program.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@413207
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sat, 10 Jun 2006 01:51:27 +0000 (01:51 +0000)]
Use the phrase used elsewhere in the documentation "root privileges".
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@413204
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sat, 10 Jun 2006 01:44:10 +0000 (01:44 +0000)]
* Show how to pass additional arguments to config.nice
* Note that su is required for `make install`
* Minor gramatical nitpicking.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@413203
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Fri, 9 Jun 2006 11:15:41 +0000 (11:15 +0000)]
PR#39761
Make the error message more meaningful when DBD is configured
without a driver.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@413015
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Thu, 8 Jun 2006 10:56:22 +0000 (10:56 +0000)]
Fix comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@412721
13f79535 -47bb-0310-9956-
ffa450edef68
Jason S. Lingohr [Tue, 6 Jun 2006 06:27:46 +0000 (06:27 +0000)]
http://issues.apache.org/bugzilla/show_bug.cgi?id=39726
Documentation bug submitted by Luis Parravicini <lparra@itboss.com.ar>.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@412019
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Mon, 5 Jun 2006 16:19:32 +0000 (16:19 +0000)]
Apply mod_speling enhancement posted by Olivier Thereaux
(plus teensy weensy tidyup)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@411849
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sat, 3 Jun 2006 20:52:58 +0000 (20:52 +0000)]
* If possible, check if the size of an object to cache is within the
configured boundaries before actually saving data.
Submitted by: Niklas Edmundsson <nikke acc.umu.se>
Reviewed by: rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@411469
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sat, 3 Jun 2006 19:57:51 +0000 (19:57 +0000)]
* The first comment did not really hit what we do.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@411466
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sat, 3 Jun 2006 19:41:49 +0000 (19:41 +0000)]
* info->expire and info->date are in microseconds. So convert the difference
to seconds before comparing it to age which is in seconds.
PR: 39713
Submitted by: Owen Taylor <otaylor redhat.com>
Reviewed by: rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@411464
13f79535 -47bb-0310-9956-
ffa450edef68
Bradley Nicholes [Fri, 2 Jun 2006 22:18:05 +0000 (22:18 +0000)]
Fix authnz_ldap invalid auth detection
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@411315
13f79535 -47bb-0310-9956-
ffa450edef68
Bradley Nicholes [Fri, 2 Jun 2006 22:01:53 +0000 (22:01 +0000)]
Fix a problem with invalid auth error detection for LDAP client SDKs that don't support LDAP_SECURITY_ERROR macro. PR#39529
Submitted by: [Ray Price <dohrayme yahoo.com>], [Josh Fenlason <jfenlason ptc.com>]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@411306
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 1 Jun 2006 20:33:33 +0000 (20:33 +0000)]
* Sync with 2.2.x CHANGES
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@410942
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 1 Jun 2006 10:45:06 +0000 (10:45 +0000)]
* configure.in: Use common variables for the required APR/APR-util
version.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@410828
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 1 Jun 2006 05:52:22 +0000 (05:52 +0000)]
Notice, we got NOTICE.txt
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@410767
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 1 Jun 2006 05:50:07 +0000 (05:50 +0000)]
One problem with keeping a compost pile. As you add the dog's droppings,
the leaves, the grass clippings, and don't add any bacteral agents, in
the end you have one friggin big smelly pile.
Completely refactor the accumulated cruft of rewriting conf files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@410765
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 1 Jun 2006 05:43:16 +0000 (05:43 +0000)]
Provide vhosts examples remotely related to the httpd.conf we create?
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@410762
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 1 Jun 2006 05:42:13 +0000 (05:42 +0000)]
That's the point, isn't it? All mpm's in one basket?
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@410761
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 1 Jun 2006 05:41:28 +0000 (05:41 +0000)]
Ewww... can't we be consistant with our workfiles paths?
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@410758
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 1 Jun 2006 05:40:34 +0000 (05:40 +0000)]
Add example/default allow-from for localhost, please???
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@410757
13f79535 -47bb-0310-9956-
ffa450edef68
Chris Darroch [Wed, 31 May 2006 19:34:37 +0000 (19:34 +0000)]
Add comments re worker shutdown troubles on Linux and use of
ap_os_killpg() in worker.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@410645
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 30 May 2006 20:48:09 +0000 (20:48 +0000)]
* Keep the Content-Type for successfully revalidated
cached objects, by unsetting possible Content-Type headers in
r->headers_out and r->err_headers_out as they may be different to what
we have received from the cache.
Actually they are not needed as r->content_type set by
ap_set_content_type a few lines above will be used in the store_headers
functions of the storage providers as a fallback and the HTTP_HEADER filter
does overwrite the Content-Type header with r->content_type anyway.
PR: 39647
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@410370
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Mon, 29 May 2006 11:59:39 +0000 (11:59 +0000)]
Chop historic notes no longer relevant since 2.2 release.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@410082
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Mon, 29 May 2006 11:49:02 +0000 (11:49 +0000)]
PR#39672: Check that filter exists before trying to insert it
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@410079
13f79535 -47bb-0310-9956-
ffa450edef68
Martin Kraemer [Mon, 29 May 2006 07:48:19 +0000 (07:48 +0000)]
The syntax ">&/dev/null" is csh-style, not bourne-style shell.
Change it so that all bourne-style shells understand it.
I am going to make the same fix in 2.2.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@410047
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sun, 28 May 2006 10:32:01 +0000 (10:32 +0000)]
* Remove temporary files if renaming fails, otherwise they may accumulate.
Submitted by: Davi Arnaut <davi haxent.com.br>
Reviewed by: rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@409942
13f79535 -47bb-0310-9956-
ffa450edef68
Chris Darroch [Fri, 26 May 2006 18:27:23 +0000 (18:27 +0000)]
On graceless shutdown or restart, send AP_SIG_GRACEFUL to all worker
threads so that any that are polling on Keep-Alive connections will
wake up and exit promptly. Otherwise, on Linux, they wait until
poll()'s timeout interval completes, which is often too long for
the parent process; the parent issues SIGKILL before the child's main
thread manages to re-join all the worker threads. PR 38737.
On Solaris, by contrast, the close_worker_sockets() function
successfully alerts all worker threads that they should exit quickly.
On Linux, this side-effect of one thread closing another's socket
doesn't occur; see:
http://bugme.osdl.org/show_bug.cgi?id=546
Also, expand on the placeholder in CHANGES regarding previous
cleanups to scoreboard.c and scoreboard.h in r404848 and r404849.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@409715
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 26 May 2006 18:03:01 +0000 (18:03 +0000)]
small cleanup of EBCDIC support in mod_proxy_ajp
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@409709
13f79535 -47bb-0310-9956-
ffa450edef68
Chris Darroch [Fri, 26 May 2006 16:26:52 +0000 (16:26 +0000)]
Make the worker and event MPMs not touch the scoreboard when
handling a fork() failure. The previous behaviour appears to have
been inherited from the prefork MPM, where is it appropriate.
The prefork MPM sets thread_limit to 1 and therefore each
child process has a single worker_score structure in the scoreboard's
array, i.e., ap_scoreboard_image->servers[slot][0]. In make_child(),
it sets this structure's status to SERVER_STARTING, and then does
a fork(); if the fork() fails, it resets the status to SERVER_DEAD.
The worker and event MPMs, by constrast, obviously use multiple
worker_score structures per child process. They may also be
in use by worker threads from a previous generation at any particular
moment. Therefore make_child() and the parent process in general
doesn't normally update them; make_child() doesn't set them all
to SERVER_STARTING before doing fork(), for example.
So, make_child() shouldn't set them to SERVER_DEAD if fork()
fails (and even if it should, it certainly shouldn't be just
updating the first one).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@409693
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 25 May 2006 20:19:08 +0000 (20:19 +0000)]
* Update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@409457
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 25 May 2006 20:14:52 +0000 (20:14 +0000)]
* Add a note about trailing slashes for ProxyPass and fix the balancer example
accordingly.
PR: 39203
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@409455
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 25 May 2006 19:50:25 +0000 (19:50 +0000)]
* Actually we are adding 3 bytes to the string (two for the length in front
and a \0 at the end) and not 2. So adjust the length check.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@409446
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 25 May 2006 19:41:40 +0000 (19:41 +0000)]
* Fix documentation about the data types of attributes in the AJP protocol.
PR: 39658
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@409442
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 22 May 2006 19:05:09 +0000 (19:05 +0000)]
* Cleanup the code by replacing some inline code to lower-case a string with
ap_str_tolower.
Proposed by: Joe Orton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@408729
13f79535 -47bb-0310-9956-
ffa450edef68
Garrett Rooney [Sun, 21 May 2006 23:08:56 +0000 (23:08 +0000)]
Make the logging in mod_proxy_fcgi more consistent.
* modules/proxy/mod_proxy_fcgi.c
(fcgi_do_request): Log errors as APLOG_ERR.
(proxy_fcgi_handler): Log debug info as APLOG_DEBUG.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@408520
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sun, 21 May 2006 22:50:20 +0000 (22:50 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@408516
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sun, 21 May 2006 10:29:09 +0000 (10:29 +0000)]
* Fix const compiler warning introduced by r407357.
Noticed by: Joe Orton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@408154
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 17 May 2006 19:16:43 +0000 (19:16 +0000)]
* Handle the cases "no proxy request" and "reverse proxy request" in the same
manner, when setting scheme and port_str. This is needed because if a cached
entry is looked up by mod_cache's quick handler r->proxyreq
is still unset in the reverse proxy case as it only gets set in the
translate name hook (either by ProxyPass or mod_rewrite) which is run
after the quick handler hook. This is different to the forward proxy
case where it gets set before the quick handler is run (in the
post_read_request hook).
If a cache entry is created by the CACHE_SAVE filter we always have
r->proxyreq set correctly.
Also set scheme to ap_http_scheme(r) instead of "http" to handle SSL
correctly.
PR: 39593
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@407357
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 17 May 2006 14:23:41 +0000 (14:23 +0000)]
* modules/generators/mod_autoindex.c (output_directories): Escape
filename in non-FancyIndexing case.
PR: 38910
Submitted by: Robby Griffin <rmg terc.edu>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@407265
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 16 May 2006 14:17:02 +0000 (14:17 +0000)]
* server/main.c (abort_on_oom): New function.
(create_process): Set abort callback for process pool.
(main): Set abort callback for global pool.
Reviewed by: colm
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@406953
13f79535 -47bb-0310-9956-
ffa450edef68
Sander Temme [Mon, 15 May 2006 18:15:19 +0000 (18:15 +0000)]
Document r399947, addition of optional scheme:// to ServerName directive
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@406697
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 10 May 2006 11:51:41 +0000 (11:51 +0000)]
* server/mpm/prefork/prefork.c (child_main): Tag pchild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@405721
13f79535 -47bb-0310-9956-
ffa450edef68
Martin Kraemer [Wed, 10 May 2006 07:36:54 +0000 (07:36 +0000)]
Typo (..for use with by the scoreboard) changed to
"..for use by the scoreboard" (not 100% sure -- or
should it be "..for use with the scoreboard"?)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@405665
13f79535 -47bb-0310-9956-
ffa450edef68
Garrett Rooney [Wed, 10 May 2006 04:16:57 +0000 (04:16 +0000)]
Add support for fcgi:// proxies to mod_rewrite.
Submitted by: Markus Schiegl <ms schiegl.com>
* modules/mappers/mod_rewrite.c
(is_absolute_uri): Recognize fcgi:// urls.
* CHANGES: Note change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@405625
13f79535 -47bb-0310-9956-
ffa450edef68
Roy T. Fielding [Tue, 9 May 2006 17:36:55 +0000 (17:36 +0000)]
revert last entry -- not user visible and poorly worded
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@405478
13f79535 -47bb-0310-9956-
ffa450edef68
Thom May [Tue, 9 May 2006 11:59:26 +0000 (11:59 +0000)]
remove test/zb.c
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@405400
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 8 May 2006 10:57:49 +0000 (10:57 +0000)]
* server/core.c (server_hostname_port): Remove unused variable.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@405010
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Sun, 7 May 2006 21:07:14 +0000 (21:07 +0000)]
Note scoreboard stuff in changes; leave the 'difficult' patches
to see if they attract any more review.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@404851
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Sun, 7 May 2006 21:03:39 +0000 (21:03 +0000)]
Initialise server generation (Chris Darroch)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@404850
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Sun, 7 May 2006 21:01:48 +0000 (21:01 +0000)]
Tidy up scoreboard.h (Chris Darroch)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@404849
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Sun, 7 May 2006 21:00:08 +0000 (21:00 +0000)]
Scoreboard size (Chris Darroch)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@404848
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 5 May 2006 08:34:43 +0000 (08:34 +0000)]
mod_ssl stuff which has been done.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@400010
13f79535 -47bb-0310-9956-
ffa450edef68
Sander Temme [Fri, 5 May 2006 04:17:36 +0000 (04:17 +0000)]
Add optional 'scheme://' prefix to ServerName directive. For
'https', mod_http returns "https" for the ap_hook_http_scheme and
DEFAULT_HTTPS_PORT for ap_hook_default_port. This fixes Redirect
responses to requests for directories without a trailing slash
when httpd runs behind a proxy or offload device that processes
SSL. It also enables support for Subversion in that
configuration. This change is completely backwards compatible
and passes the perl-framework. Minor mmn bump because I add a
field to server_rec.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@399947
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 4 May 2006 11:26:12 +0000 (11:26 +0000)]
mod_charset_lite: Bypass translation when the source and dest charsets
are the same.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@399668
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 4 May 2006 11:18:45 +0000 (11:18 +0000)]
Stop returning DECLINED from the output filter for proxy
requests.
Filters can't return that type of status.
The way to decline filter handling is to pass through the input
data unchanged and hopefully remove the output filter
permanently.
As long as the proxy flag was set in the fixup hook, we
didn't fill in our request config and the filter will be
a no-op anyway.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@399665
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 3 May 2006 19:34:35 +0000 (19:34 +0000)]
* Add Content-Type to headers_out if not already set. This ensures that
the Content-Type of the cached entity gets restored correctly.
PR: 39266
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@399388
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 3 May 2006 13:16:57 +0000 (13:16 +0000)]
* modules/ssl/ssl_scache_shmcb.c: Rewrite of shmcb session cache to
reduce complexity and ensure all accesses within shm segment are
always aligned correctly.
Submitted by: Geoff Thorpe <geoff geoffthorpe.net>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@399291
13f79535 -47bb-0310-9956-
ffa450edef68
Greg Ames [Wed, 3 May 2006 00:30:56 +0000 (00:30 +0000)]
PR 39275. don't fork MaxClients worth of processes if child_init or fork() are
slow.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@399099
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sun, 30 Apr 2006 06:21:41 +0000 (06:21 +0000)]
Fix two common overrides required for Win32
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@398284
13f79535 -47bb-0310-9956-
ffa450edef68
Bradley Nicholes [Sun, 30 Apr 2006 01:08:59 +0000 (01:08 +0000)]
Remove GENURI.nlm from the prebuild target
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@398264
13f79535 -47bb-0310-9956-
ffa450edef68
Garrett Rooney [Fri, 28 Apr 2006 17:50:56 +0000 (17:50 +0000)]
Fix compile time warnings.
Pointed out by: jorton
* modules/proxy/mod_proxy_fcgi.c
Add include of util_script.h to pick up some function prototypes.
(send_begin_request): Initialize the reserved bytes in the request
body to zero.
(dispatch): Use APR_SIZE_T_FMT instead of %d when logging an apr_size_t.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@397968
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 27 Apr 2006 21:41:29 +0000 (21:41 +0000)]
This resource /D syntax was pretty horridly imported into VS 2005,
change the quotation to ensure a peaceful transition to sln/vcproj files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@397647
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 27 Apr 2006 15:34:09 +0000 (15:34 +0000)]
Fix gcc warnings:
* support/fcgistarter.c (usage): Fix prototype.
(main): Remove unused variable; pass argv[0] to execl.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@397570
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 27 Apr 2006 05:30:39 +0000 (05:30 +0000)]
Remove all /machine:I386 references, these are getting in the way
of switching linkers from the x86 (default linker) to x64 or other
possible target platforms. (Also, this commit cleans up lingering
/GX switches from the 'BASE' options that are supposed to be unused).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@397407
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 27 Apr 2006 05:01:58 +0000 (05:01 +0000)]
Make clean was -borked-! Too many extra target specifiers
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@397397
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 24 Apr 2006 19:48:30 +0000 (19:48 +0000)]
Move flex/bison/sed steps into a "mod_ssl - Win32 Lexical" grammer
build, outside of the normal "mod_ssl - Win32 Debug|Release" builds.
Continues on the path of eliminating external dependencies, we
strongly expect users to never modify the grammers during normal
builds.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@396670
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Sun, 23 Apr 2006 19:59:23 +0000 (19:59 +0000)]
PR#39386: Fix merge-config to support prepared statements (Brian J. France)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@396310
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Sun, 23 Apr 2006 18:04:17 +0000 (18:04 +0000)]
when compiling statistics, only interate accross requests which occured.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@396300
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sun, 23 Apr 2006 10:52:48 +0000 (10:52 +0000)]
* Consequently use disk_cache: in error log strings
PR: 39380
Submitted by: Niklas Edmundsson <nikke acc.umu.se>
Reviewed by: rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@396252
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sat, 22 Apr 2006 15:25:18 +0000 (15:25 +0000)]
* Sync with 2.2.x CHANGES file
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@396137
13f79535 -47bb-0310-9956-
ffa450edef68
Garrett Rooney [Sat, 22 Apr 2006 04:19:25 +0000 (04:19 +0000)]
* CHANGES: Make spacing consistent with the rest of the file.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@396073
13f79535 -47bb-0310-9956-
ffa450edef68
Garrett Rooney [Sat, 22 Apr 2006 03:55:02 +0000 (03:55 +0000)]
* support/fcgistarter.c
(main): Oops, we need to detach before the fork, otherwise this all
totally fails to work...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@396069
13f79535 -47bb-0310-9956-
ffa450edef68
Garrett Rooney [Sat, 22 Apr 2006 03:45:28 +0000 (03:45 +0000)]
* CHANGES: Note the addition of mod_proxy_fcgi.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@396064
13f79535 -47bb-0310-9956-
ffa450edef68
Garrett Rooney [Sat, 22 Apr 2006 03:44:05 +0000 (03:44 +0000)]
Merge the fcgi-proxy-dev branch to trunk, adding a FastCGI back end for
mod_proxy. This log message is just a summary of the changes, for the
full original log messages see r357431:393955 in branches/fcgi-proxy-dev.
* modules/proxy/mod_proxy_fcgi.c: New file, holds the impementation of
our new fcgi backend for mod_proxy.
* modules/proxy/fcgi_protocol.h: New file, holds constants and structures
for the fcgi protocol.
* modules/proxy/mod_proxy_balancer.c
(proxy_balancer_canon): Set up r->path_info, so the PATH_INFO env
variable is correctly passed on to balancer workers.
* modules/proxy/config.m4: Build the new mod_proxy_fcgi module.
* support: Add fcgistarter to svn:ignore.
* support/Makefile.in: Build the new fcgistarter program.
* support/fcgistarter.c: New program, a helper for starting fcgi worker
processes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@396063
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Thu, 20 Apr 2006 15:42:03 +0000 (15:42 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395622
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 20 Apr 2006 10:35:41 +0000 (10:35 +0000)]
* modules/proxy/proxy_util.c (ap_proxy_initialize_worker): Fix
gcc strict-aliasing warning.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395552
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 20 Apr 2006 01:47:54 +0000 (01:47 +0000)]
Ahhh, this was missed in 395432, and the addition of httpd.rc needs
to occur on each branch backported to (paying close attn to whether
or not our IS_DEV flag is a boolean, or a define/undef).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395462
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 19 Apr 2006 23:17:31 +0000 (23:17 +0000)]
Not for backport; our boolean state is 1/0, not defined/undef.
Remove win32ver.awk, it's now unused (but should be preserved
on the 2.0 tree for anyone who leveraged it.)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395432
13f79535 -47bb-0310-9956-
ffa450edef68
Roy T. Fielding [Wed, 19 Apr 2006 23:03:26 +0000 (23:03 +0000)]
revert accidental copyright year changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395423
13f79535 -47bb-0310-9956-
ffa450edef68
Roy T. Fielding [Wed, 19 Apr 2006 22:52:45 +0000 (22:52 +0000)]
revert last change
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395421
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 19 Apr 2006 22:51:02 +0000 (22:51 +0000)]
s|/GX |/EHsc | because they were always synonyms, and Visual Studio
2005 edition complains bitterly and loudly that /GX is deprecated.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395419
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 19 Apr 2006 22:47:49 +0000 (22:47 +0000)]
Remove a host of dependencies upon awk, using the same template for
nearly every .rc compilation (giving the output .res file a different
name for each component). Adds AP_SERVER_BASEPROJECT to ap_revision.h
so we can display the proper name of "Apache HTTP Server" as opposed
to AP_SERVER_BASEPRODUCT (which is, and should remain, simply "Apache"
for the server string tokens.)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395418
13f79535 -47bb-0310-9956-
ffa450edef68
Noirin Plunkett [Wed, 19 Apr 2006 22:17:36 +0000 (22:17 +0000)]
Removing 1.3 refs from 2.x docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395411
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 19 Apr 2006 21:16:02 +0000 (21:16 +0000)]
As a -fallback- install the release flavor of openssl when building
the debug flavor of apache httpd mod_ssl.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395397
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 19 Apr 2006 21:01:31 +0000 (21:01 +0000)]
With all the fun new features, mod_proxy's size (when built in
debug mode) has grown a bit :)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395395
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 19 Apr 2006 20:07:22 +0000 (20:07 +0000)]
* Adjust comment as per niq's proposal in r395166 and as already adjusted by
colm in the backport to 2.0.x (r395197).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395381
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Wed, 19 Apr 2006 16:51:01 +0000 (16:51 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395308
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Wed, 19 Apr 2006 16:45:09 +0000 (16:45 +0000)]
fix revision references
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395307
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Wed, 19 Apr 2006 12:23:42 +0000 (12:23 +0000)]
Update the last year of copyright.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395229
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Wed, 19 Apr 2006 12:11:27 +0000 (12:11 +0000)]
Update the copyright year in all .c, .h and .xml files
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395228
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 19 Apr 2006 10:57:20 +0000 (10:57 +0000)]
* configure.in: Add --with-included-apr flag to force use of the
bundled copies of APR and APR-util.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395211
13f79535 -47bb-0310-9956-
ffa450edef68