]>
granicus.if.org Git - apache/log
William A. Rowe Jr [Sun, 6 Jan 2008 18:22:37 +0000 (18:22 +0000)]
Copying this code requires a (global) pool and rv declaration.
We don't need to replace this upon restart, so the global pool
is ideal, and ap_my_generation is a good test for this.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@609366
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sun, 6 Jan 2008 17:35:03 +0000 (17:35 +0000)]
Resolve console-mode stdout file descriptor issues for mod_perl by replacing
it in lockstep with unix stdout replacement (in pre_config). Only an undetached
server (console mode single process/debug) will retain the original stdout, just
as on unix. Inspired by research of Tom and myself (CHANGES to credit both).
PR: 43534
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@609354
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sat, 5 Jan 2008 18:20:42 +0000 (18:20 +0000)]
winnt_mpm: Restore Win32DisableAcceptEx On directive and Win9x platform
by recreating the bucket allocator each time the trans pool is cleared.
PR: 11427 #16 (follow-on)
Submitted by: Tom Donovan <Tom.Donovan acm.org>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@609181
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sat, 5 Jan 2008 09:45:51 +0000 (09:45 +0000)]
* These are now backported.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@609114
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 3 Jan 2008 14:47:41 +0000 (14:47 +0000)]
* Silence a compiler warning by using the correct format.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@608508
13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Thu, 3 Jan 2008 11:31:10 +0000 (11:31 +0000)]
Enable to build abs on NetWare if dependent libs are present.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@608455
13f79535 -47bb-0310-9956-
ffa450edef68
Roy T. Fielding [Wed, 2 Jan 2008 22:08:44 +0000 (22:08 +0000)]
Update mime.types with IANA registry
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@608252
13f79535 -47bb-0310-9956-
ffa450edef68
Roy T. Fielding [Wed, 2 Jan 2008 20:31:13 +0000 (20:31 +0000)]
revert move to image/vnd.microsoft.icon because everyone uses image/x-icon
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@608208
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 2 Jan 2008 19:23:32 +0000 (19:23 +0000)]
style check
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@608189
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Wed, 2 Jan 2008 16:50:24 +0000 (16:50 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@608144
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 2 Jan 2008 10:02:51 +0000 (10:02 +0000)]
* Update transformation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@608070
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 2 Jan 2008 09:50:56 +0000 (09:50 +0000)]
* These are now backported.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@608063
13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 1 Jan 2008 22:30:17 +0000 (22:30 +0000)]
backported in 607929.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@607930
13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Tue, 1 Jan 2008 17:23:16 +0000 (17:23 +0000)]
Modified default refresh value to 10 secs so that its possible to correct a typo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@607873
13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 1 Jan 2008 13:53:03 +0000 (13:53 +0000)]
Review comments from Ruediger on r607766:
Don't allow the ldap calls to be evaluated (twice) in the macro
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@607841
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 1 Jan 2008 13:20:22 +0000 (13:20 +0000)]
* Avoid SEGFAULT as hooks->set_headers can be NULL. Furthermore do not set the
ETag header permanently as setting it may not be desired for all responses.
Submitted by: niq, rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@607838
13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 31 Dec 2007 19:20:25 +0000 (19:20 +0000)]
When using the MS SDK, re-establish LDAP backend connections on a
return code of LDAP_UNAVAILABLE as if it were LDAP_SERVER_DOWN.
With this SDK, LDAP_UNAVAIALBLE is returned when the socket had been closed
between LDAP API calls.
PR 39095
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@607766
13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Mon, 31 Dec 2007 17:38:06 +0000 (17:38 +0000)]
updated NetWare OpenSSL build section.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@607759
13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Mon, 31 Dec 2007 17:17:18 +0000 (17:17 +0000)]
fixed comment, added comment, added logic to build mod_ssl by default if USE_STDSOCKETS is defined.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@607756
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 31 Dec 2007 05:40:54 +0000 (05:40 +0000)]
Close the child_exit_event which lives only for the scope
of master_main and was orphaned on each soft or fatal restart.
PR: 40932
Submitted by: Jeff Robbins <jeffr livedata.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@607677
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 31 Dec 2007 05:00:16 +0000 (05:00 +0000)]
On win32, we must never, never close the parent's copy of the
child's read end for a reliable piped logger. The child runs
and manages it's own logs, and even if the parent did instead,
the mpm would be adjusted to pass down the child write ends
without read ends to the pipes, so this forever makes no sense.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@607666
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 31 Dec 2007 01:13:43 +0000 (01:13 +0000)]
Introduce the ProxyFtpDirCharset directive, allowing the administrator
to identify a default, or specific servers or paths which list their
contents in other-than ISO-8859-1 charset (e.g. utf-8).
Submitted by: Ruediger Pluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@607638
13f79535 -47bb-0310-9956-
ffa450edef68
Tony Stevenson [Sun, 30 Dec 2007 23:13:11 +0000 (23:13 +0000)]
Updated to show "It Works!" as opposed to old, 1.3 style welcome page
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@607611
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sat, 29 Dec 2007 20:28:57 +0000 (20:28 +0000)]
* Style police. No functional changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@607472
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Sat, 29 Dec 2007 19:38:51 +0000 (19:38 +0000)]
mod_dav: Fix evaluation of If-Match * and If-None-Match * conditionals.
PR 38034
Patch by Paritosh Shah
Explanation by Werner Baumann
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@607466
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sat, 29 Dec 2007 16:19:51 +0000 (16:19 +0000)]
* Change loglevel from ERROR to WARNING if the renaming of the vary, headers
or data file fails.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@607440
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sat, 29 Dec 2007 16:11:36 +0000 (16:11 +0000)]
* Update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@607439
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sat, 29 Dec 2007 16:06:19 +0000 (16:06 +0000)]
* Adjust etag generation to produce identical results on 32-bit and 64-bit
platforms and avoid a regression with conditional PUT's on lock and etag.
Add a warning to the documentation of FileETAG that changes of the ETAG
format can cause conditionals to fail on mod_dav_fs provided backends.
PR: 44152
Submitted by: Michael Clark <michael metaparadigm.com>
Reviewed by: rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@607437
13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Sat, 29 Dec 2007 15:03:21 +0000 (15:03 +0000)]
added empty line after var declaration.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@607425
13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Sat, 29 Dec 2007 14:40:09 +0000 (14:40 +0000)]
fixed code style, missing prototype warnings, disabled init for proxy, removed obsolete cast.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@607420
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sat, 29 Dec 2007 09:26:42 +0000 (09:26 +0000)]
* Added missing CVE number
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@607403
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sat, 29 Dec 2007 09:25:16 +0000 (09:25 +0000)]
* Added missing CVE number
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@607402
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sat, 29 Dec 2007 07:54:55 +0000 (07:54 +0000)]
Fix winnt bucket_alloc to borrow memory from the transaction
pool, instead of exhausting pchild memory over a number of
connections.
PR: 11427
Submitted by: Alex Varju <alex varju.ca>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@607393
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sat, 29 Dec 2007 06:09:15 +0000 (06:09 +0000)]
Sander pointed out to me that as we added ENGINE logic support
for 0.9.8, we never touched win32. Resolve this for all of the
common win32 HAVE SSL related macros building against 0.9.8.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@607383
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sat, 29 Dec 2007 03:59:01 +0000 (03:59 +0000)]
It turns out copy concat didn't work as I expected,
it does concat to the first named file, but not the
first filepath.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@607371
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sat, 29 Dec 2007 03:49:35 +0000 (03:49 +0000)]
Avoid build directory pollution
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@607369
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sat, 29 Dec 2007 03:35:19 +0000 (03:35 +0000)]
Believe this or not, not every machine uses "C:\Documents and Settings",
split off the current user's name from USERPROFILE envvar.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@607367
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 28 Dec 2007 20:07:26 +0000 (20:07 +0000)]
Win32 doesn't like \t#
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@607319
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 28 Dec 2007 19:48:55 +0000 (19:48 +0000)]
Add a placeholder to remind us that fcgistarter.exe, once
an implemention exists for apr_proc_create, needs to be added
to the build/install schema.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@607316
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 28 Dec 2007 16:29:40 +0000 (16:29 +0000)]
* Ensure refresh parameter is numeric to prevent a possible XSS attack caused
by redirecting to other URLs. Reported by SecurityReason.
Submitted by: Mark Cox, Joe Orton
Reviewed by: security@httpd.apache.org
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@607282
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 28 Dec 2007 16:01:52 +0000 (16:01 +0000)]
* Fix CHANGES wording for r606693.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@607276
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 28 Dec 2007 15:57:36 +0000 (15:57 +0000)]
* Correctly escape the worker route and the worker redirect string in the HTML
output of the balancer manager.
Reported by SecurityReason.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@607275
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 28 Dec 2007 15:53:45 +0000 (15:53 +0000)]
* Prevent crash in balancer manager if invalid balancer name is passed as
parameter.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@607273
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 28 Dec 2007 14:16:35 +0000 (14:16 +0000)]
* Make loglevel consistent for similar situations. As this really should not
happen set it to error.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@607245
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Fri, 28 Dec 2007 12:03:20 +0000 (12:03 +0000)]
PR 39727: Fixup ETag handling in mod deflate (updated following extensive
discussion on-list).
This is not a full-and-final fix, because we don't ourselves do anything
useful with these ETags. But at least we're no longer screwing up clients.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@607219
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Fri, 28 Dec 2007 00:07:39 +0000 (00:07 +0000)]
Fix typo in error message (noticed by gryzor on IRC)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@607145
13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Tue, 25 Dec 2007 20:02:55 +0000 (20:02 +0000)]
Enable to configure the https port - missing pieces.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@606806
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 25 Dec 2007 09:35:05 +0000 (09:35 +0000)]
* Revert to old behaviour: Even if we detect a bad character: Formally decode
string correctly and do not mess up the string. Let the caller decide what
it wants to do with the result according to our return code.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@606776
13f79535 -47bb-0310-9956-
ffa450edef68
Tony Stevenson [Mon, 24 Dec 2007 23:57:54 +0000 (23:57 +0000)]
As per PR 43890. Fixed location paths to point to /usr/local/apache2/bin/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@606748
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 24 Dec 2007 11:45:22 +0000 (11:45 +0000)]
* Set character set for HTML outputs generated by mod_ldap,
mod_proxy_balancer, mod_proxy_ftp, mod_info, mod_dav without a character
set to ISO-8859-1.
Submitted by: jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@606693
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sat, 22 Dec 2007 20:00:59 +0000 (20:00 +0000)]
Solve service status handle leak on multi-service ApacheMonitor
instances, and disconnect computer function on multi-system
applications of ApacheMonitor.
PR: 33803
Reported by: K.W.Schick <drax sawebs.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@606481
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sat, 22 Dec 2007 04:35:18 +0000 (04:35 +0000)]
Install missing modules/xxx/foo.h garbage, the point of this
exercise, and why these aren't in includes/, still escapes me.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@606394
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sat, 22 Dec 2007 02:18:09 +0000 (02:18 +0000)]
Replace whitespace
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@606383
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sat, 22 Dec 2007 02:14:14 +0000 (02:14 +0000)]
Solve two ssl issues; always install both ab.exe and abs.exe
because it's easier to move around ab.exe when that's all
someone needs (and this is precisely how the binary installer
works, too), and also kindly ignore missing openssl tree files
because TIMTOWTDI (although this one is preferred :)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@606382
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sat, 22 Dec 2007 01:57:28 +0000 (01:57 +0000)]
Uncouple fcgistarter from BuildBin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@606379
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sat, 22 Dec 2007 01:56:42 +0000 (01:56 +0000)]
Add fcgistarter, but not as a target of BuildBin/BuildAll
since it won't compile yet.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@606378
13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Fri, 21 Dec 2007 20:59:03 +0000 (20:59 +0000)]
Enabled to configure the https port as we do with http port too.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@606316
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 21 Dec 2007 20:08:56 +0000 (20:08 +0000)]
Let the installer lead on the origin sourceroot conf path
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@606293
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 21 Dec 2007 19:18:01 +0000 (19:18 +0000)]
Quoting this made it worse on us, not easier.
Resolve SSLMutex default on win32.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@606274
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 21 Dec 2007 18:46:12 +0000 (18:46 +0000)]
Kill proxy\ dir, a horrible name with no corresponding example
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@606265
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 21 Dec 2007 17:03:56 +0000 (17:03 +0000)]
The installer will have a temp-extras for these files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@606251
13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Fri, 21 Dec 2007 13:16:21 +0000 (13:16 +0000)]
Added server name indication (RFC 4366) support (PR 34607).
Submitted by: Kaspar Brand <asfbugz velox.ch>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@606190
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 21 Dec 2007 11:25:04 +0000 (11:25 +0000)]
Tab-consistency (it's a makefile after all)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@606162
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 21 Dec 2007 11:24:42 +0000 (11:24 +0000)]
Present other variables
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@606160
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 21 Dec 2007 11:20:02 +0000 (11:20 +0000)]
alphasort
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@606159
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 21 Dec 2007 11:12:35 +0000 (11:12 +0000)]
Plug in build/installwinconf.awk, unplug httpd-win.conf
and follow the same general configuration as all platforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@606158
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 21 Dec 2007 11:09:10 +0000 (11:09 +0000)]
Add rel_sysconfdir interpolation, this rounds out all
of the necessary @X@ patterns.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@606157
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 21 Dec 2007 11:01:50 +0000 (11:01 +0000)]
Modifications for 1) httpd.conf.in generic conf file, and
2) source tree build (in addition to the msi installer)
carefully dodging the installer's desire to delete sources.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@606156
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 21 Dec 2007 08:42:54 +0000 (08:42 +0000)]
Start from svn httpd/httpd/win32-msi/trunk/InstallConf22.awk
to use a single script for build time and installer conf rewrite.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@606136
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 21 Dec 2007 08:40:11 +0000 (08:40 +0000)]
Start preparing to use the general-case httpd.conf.in,
on Win32.
Note the quoted log *filenames*, which lets us figure
out the difference between fixing "access_log" to be
a windows friendly "access.log", and leaving the custom
log format name pretty_log alone.
Also, prefer the user specified port for example ServerName.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@606135
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 21 Dec 2007 08:36:36 +0000 (08:36 +0000)]
Unix illustrates a default of 150 max childs, so make
winnt mpm consistent with this. (Other mpm's should
also be reviewed.)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@606133
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 20 Dec 2007 08:57:23 +0000 (08:57 +0000)]
* Using the reslist pool for the proxy_conn_rec structure introduces a memory
leak when connections get created and destroyed frequently by the reslist
(e.g. destroying idle elements of the reslist). So use the subpool
dedicated for the proxy_conn_rec structure to allocate the memory for the
structure itself.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@605838
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 19 Dec 2007 04:15:58 +0000 (04:15 +0000)]
Catch up to apr-1.3.0 which names the pdb's to match the static libs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@605416
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 19 Dec 2007 03:09:34 +0000 (03:09 +0000)]
What's left can exceed size_t
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@605400
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 19 Dec 2007 03:08:15 +0000 (03:08 +0000)]
When building to WinNT, CommandLineToArgvW must resolve.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@605397
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 19 Dec 2007 03:02:22 +0000 (03:02 +0000)]
Handle args appropriately for an apr app.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@605395
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 19 Dec 2007 03:01:28 +0000 (03:01 +0000)]
If something other than fork can work, this will become
worth building on win32.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@605393
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 18 Dec 2007 21:55:19 +0000 (21:55 +0000)]
Repair project file corruption
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@605335
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 18 Dec 2007 20:03:01 +0000 (20:03 +0000)]
* Only sent a flush bucket down the chain if buckets where sent down the chain
before that could still be buffered in the network filter. This is the case
if we have sent an EOS bucket or if we actually sent buckets with
data down the chain. In all other cases we either have not sent any
buckets at all down the chain or we only sent meta buckets that are
not EOS buckets down the chain. The only meta bucket that remains in
this case is the flush bucket which would have removed all possibly
buffered buckets in the network filter.
If we sent a flush bucket in the case where not ANY buckets were
sent down the chain, we break error handling which happens AFTER us.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@605314
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 17 Dec 2007 17:46:58 +0000 (17:46 +0000)]
What an obscure reference. Also note the build will append
OPENSSL's LICENSE after the AL in LICENSE.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@604940
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sat, 15 Dec 2007 20:22:08 +0000 (20:22 +0000)]
update convmap
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@604503
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sat, 15 Dec 2007 20:21:16 +0000 (20:21 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@604502
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sat, 15 Dec 2007 20:13:42 +0000 (20:13 +0000)]
svn:eol-style = native
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@604499
13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Bray [Sat, 15 Dec 2007 17:35:38 +0000 (17:35 +0000)]
'segement' typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@604461
13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Bray [Sat, 15 Dec 2007 17:32:30 +0000 (17:32 +0000)]
Update transformations
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@604460
13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Bray [Sat, 15 Dec 2007 17:29:47 +0000 (17:29 +0000)]
Correct reference to directive
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@604459
13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Bray [Sat, 15 Dec 2007 17:23:19 +0000 (17:23 +0000)]
Fix broken markup from r602806 (again)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@604457
13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Bray [Sat, 15 Dec 2007 17:18:11 +0000 (17:18 +0000)]
Fix broken markup from r602806
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@604456
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sat, 15 Dec 2007 16:19:36 +0000 (16:19 +0000)]
* Tag the pools appropriately to ease memory debugging.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@604449
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sat, 15 Dec 2007 16:15:04 +0000 (16:15 +0000)]
* Fix a SEGFAULT by ensuring that buckets that may have been buffered in the
network filters get flushed to the network. This is needed since
these buckets have been created with the bucket allocator of the
backend connection. This allocator either gets destroyed if
conn->close is set or the worker address is not reusable which
causes the connection to the backend to be closed or it will be used
again by another frontend connection that wants to recycle the
backend connection.
In this case we could run into nasty race conditions (e.g. if the
next user of the backend connection destroys the allocator before we
sent the buckets to the network).
Remark 1: Doing a setaside does not help here as the buckets remain
created by the wrong allocator in this case.
Remark 2: Yes, this creates a possible performance penalty in the case
of pipelined requests as we may send only a small amount of data over
the wire.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@604447
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 14 Dec 2007 22:36:44 +0000 (22:36 +0000)]
* This change was backported.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@604321
13f79535 -47bb-0310-9956-
ffa450edef68
Bradley Nicholes [Fri, 14 Dec 2007 16:52:09 +0000 (16:52 +0000)]
Add a note about double quoting a multihost LDAP URL.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@604224
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 13 Dec 2007 19:39:05 +0000 (19:39 +0000)]
* Those are backported.
Pointed out by: Takashi Sato <serai lans-tv.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@604000
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 12 Dec 2007 20:56:15 +0000 (20:56 +0000)]
* These have been backported.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@603738
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 12 Dec 2007 10:38:19 +0000 (10:38 +0000)]
* Do not register connection_cleanup as cleanup for the conn->pool. In the past
it was needed to register connection_cleanup as a cleanup for the frontend
connection memory pool (c->pool) to ensure that connection returns into the
connection pool if the memory pool of the frontend connection memory pool
gets destroyed / cleared. Now we ensure explicitly the connection returns
to the connection pool once we finished handling the request.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@603543
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 12 Dec 2007 07:44:02 +0000 (07:44 +0000)]
* Fix another memory leak related to PR 44026. Now that we keep the connection
data structure alive in the reslist, the live time of c->pool is too long.
r->pool has the correct live time since rp dies before r.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@603502
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 11 Dec 2007 20:08:12 +0000 (20:08 +0000)]
http_protocol: Escape request method in 405 error reporting.
This has no security impact since the browser cannot be tricked
into sending arbitrary method strings.
(words from jorton)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@603346
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 11 Dec 2007 16:02:23 +0000 (16:02 +0000)]
Fix CVE-2007-5000:
* modules/mappers/mod_imagemap.c (menu_header): Fix
cross-site-scripting issue by escaping the URI, and ensure that a
charset parameter is sent in the content-type to prevent
autodetection by broken browsers.
Reported by: JPCERT
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@603282
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 11 Dec 2007 13:32:40 +0000 (13:32 +0000)]
Introduce --kill argument to ApacheMonitor for use by the
installer. This will permit the installation tool to remove
all running instances before attempting to remove the .exe.
Note that since the introduction of CriticalSections, our
compatibility with NT 4 was destroyed, and at this point that
is no loss (there are no more security updates to NT 4 ergo
it's not an OS we want connected to the internet, anyways).
The WTS api calls require 2000 or later, but I'm not wrapping
them since nobody notices the same issue with CriticalSections.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@603238
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 11 Dec 2007 13:27:21 +0000 (13:27 +0000)]
* Use a separate subpool to manage the data for the socket and the connection
member of the proxy_conn_rec struct as we destroy this data more frequently
than other data in the proxy_conn_rec struct like hostname and addr (at least
in the case where we have keepalive connections that timed out and were
closed by the backend).
This fixes a memory leak with short lived and broken connections.
PR: 44026
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@603237
13f79535 -47bb-0310-9956-
ffa450edef68