]>
granicus.if.org Git - apache/log
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
Martin Kraemer [Wed, 19 Apr 2006 08:56:59 +0000 (08:56 +0000)]
Fix for platforms without threads: inreslist exists only if APR_HAS_THREADS is set
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395180
13f79535 -47bb-0310-9956-
ffa450edef68
Sander Temme [Wed, 19 Apr 2006 05:41:23 +0000 (05:41 +0000)]
Ignore generated doxygen output directory
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395140
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Tue, 18 Apr 2006 22:51:55 +0000 (22:51 +0000)]
Correctly handle internal redirects, by testing only for r-main == NULL.
ap_is_initial_req() returns false for internal redirects.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395079
13f79535 -47bb-0310-9956-
ffa450edef68
Mark J. Cox [Tue, 18 Apr 2006 15:30:13 +0000 (15:30 +0000)]
Thiago Zaninotti reported to security@apache.org on
20060410 a possible
cross-site scripting flaw because the Expect header error message isn't
escaped. We couldn't find a way that this could be used by an attacker
however, as they can't influence the Expect header a victim will send to a
target site. Thiago agreed and we're therefore not treating this as a
security flaw, but it is a bug that ought to get fixed. I'll add to
STATUS for 1.3/2.0/2.2 shortly for acks.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@394965
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Mon, 17 Apr 2006 20:09:50 +0000 (20:09 +0000)]
Update the copyright notice to reflect that changes have gone in this year
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@394765
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Sun, 16 Apr 2006 17:34:39 +0000 (17:34 +0000)]
Update one of the more important copyright notices prior to any 2006
releases.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@394522
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sun, 16 Apr 2006 09:12:24 +0000 (09:12 +0000)]
* Also initialize local data structures for workers of a balancer.
PR: 38227, 39267
Submitted by: James A. Robinson <jim.robinson stanford.edu>
Reviewed by: rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@394446
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Sat, 15 Apr 2006 22:45:00 +0000 (22:45 +0000)]
PR#39321 - don't segfault if a bad URL is specified in ProxyPass
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@394390
13f79535 -47bb-0310-9956-
ffa450edef68
Greg Ames [Fri, 14 Apr 2006 15:12:35 +0000 (15:12 +0000)]
decouple the two scoreboard full messages
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@394116
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 14 Apr 2006 13:26:34 +0000 (13:26 +0000)]
* Sync with 2.2.x CHANGES
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@394092
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 14 Apr 2006 13:20:28 +0000 (13:20 +0000)]
* Avoid calling ap_proxy_http_cleanup twice as this releases a connection
from the connection pool twice. This causes this connection to be present
in the connection pool twice. Thus it may be used by different threads
at the same time which causes many troubles (segfaults in this case).
Furthermore implement a logic to prevent double releases to the connection
pool if they are triggered by buggy code and log an error message in this
case.
- mod_proxy_http.c: remove double calls to ap_proxy_http_cleanup
- proxy_util.c: Add logic to prevent double releases of a
connection to the connection pool.
PR: 38793
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@394088
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 14 Apr 2006 12:17:54 +0000 (12:17 +0000)]
* Initialize last_char as otherwise a random value will be compared
against APR_ASCII_LF at the end of the loop if bb only contains an
EOS bucket.
PR: 39282
Submitted by: Davi Arnaut <davi haxent.com.br>
Reviewed by: rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@394070
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 14 Apr 2006 11:30:04 +0000 (11:30 +0000)]
* After r377780 the condition in the if clause never becomes true, because
ap_proxy_initialize_worker_share is always left with PROXY_WORKER_INITIALIZED
set in workers->s->status. So remove this code to save cycles and avoid
confusion.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@394065
13f79535 -47bb-0310-9956-
ffa450edef68
Greg Ames [Thu, 13 Apr 2006 17:53:04 +0000 (17:53 +0000)]
MaxClients isn't the only reason the scoreboard can fill up. another
reason should be fixed soon.
also add a comment to explain an obscure line of code.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@393868
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 12 Apr 2006 01:58:08 +0000 (01:58 +0000)]
If we don't have a prototype for crypt() we shouldn't
be calling it.
Casting to the desired pointer return type hides the
truncation of the return value when sizeof(ptr) >
sizeof(int) and no prototype was included.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@393365
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 12 Apr 2006 01:55:11 +0000 (01:55 +0000)]
The crypt() prototype is in <unistd.h> instead of <crypt.h>
on HP-UX. We had no prototype for crypt() there.
In 64-bit mode, a crash occurred because the pointer
returned by crypt() was truncated before we passed
the pointer to apr_cpystrn().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@393364
13f79535 -47bb-0310-9956-
ffa450edef68
Greg Ames [Tue, 11 Apr 2006 14:41:53 +0000 (14:41 +0000)]
more explanation for a couple of subtle lines of code
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@393236
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 10 Apr 2006 22:07:02 +0000 (22:07 +0000)]
* Rollback r393037 as this was vetoed by wrowe. Details see
http://mail-archives.apache.org/mod_mbox/httpd-dev/200604.mbox/%
3c443ABE65 .
1060603 @rowe-clan.net%3e
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@393087
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 10 Apr 2006 19:59:33 +0000 (19:59 +0000)]
* Prevent r->parsed_uri.path from being NULL as this can cause segmentation
faults e.g. in mod_cache. Set it to "/" in this case.
PR: 39259
Submitted by: Davi Arnaut <davi haxent.com.br>
Reviewed by: rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@393037
13f79535 -47bb-0310-9956-
ffa450edef68
Greg Ames [Mon, 10 Apr 2006 19:24:33 +0000 (19:24 +0000)]
expand on a comment for a rather subtle line of code so I have a chance of
understanding how it helps in the future
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@393028
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 10 Apr 2006 17:54:59 +0000 (17:54 +0000)]
remove unnecessary whitespace
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@393001
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 10 Apr 2006 13:31:14 +0000 (13:31 +0000)]
htdbm: Warn the user when adding a plaintext password on a platform
where it wouldn't work with the server (i.e., anywhere that has
crypt()).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@392944
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sat, 8 Apr 2006 21:43:24 +0000 (21:43 +0000)]
* Check for an existing socket independant of an existing connection record.
This ensures that requests handled by the '*' worker are sent to the correct
backend server.
PR: 39253
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@392613
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Fri, 7 Apr 2006 21:22:02 +0000 (21:22 +0000)]
update convenience map
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@392407
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Fri, 7 Apr 2006 20:54:48 +0000 (20:54 +0000)]
set svnmailer:content-charset for better diff mails
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@392393
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Fri, 7 Apr 2006 20:49:13 +0000 (20:49 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@392391
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Fri, 7 Apr 2006 20:20:50 +0000 (20:20 +0000)]
svn:eol-style = native
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@392380
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 3 Apr 2006 12:10:22 +0000 (12:10 +0000)]
We actually want to reach the rest of the code :)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@391025
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sun, 2 Apr 2006 23:36:27 +0000 (23:36 +0000)]
Default handler: Don't return output filter apr_status_t values.
PR: 31759
Helped by: Ruediger Pluem, Joe Orton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@390922
13f79535 -47bb-0310-9956-
ffa450edef68
Roy T. Fielding [Sun, 2 Apr 2006 19:42:12 +0000 (19:42 +0000)]
remove charset turds left by last commit
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@390887
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sat, 1 Apr 2006 21:23:56 +0000 (21:23 +0000)]
* Sync with CHANGES files of 2.2.x and 2.0.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@390753
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sat, 1 Apr 2006 08:28:39 +0000 (08:28 +0000)]
* Actually increase MODULE_MAGIC_NUMBER_MINOR by one as r390210 only added
a comment to do so.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@390619
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sat, 1 Apr 2006 08:12:45 +0000 (08:12 +0000)]
* Sync with 2.2.x CHANGES file
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@390616
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sat, 1 Apr 2006 02:48:24 +0000 (02:48 +0000)]
With all of the, uhm, interesting manners in which httpd
can be built and installed, let's ensure httpd -V gives the
reporter a chance to identify the APR flavor used to compile
and to run httpd when reporting bugs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@390573
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Fri, 31 Mar 2006 22:06:14 +0000 (22:06 +0000)]
Correct a dumb typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@390519
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Fri, 31 Mar 2006 21:54:25 +0000 (21:54 +0000)]
* Add siege-like behaviour to ApacheBench; output the results, as they have
accrued so far, when the user interrupts with ctrl-c. As the signal handler
is non-reentrant, we don't need volatiles, and the operations all look
signal-safe.
* Update the base version, since handling a signal differently is an external
API change of sorts.
* set the LastChangedRevision svn property, as ab.c has $Rev $ embedded, so
it really should be.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@390511
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 31 Mar 2006 21:36:38 +0000 (21:36 +0000)]
* Sync with 2.2.x CHANGES file
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@390507
13f79535 -47bb-0310-9956-
ffa450edef68
Garrett Rooney [Fri, 31 Mar 2006 21:35:44 +0000 (21:35 +0000)]
Clean up some stuff found by Coverity.
* modules/aaa/mod_authz_core.c
(check_provider_list): Remove redundant code.
* modules/aaa/mod_auth.h
(AUTHZ_DEFAULT_PROVIDER): Remove redundant definition.
Submitted by: Max Bowsher <maxb apache.org>
Reviewed by: bnicholes, rooneg
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@390506
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Fri, 31 Mar 2006 21:28:36 +0000 (21:28 +0000)]
Give users the ability to set the window size for apache bench runs. Useful
for benchmarking largefile downloads.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@390504
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 31 Mar 2006 21:09:58 +0000 (21:09 +0000)]
* As per discussion on the list: Return error code of apr_file_write_full
or apr_bucket_read instead of APR_EGENERAL if they fail.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@390499
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 31 Mar 2006 20:33:48 +0000 (20:33 +0000)]
Note backports to be in 2.2.1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@390496
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 30 Mar 2006 18:32:53 +0000 (18:32 +0000)]
Document the removal of the flushing bandaid to a
runtime param. Since other protocols might benefit
from this, remove the ajp_ prefixes, to make it
more generic looking.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@390210
13f79535 -47bb-0310-9956-
ffa450edef68