]>
granicus.if.org Git - apache/log
Jeff Trawick [Wed, 25 Mar 2009 18:03:26 +0000 (18:03 +0000)]
mpm header files shouldn't be installed; not part of API
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758376
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 25 Mar 2009 18:00:26 +0000 (18:00 +0000)]
no longer conditional; although some are now in mpm_unix.c
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758371
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 25 Mar 2009 17:58:59 +0000 (17:58 +0000)]
drop mpm.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758369
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 25 Mar 2009 17:52:23 +0000 (17:52 +0000)]
refactor mpm_common.c into itself and mpm_unix.c for unix-specific quirks
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758367
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 25 Mar 2009 16:34:39 +0000 (16:34 +0000)]
closer to compiling
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758336
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 25 Mar 2009 16:33:53 +0000 (16:33 +0000)]
resurrect the call to show_mpm_settings(), but defer the entire -V processing until
after module loading if there is no built-in MPM
(we could just defer displaying the MPM info, but that would change the order of
output from what people/scripts expect)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758335
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 25 Mar 2009 15:46:56 +0000 (15:46 +0000)]
resurrect the old (pre-r757867) compiled-in MPM_NAME value, but via a hook for dynamically
linked MPMs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758312
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 25 Mar 2009 14:50:24 +0000 (14:50 +0000)]
The rewrite-args hook isn't available to MPM DSOs. Piggy-back on the
linked-in mod_unixd.c to handle that.
(The set of MPMs modified is the same set for which mod_unixd is enabled,
which is approximately equivalent to the set of Unix MPMs which anybody has
tried to maintain in recent memory.)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758278
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 25 Mar 2009 11:33:40 +0000 (11:33 +0000)]
dangling semis lead to warnings with Sun Studio
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758229
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 25 Mar 2009 11:29:55 +0000 (11:29 +0000)]
fix inconsistent defs of ap_mpm_note_child_killed()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758226
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 25 Mar 2009 11:23:29 +0000 (11:23 +0000)]
change the allocation path for the simple MPM's retained data, as a dynamically
loadable MPM can't use the rewrite-args hook
(note across the table: the hooker hook has no retcode feedback, so I didn't init
the data there)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758224
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 25 Mar 2009 11:17:08 +0000 (11:17 +0000)]
fix function names in trace messages
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758223
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 25 Mar 2009 09:23:23 +0000 (09:23 +0000)]
prefork, worker, and event MPMs: use retained-data API to maintain
information across reconfigs, to allow these MPMs to work as DSOs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758185
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 25 Mar 2009 08:43:28 +0000 (08:43 +0000)]
header file tweaks required for compilability
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758178
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 25 Mar 2009 08:43:28 +0000 (08:43 +0000)]
* configure.in: Allow configure to be built without find_apu.m4,
at least temporarily to allow buildconf against apr trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758177
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 25 Mar 2009 08:30:18 +0000 (08:30 +0000)]
Provide ap_set_retained_data()/ap_get_retained_data() for preservation
of module state across unload/load.
The existing idiom used by modules to associate userdata with pglobal
doesn't work in the earliest phases of module execution.
(This does expose pglobal as an implementation detail, but it would be great
to unexpose it if at all possible (but modules already have access to pglobal
at almost all stages of execution anyway).)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758173
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 25 Mar 2009 07:31:56 +0000 (07:31 +0000)]
* Teach apxs to work with APR 2.x where there is no separate APR-UTIL
any longer.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758167
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 24 Mar 2009 23:04:23 +0000 (23:04 +0000)]
* With APR 2.x we no longer have APR-UTIL. So don't care about it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758079
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 24 Mar 2009 22:30:38 +0000 (22:30 +0000)]
set ap_server_conf as early as possible; axe the duplicate variable
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758065
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 24 Mar 2009 22:20:34 +0000 (22:20 +0000)]
main() now sets ap_server_conf()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758062
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 24 Mar 2009 20:52:10 +0000 (20:52 +0000)]
axe the remaining checks of AP_MPM_WANT_foo to see what code to generate
MPMs no longer provide those definitions
(the signal server support is an interesting problem, since it has to be known before loading
loading the MPM)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758014
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 24 Mar 2009 20:31:51 +0000 (20:31 +0000)]
MPM header files are private; don't install them
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758002
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 24 Mar 2009 20:23:42 +0000 (20:23 +0000)]
Allow building httpd without a built-in MPM by specifying
--with-mpm=shared
on configure. When built thusly, an MPM should be loaded via LoadModule.
(Currently you need to build the MPM with apxs.)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@757999
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 24 Mar 2009 16:46:43 +0000 (16:46 +0000)]
fix shell syntax error in check for apr major version
on OS X:
acceptable_majors=""1 2""
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@757898
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 24 Mar 2009 15:58:56 +0000 (15:58 +0000)]
shoot ourselves in the foot
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@757867
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 24 Mar 2009 15:43:59 +0000 (15:43 +0000)]
Introduce a new set of APIs to allow MPMs to be proper modules instead
of integral parts which share global variables, functions, and macros
with the rest of httpd.
Converted now:
prefork, worker, event, simple, WinNT*
*WinNT hasn't been built or tested, and relies on a hack to include the
WinNT mpm.h to disable Unixy MPM support routines in mpm_common.c
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@757853
13f79535 -47bb-0310-9956-
ffa450edef68
Dirk-Willem van Gulik [Tue, 24 Mar 2009 15:39:00 +0000 (15:39 +0000)]
make_sni.sh test -- Accomodate for platforms which do not have RANDOM in their sh(1) implementation - rely on the pid and a not so random prefix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@757851
13f79535 -47bb-0310-9956-
ffa450edef68
Bradley Nicholes [Tue, 24 Mar 2009 15:19:54 +0000 (15:19 +0000)]
Declare variables prior to code statements otherwise some compilers choke.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@757840
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 24 Mar 2009 15:19:08 +0000 (15:19 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@757839
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 24 Mar 2009 15:14:43 +0000 (15:14 +0000)]
Documentation is easier than code sometimes...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@757835
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 24 Mar 2009 14:28:10 +0000 (14:28 +0000)]
* build/config_vars.sh.in: Fix error if APU_CONFIG is not defined.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@757819
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 24 Mar 2009 14:20:10 +0000 (14:20 +0000)]
* configure.in: If APR version is 2, APR-util does not exist.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@757817
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 24 Mar 2009 11:30:47 +0000 (11:30 +0000)]
* Fix a memory leak by freeing the memory consumed by the bucket.
PR: 44948
Submitted by: Dan Poirier <poirier pobox.com>
Reviewed by: rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@757741
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 24 Mar 2009 10:56:55 +0000 (10:56 +0000)]
* Do not allow name based virtual hosts in the case no hostname was
provided via SNI.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@757720
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 23 Mar 2009 17:37:38 +0000 (17:37 +0000)]
* Store the correct server_rec in the connection record configuration and
adjust the remaining part of mod_ssl to use this server_rec instead of
c->base_server.
modules/ssl/ssl_private.h:
- server_rec member to SSLConnRec struct
- Add macros to extract data from connection_rec
mySrvFromConn(c)
mySrvConfigFromConn(c)
myModConfigFromConn(c)
modules/ssl/ssl_engine_io.c
modules/ssl/ssl_util_ocsp.c
modules/ssl/ssl_engine_kernel.c
modules/ssl/mod_ssl.c
modules/ssl/ssl_engine_log.c
- Use the new macros to extract data fron connection_rec
and use the server_rec stored in SSLConnRec instead of
c->base_server whereever appropriate.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@757463
13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Mon, 23 Mar 2009 16:07:35 +0000 (16:07 +0000)]
Roll on to 2.3.2.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@757429
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 23 Mar 2009 15:59:36 +0000 (15:59 +0000)]
* modules/mappers/mod_rewrite.c (apply_rewrite_rule): When evaluating
a proxy rule in directory context, do escape the filename by
default, since mod_proxy will not escape in that case due to the
(deliberate) fixup hook ordering.
Thanks to: rpluem
PR: 46428
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@757427
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 23 Mar 2009 13:18:06 +0000 (13:18 +0000)]
* modules/cache/mod_socache_memcache.c,
modules/cache/mod_socache_shmcb.c, modules/cache/mod_socache_dbm.c:
Remove references to "SSL" throughout comments and code.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@757396
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 23 Mar 2009 11:45:00 +0000 (11:45 +0000)]
Remove code to support per-dir-CA configuration which relies on a
function which was never included in OpenSSL:
* acinclude.m4: Remove test for fictional function.
* modules/ssl/ssl_engine_kernel.c (ssl_hook_Access): Remove code.
* modules/ssl/ssl_engine_config.c (MODSSL_SET_CA): Remove unused
macro. (ssl_cmd_SSLCACertificatePath,
ssl_cmd_SSLCACertificateFile): Fail if per-dir-CA is configured.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@757380
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 23 Mar 2009 11:12:23 +0000 (11:12 +0000)]
Prevent a case of SSI timefmt-smashing with filter chains including
multiple INCLUDES filters:
* modules/filters/mod_include.c (add_include_vars): Drop unused
timefmt argument.
(add_include_vars_lazy): Take timefmt argument.
(get_include_var, handle_printenv): Pass time format from context.
PR: 39369
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@757376
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 23 Mar 2009 10:51:00 +0000 (10:51 +0000)]
* If the SNI extension supplied a hostname. So don't accept requests with
either no hostname or a different hostname.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@757373
13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 20 Mar 2009 17:49:30 +0000 (17:49 +0000)]
Add change to changelog.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@756687
13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 20 Mar 2009 17:42:26 +0000 (17:42 +0000)]
When trying to detect the content type of the
uncompressed content it is often not enough
to read the same number of bytes, we already
read compressed. Since uncompress() allocates a
new buffer, we can increase the number of bytes
to read to the same size, we use in the case,
where the content isn't compressed.
Furthermore zero-terminate the read data to keep
assumptions consistent with the uncompressed case.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@756683
13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 20 Mar 2009 17:38:39 +0000 (17:38 +0000)]
Set the content encoding for compressed content
even if we can't detect the content type of the
uncompressed content.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@756678
13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 20 Mar 2009 17:37:18 +0000 (17:37 +0000)]
Creating the external gzip process fails, because we
call execve() with "gzip" without full path.
Let's look for it in the PATH instead and drop the
passing of the environment. There seems to be no
reason why gzip should need the httpd environment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@756675
13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 20 Mar 2009 17:34:25 +0000 (17:34 +0000)]
Creation of external gzip process fails, if we
try to set the working directory to r->filename.
Use ap_make_dirstr_parent() instead, like in all
other similar places.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@756671
13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 20 Mar 2009 17:30:51 +0000 (17:30 +0000)]
Whitespace cleanup before doing other changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@756668
13f79535 -47bb-0310-9956-
ffa450edef68
Roy T. Fielding [Tue, 17 Mar 2009 23:36:27 +0000 (23:36 +0000)]
add application/x-java-jnlp-file
http://java.sun.com/developer/technicalArticles/Programming/jnlp/
(because some companies are too stupid to register a type)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@755445
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 17 Mar 2009 11:10:14 +0000 (11:10 +0000)]
* APR_BUCKET_NEXT is wrong here as we are already a doing a APR_BUCKET_NEXT in
the for loop and this causes us to jump *two* buckets forward. This can cause
us to jump over the Sentinel of the brigade and thus causes an endless loop.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@755190
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 12 Mar 2009 17:52:51 +0000 (17:52 +0000)]
It's a pet peeve of mine when docs do something, and then say "don't do that."
Remove the hostname from the <VirtualHost> line, and use an IP address
instead.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@752951
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 12 Mar 2009 15:27:00 +0000 (15:27 +0000)]
Add an example of using a wildcard with ServerAlias
Change <VirtualHost *> to <VirtualHost *:80>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@752894
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 12 Mar 2009 09:29:53 +0000 (09:29 +0000)]
* Escape pathes of filenames in 406 responses to avoid HTML injections and
HTTP response splitting.
PR: 46837
Submitted by: Geoff Keating <geoffk apple.com>
Reviewed by: rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@752812
13f79535 -47bb-0310-9956-
ffa450edef68
Greg Ames [Wed, 11 Mar 2009 18:05:20 +0000 (18:05 +0000)]
the CRLF following 100 Continue needs to be sent as ASCII on EBCDIC
boxes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@752546
13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Tue, 10 Mar 2009 17:32:52 +0000 (17:32 +0000)]
Small typo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@752176
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 10 Mar 2009 15:33:05 +0000 (15:33 +0000)]
Note for self: PPR drops the path info so we
don't really honor PPR /foo balancer://bar/jimbob
in a way that we would expect.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@752140
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 10 Mar 2009 15:11:52 +0000 (15:11 +0000)]
sync xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@752134
13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 8 Mar 2009 14:26:45 +0000 (14:26 +0000)]
Small typos.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@751431
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Thu, 5 Mar 2009 21:58:24 +0000 (21:58 +0000)]
Remove anomalous copyright line
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@750620
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 5 Mar 2009 20:00:03 +0000 (20:00 +0000)]
Until APR is actually fixed between apr_os_sock_make and the logic
within apr_socket_timeout_set, let's presume that vendor differences
of socket stack drivers can vary this behavior, and the assumptions
were unsafe for both accept() and AcceptEx().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@750569
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 5 Mar 2009 19:50:41 +0000 (19:50 +0000)]
Use a single event for the lifetime of the 'AcceptFilter none' variety
sockets; it appears that resetting the accept event while another was
waiting would break the pending connection, causing host socket resets.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@750567
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 4 Mar 2009 20:05:09 +0000 (20:05 +0000)]
* remove uneeded remains of r750126.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@750132
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 4 Mar 2009 19:55:09 +0000 (19:55 +0000)]
Accelerate mod_dumpio processing;
* drop a frequent query for the mod configuration (pass as f->ctx)
* drop one copy, at least for ASCII
and ensure larger buffers are logged in their entirety. Some clarity
in output can be added by designating continuations vs first lines.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@750126
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 4 Mar 2009 19:13:07 +0000 (19:13 +0000)]
Use APR_POLLSET_NOCOPY for better performance with some pollset implementations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@750108
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 4 Mar 2009 19:01:28 +0000 (19:01 +0000)]
Implement Event-Based accept for 'AcceptMutex none' in the WinNT MPM.
This facilitates the next two refactorings; multiple listeners per
listener thread (all accept paths using win32 events) and then multiple
threads leveraging parallel CPU's.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@750102
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 4 Mar 2009 18:34:17 +0000 (18:34 +0000)]
repeat apr_pollset_poll() while it returns EINTR
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@750094
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 3 Mar 2009 20:53:18 +0000 (20:53 +0000)]
remove unreachable code
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@749747
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 3 Mar 2009 19:49:54 +0000 (19:49 +0000)]
* Remove unused variable.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@749714
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 3 Mar 2009 02:44:50 +0000 (02:44 +0000)]
Use --with-included-apr if you don't have the compiler
your OS-delivered APR was built with
xlc vs gcc
SunStudio vs gcc
gcc n vs gcc n-bignum
etc.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@749512
13f79535 -47bb-0310-9956-
ffa450edef68
Sander Temme [Mon, 2 Mar 2009 23:18:43 +0000 (23:18 +0000)]
Note PR for OpenSSL type-safe STACK fix in CHANGES
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@749467
13f79535 -47bb-0310-9956-
ffa450edef68
Sander Temme [Mon, 2 Mar 2009 23:17:53 +0000 (23:17 +0000)]
Clean up more compiler emits. Add CHANGES entry, credit Kasper for the OpenSSL STACK fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@749466
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 2 Mar 2009 21:49:51 +0000 (21:49 +0000)]
axe a fearful comment that was addressed before committing r749438
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@749445
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 2 Mar 2009 21:25:50 +0000 (21:25 +0000)]
fix CHANGES entry for r749438
the ab issue was with EALREADY, not EINPROGRESS
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@749441
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 2 Mar 2009 21:17:43 +0000 (21:17 +0000)]
ab: Fix maintenance of the pollset to resolve EINPROGRESS errors
with kqueue (BSD/OS X) and excessive CPU with event ports (Solaris).
The apr_pollset API requires that a socket be removed from
the pollset whenever there is a change to the requested events.
The socket must also be removed when it is closed. This wasn't
completely implemented.
PR: 44584
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@749438
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 2 Mar 2009 17:40:33 +0000 (17:40 +0000)]
improve acceptance of APR/APR-Util trunk/2.0-dev
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@749375
13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 1 Mar 2009 14:36:08 +0000 (14:36 +0000)]
Missing verbs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@749041
13f79535 -47bb-0310-9956-
ffa450edef68
Brian McCallister [Sun, 1 Mar 2009 01:46:17 +0000 (01:46 +0000)]
remove leftover debug statement
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@748949
13f79535 -47bb-0310-9956-
ffa450edef68
Brian McCallister [Sun, 1 Mar 2009 01:37:44 +0000 (01:37 +0000)]
change syntax for getting document root in mod_lua to r.document_root, suggested by Bertrand Mansion
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@748948
13f79535 -47bb-0310-9956-
ffa450edef68
Brian McCallister [Sun, 1 Mar 2009 01:25:27 +0000 (01:25 +0000)]
change r.content_type = "something" to use ap_set_content_type, which it should as was pointed out by Bertrand Mansion
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@748946
13f79535 -47bb-0310-9956-
ffa450edef68
Sander Temme [Fri, 27 Feb 2009 05:16:18 +0000 (05:16 +0000)]
The development trunk of OpenSSL has tightened up the type safety of the STACK construct
and the functions that manipulate it. Make httpd trunk compile against OpenSSL HEAD
as well as OpenSSL 0.9.8j. Also, get rid of some warnings.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@748396
13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 22 Feb 2009 13:09:09 +0000 (13:09 +0000)]
Small typo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@746668
13f79535 -47bb-0310-9956-
ffa450edef68
Lars Eilebrecht [Sat, 21 Feb 2009 17:07:01 +0000 (17:07 +0000)]
fix mod_disk_cache to support EnableSendfile.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@746541
13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 21 Feb 2009 16:57:09 +0000 (16:57 +0000)]
headers replaced by directives line 48
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@746540
13f79535 -47bb-0310-9956-
ffa450edef68
Roy T. Fielding [Wed, 18 Feb 2009 00:59:39 +0000 (00:59 +0000)]
only call mutex functions if APR_HAS_THREADS
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@745338
13f79535 -47bb-0310-9956-
ffa450edef68
Mladen Turk [Tue, 17 Feb 2009 17:51:17 +0000 (17:51 +0000)]
Add watchdog module to win32 build.
Since it can only operate as static module reference it inside modules.c
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@745172
13f79535 -47bb-0310-9956-
ffa450edef68
Mladen Turk [Tue, 17 Feb 2009 17:28:33 +0000 (17:28 +0000)]
Add watchdog module header to dist include
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@745164
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 17 Feb 2009 13:59:30 +0000 (13:59 +0000)]
fix the name of this module in an error log message
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@745073
13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Mon, 16 Feb 2009 10:55:23 +0000 (10:55 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@744891
13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Mon, 16 Feb 2009 10:52:26 +0000 (10:52 +0000)]
some modifications to generate the man pages in other languages
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@744890
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 12 Feb 2009 21:40:20 +0000 (21:40 +0000)]
Fix a crash with r742218 by calling apr_os_thread_put() properly.
(The first parameter to apr_os_thread_put() must be initialized, either to
NULL or to an existing apr_thread_t.)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@743894
13f79535 -47bb-0310-9956-
ffa450edef68
Roy T. Fielding [Thu, 12 Feb 2009 18:58:10 +0000 (18:58 +0000)]
ap_meets_conditions() should not be called until all of
the known content metadata has been set, so that said metadata
can be included in the condition tests and in a 304 response.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@743837
13f79535 -47bb-0310-9956-
ffa450edef68
Roy T. Fielding [Thu, 12 Feb 2009 17:43:39 +0000 (17:43 +0000)]
Adjust content metadata on deflate/inflate response before bailing out
on a 304 response so that the metadata does not differ from 200 response.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@743814
13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Thu, 12 Feb 2009 13:47:28 +0000 (13:47 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@743739
13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Thu, 12 Feb 2009 13:37:07 +0000 (13:37 +0000)]
New Turkish translation
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@743735
13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Thu, 12 Feb 2009 13:28:32 +0000 (13:28 +0000)]
update for sync with English doc.
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@743731
13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Thu, 12 Feb 2009 13:15:49 +0000 (13:15 +0000)]
update for sync with English doc.
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@743725
13f79535 -47bb-0310-9956-
ffa450edef68
Roy T. Fielding [Thu, 12 Feb 2009 01:59:27 +0000 (01:59 +0000)]
Reimplement deflate_check_etag() so that it isn't such a pig
and correctly works with weak etags. Related to PR 39727.
Note that there remains an error in ap_meets_conditions because
that function does not currently check for a transformed etag.
I am working on that.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@743595
13f79535 -47bb-0310-9956-
ffa450edef68
Roy T. Fielding [Thu, 12 Feb 2009 01:44:53 +0000 (01:44 +0000)]
mod_version needs to be compiled because the test framework requires it
(and the feature doesn't make much sense if it crashes httpd on test).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@743589
13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Wed, 11 Feb 2009 17:12:18 +0000 (17:12 +0000)]
MMapStatic directive doesn't exist.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@743408
13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Wed, 11 Feb 2009 07:16:18 +0000 (07:16 +0000)]
fix validation errors
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@743252
13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Wed, 11 Feb 2009 07:12:19 +0000 (07:12 +0000)]
pre-translation improvements
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@743251
13f79535 -47bb-0310-9956-
ffa450edef68