www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-01-13 21:42:17 +03:00
Code Activity
13,027 Commits 62 Branches 306 Tags
136ee0803334dded3aaa3467f7debd4de2a350c4
Commit Graph

4163 Commits

Author SHA1 Message Date
Jean-Jacques Clar
136ee08033 Added new field in apr_procattr_t and cgi_exec_info_t structures to support loading in current or new address space (NetWare ONLY). 
Replaced changes that added APR_PROGRAM_ADDRSPACE committed 6/11/04.
Reviewed by Brad Nicholes


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103946 13f79535-47bb-0310-9956-ffa450edef68
 2004-06-14 17:28:25 +00:00
André Malo
8fb0fc2705 Drop the ErrorHeader directive which turned out to be a misnomer. 
Instead there's a new optional flag for the Header directive
('always'), which keeps the former ErrorHeader functionality.

The opposite flag to 'always' is 'onsuccess'. So the new directives are written
as:

Header set foo bar
# which is the same as
Header onsuccess set foo bar
# and a subset of
Header always set foo bar
# which is what the ErrorHeader directive did.

Reviewed by: Brad Nicholes


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103920 13f79535-47bb-0310-9956-ffa450edef68
 2004-06-11 21:41:27 +00:00
Jean-Jacques Clar
a2c057d7fb Replaced APR_PROGRAM_ENV with new enum APR_PROGRAM_ADDRSPACE 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103914 13f79535-47bb-0310-9956-ffa450edef68
 2004-06-11 20:21:04 +00:00
Allan K. Edwards
fef2e79308 Don't deflate responses with zero length e.g. proxied 304's 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103910 13f79535-47bb-0310-9956-ffa450edef68
 2004-06-11 19:44:23 +00:00
Bradley Nicholes
4662790f1f Allow relative paths for LDAPTrustedCA to be resolved against ServerRoot PR#26602 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103877 13f79535-47bb-0310-9956-ffa450edef68
 2004-06-09 21:54:50 +00:00
André Malo
7accf16eed Nobody objected: 
<IfModule> now takes the module identifier in addition to the
filename.

CAUTION: this commit breaks the build on netware. It still needs
to be adjusted. (but I don't have any netware knowledge...)
Also, developers need to re-run buildconf on unices.

PR: 29003
Submitted by: Edward Rudd <eddie omegaware.com>, Andr� Malo


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103849 13f79535-47bb-0310-9956-ffa450edef68
 2004-06-04 22:40:47 +00:00
Joe Orton
c5e7b2778e Add "SSLUserName" directive to set r->user based on a chosen SSL 
environment variable name.

* modules/ssl/ssl_private.h (struct SSLDirConfigRec): Add
szUserName field.

* modules/ssl/ssl_engine_config.c (ssl_config_perdir_create,
ssl_config_perdir_merge): Initialize and merge szUserName field.
(ssl_cmd_SSLUserName): New function.

* modules/ssl/ssl_engine_kernel.c (ssl_hook_Fixup): Set r->user to
 the value of the chosen SSL environment variable.

* modules/ssl/mod_ssl.c: Add SSLUserName config directive.

PR: 20957
Submitted by: Martin v. Loewis <martin v.loewis.de>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103834 13f79535-47bb-0310-9956-ffa450edef68
 2004-06-03 15:00:15 +00:00
Joe Orton
e9ef262085 Add "SSLHonorCipherOrder" directive to enable the OpenSSL 0.9.7 flag 
which uses the server's cipher preference order rather than the
client's.

* modules/ssl/ssl_private.h (struct SSLSrvConfigRec): Add
cipher_server_pref field.

* modules/ssl/ssl_engine_config.c (ssl_config_server_create,
ssl_config_server_merge): Initialize and merge cipher_server_pref
field.
(ssl_cmd_SSLHonorCipherOrder): New function.

* modules/ssl/ssl_engine_init.c (ssl_init_ctx_protocol): Set the
context option SSL_OP_CIPHER_SERVER_PREFERENCE when required.

PR: 28665
Submitted by: Jim Shneider <jschneid netilla.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103832 13f79535-47bb-0310-9956-ffa450edef68
 2004-06-03 13:03:08 +00:00
Joe Orton
4ea42b6e3b Drop support for the "CompatEnvVars" argument to SSLOptions, which was 
never implemented in 2.0 and never needed to be.

* docs/ssl/ssl-std.conf.in: Remove CompatEnvVars examples.

* modules/ssl/ssl_engine_config.c (ssl_cmd_SSLOptions): Don't allow
the CompatEnvVars argument.

* modules/ssl/ssl_private.h: Remove SSL_OPT_COMPATENVVARS macro.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103829 13f79535-47bb-0310-9956-ffa450edef68
 2004-06-03 09:28:12 +00:00
Bradley Nicholes
611952767a Eliminate the redundant compiler rules 
Submitted by: Guenter Knauf <fuankg@apache.org>, Brad Nicholes


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103816 13f79535-47bb-0310-9956-ffa450edef68
 2004-06-01 17:48:21 +00:00
Joe Orton
5154894e09 * modules/filters/mod_deflate.c (deflate_out_filter): Destroy buckets 
immediately after are used so that memory consumption is not
proportional to the size of the response.

PR: 29318


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103810 13f79535-47bb-0310-9956-ffa450edef68
 2004-06-01 13:06:10 +00:00
Justin Erenkrantz
5d0a42a80c Fix bug in mod_deflate that unconditionally sent deflate'd output even when 
Accept-Encoding is not present.

Reported by Roy Fielding for http://cvs.apache.org/viewcvs/ with Safari.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103803 13f79535-47bb-0310-9956-ffa450edef68
 2004-05-29 03:34:17 +00:00
Joe Orton
b67b9a0670 * modules/ssl/ssl_scache.c (ssl_scache_expire): Remove unused function. 
* modules/ssl/ssl_scache_dc.c (ssl_scache_dc_expire): Likewise.

* modules/ssl/ssl_scache_shmcb.c (ssl_scache_shmcb_expire): Likewise.

* modules/ssl/ssl_scache_dbm.c (ssl_scache_dbm_expire): Make static.

* modules/ssl/ssl_private.h: Remove prototypes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103793 13f79535-47bb-0310-9956-ffa450edef68
 2004-05-27 09:20:00 +00:00
Graham Leggett
02b57a44ec Enable the option to support anonymous shared memory in mod_ldap. 
This makes the cache work on Linux again.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103772 13f79535-47bb-0310-9956-ffa450edef68
 2004-05-26 11:48:19 +00:00
André Malo
a800869190 parse content-length correctly using apr_strtoff function 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103769 13f79535-47bb-0310-9956-ffa450edef68
 2004-05-25 20:16:19 +00:00
André Malo
73666bee49 save some cycles 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103768 13f79535-47bb-0310-9956-ffa450edef68
 2004-05-25 20:01:23 +00:00
André Malo
e47931813e this should save one or two cycles 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103767 13f79535-47bb-0310-9956-ffa450edef68
 2004-05-25 19:39:50 +00:00
André Malo
9266375e50 parse byteranges correctly using the new apr_strtoff function 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103765 13f79535-47bb-0310-9956-ffa450edef68
 2004-05-25 19:09:45 +00:00
André Malo
726c8057b6 parse apr_off_t correctly using new apr_strtoff function 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103764 13f79535-47bb-0310-9956-ffa450edef68
 2004-05-25 18:22:58 +00:00
André Malo
b60c9417b2 parse content-length correctly using new apr_strtoff function 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103763 13f79535-47bb-0310-9956-ffa450edef68
 2004-05-25 18:01:02 +00:00
André Malo
2aa48e4f1a use new apr_strtoff function to parse PUT ranges correctly. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103762 13f79535-47bb-0310-9956-ffa450edef68
 2004-05-25 17:13:07 +00:00
Joe Orton
2c37f8ffc7 * modules/http/http_protocol.c (ap_setup_client_block, 
ap_http_filter): Use new apr_strtoff() to support request bodies as
large as apr_off_t allows (rather than as large as 'long' allows), and
simplify error handling.

PR: 27866


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103756 13f79535-47bb-0310-9956-ffa450edef68
 2004-05-25 14:36:18 +00:00
Joe Orton
f10b0ad3dc * modules/ssl/ssl_util.c, modules/ssl/ssl_private.h: Remove unused 
functions ssl_util_strupper, ssl_util_ptxtstub, and
ssl_util_uuencode*.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103755 13f79535-47bb-0310-9956-ffa450edef68
 2004-05-25 12:16:53 +00:00
Joe Orton
3efccf4239 * modules/ssl/ssl_engine_kernel.c (ssl_hook_UserCheck): Fix buffer 
overflow in FakeBasicAuth code if client's subject DN exceeds 6K in
length (CVE CAN-2004-0488); switch to using apr-util base64 encoder
functions.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103754 13f79535-47bb-0310-9956-ffa450edef68
 2004-05-25 12:09:01 +00:00
Graham Leggett
4748727831 Fix a segfault when requests for shared memory fails and returns 
NULL. Fix a segfault caused by a lack of bounds checking on the
cache.
PR:	24801
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103746 13f79535-47bb-0310-9956-ffa450edef68
 2004-05-23 22:15:10 +00:00
Graham Leggett
89c8360df0 Throw an error message if an attempt is made to use the LDAPTrustedCA 
or LDAPTrustedCAType directives in a VirtualHost.
PR:	26390
Obtained from:
Submitted by:	Brad Nicholes
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103736 13f79535-47bb-0310-9956-ffa450edef68
 2004-05-22 01:09:58 +00:00
Graham Leggett
c61e73c2a5 Small fix to allow reverse proxying to an ftp server. Previously 
an attempt to do this would try and connect to 0.0.0.0, regardless
of the server specified.
PR:	24922
Obtained from:
Submitted by:	Pascal Terjan <pterjan@linuxfr.org>
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103725 13f79535-47bb-0310-9956-ffa450edef68
 2004-05-21 22:05:31 +00:00
Joe Orton
af2d2b8edd * modules/dav/main/mod_dav.c (dav_method_put): Fix segfault 
in auto-versioning error handling path.

PR: 29148


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103723 13f79535-47bb-0310-9956-ffa450edef68
 2004-05-21 20:42:56 +00:00
Graham Leggett
c142a7a377 Fix a potential segfault if the bind password in the LDAP cache 
is NULL.
PR:	26686
Obtained from:
Submitted by:	Jari Ahonen <jah@progress.com>
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103713 13f79535-47bb-0310-9956-ffa450edef68
 2004-05-21 15:02:44 +00:00
Graham Leggett
3934dd704f Quotes cannot be used around require group and require dn 
directives, update the documentation to reflect this. Also add
quotes around the dn and group within debug messages, to make it
more obvious why authentication is failing if quotes are used in
error.
PR: 19304
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103711 13f79535-47bb-0310-9956-ffa450edef68
 2004-05-21 03:14:06 +00:00
Graham Leggett
ed49334e8e Fix a cut and paste, doh! 
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103710 13f79535-47bb-0310-9956-ffa450edef68
 2004-05-21 02:54:55 +00:00
Graham Leggett
f17a4d14ab The Microsoft LDAP SDK escapes filters for us, stop util_ldap 
from escaping filters twice when the backslash character is used.
PR: 24437
Obtained from:
Submitted by:	Jess Holle <jessh@ptc.com>
Reviewed by:	minfrin


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103708 13f79535-47bb-0310-9956-ffa450edef68
 2004-05-21 01:12:25 +00:00
Graham Leggett
431e61008a Overhaul handling of LDAP error conditions, so that the util_ldap_* 
functions leave the connections in a sane state after errors have
occurred.
PR: 27748, 17274, 17599, 18661, 21787, 24595, 24683, 27134, 27271
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103706 13f79535-47bb-0310-9956-ffa450edef68
 2004-05-20 22:41:25 +00:00
Jeff Trawick
3b16ac459e apr_pstrcat() needs NULL at end of parameter list to know 
when to stop (mississi^#@75UiSIGSEGV)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103699 13f79535-47bb-0310-9956-ffa450edef68
 2004-05-19 16:15:53 +00:00
Jeff Trawick
7d99a3c077 Fix handling of IPv6 numeric strings in mod_proxy. 
(Some such operations would work if port was specified
in url due to way parsing was performed, finding last ':'
and considering everything after as the port.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103698 13f79535-47bb-0310-9956-ffa450edef68
 2004-05-19 13:30:14 +00:00
André Malo
7480ab8ebe external map responses were cut at 2048 bytes (and possibly got out of sync that 
way). Now they are unlimited.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103691 13f79535-47bb-0310-9956-ffa450edef68
 2004-05-17 23:36:15 +00:00
Joe Orton
3f6c2ba352 * modules/ssl/ssl_engine_config.c (ssl_config_global_create): Fix gcc 
strict-aliasing warning.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103688 13f79535-47bb-0310-9956-ffa450edef68
 2004-05-17 18:57:39 +00:00
Bradley Nicholes
06bc34ae0c if the call to ldap_simple_bind_s() fails, the connection is left in an unbound state. Make sure that the connection record is updated to show the current state. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103678 13f79535-47bb-0310-9956-ffa450edef68
 2004-05-13 14:29:11 +00:00
Madhusudan Mathihalli
8a35d297cf Fix SEGV in 'shmcb' session cache: 
When a 'read' or 'write' to session cache is done, we need to check the size
of the data being 'read' or 'written' to avoid buffer over-run.

PR: 27751
Submitted by: Geoff Thorpe
Reviewed by: Madhusudan Mathihalli


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103669 13f79535-47bb-0310-9956-ffa450edef68
 2004-05-12 21:36:52 +00:00
Joe Orton
0e31ef0533 * modules/experimental/util_ldap.c (util_ldap_cache_compare): Fix 
uninitialized variable warning from gcc -Wall.
(util_ldap_set_cache_bytes, util_ldap_post_config): Use correct APR
printf format string macros.
(util_ldap_set_cert_type): Make static to fix gcc warning.
(util_ldap_cleanup_module): Fix unused variable warning.

* modules/experimental/mod_auth_ldap.c (derive_codepage_from_lang):
Remove unused variable.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103664 13f79535-47bb-0310-9956-ffa450edef68
 2004-05-12 18:44:27 +00:00
Jim Jagielski
ec44c1ec9d *** empty log message *** 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103639 13f79535-47bb-0310-9956-ffa450edef68
 2004-05-10 13:58:56 +00:00
Joe Orton
96c0ef3f90 * modules/loggers/mod_log_config.c, server/log.c (open_error_log, 
ap_replace_stderr_log): Use APR_LARGEFILE when opening log files, to
allow log files to exceed the 2Gb limit if necessary.

PR: 13511


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103627 13f79535-47bb-0310-9956-ffa450edef68
 2004-05-06 10:18:07 +00:00
Joe Orton
0df6a7dbfe * modules/generators/mod_cgi.c (cgi_handler): Soak up stderr from nph- 
scripts correctly.

PR: 18348
Submitted by: Jeff Trawick (in mod_jcgi)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103622 13f79535-47bb-0310-9956-ffa450edef68
 2004-05-05 15:30:53 +00:00
Joe Orton
46fb957d01 * modules/generators/mod_cgi.c (cgi_handler): Combine common code 
between nph and non-nph handling; use a CGI bucket for both cases if
APR_FILES_AS_SOCKETS.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103621 13f79535-47bb-0310-9956-ffa450edef68
 2004-05-05 14:52:44 +00:00
Bradley Nicholes
77555ba72e Fix the XLFLAGS define in the NetWare makefiles so that the contents are added to the _link.opt file rather than the _link.def file 
Submitted by: Guenter Knauf <gk@gknw.net>, Brad Nicholes


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103544 13f79535-47bb-0310-9956-ffa450edef68
 2004-04-28 20:40:22 +00:00
Bradley Nicholes
db33072ca4 Fix up the DAV import/export files for the NetWare build 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103540 13f79535-47bb-0310-9956-ffa450edef68
 2004-04-28 17:59:12 +00:00
Bradley Nicholes
a0b967e1c8 Allow the memory address to change 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103532 13f79535-47bb-0310-9956-ffa450edef68
 2004-04-26 19:46:14 +00:00
André Malo
b8e029ae12 fix build on systems without unistd.h 
Submitted by: Guenter Knauf <eflash gmx.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103530 13f79535-47bb-0310-9956-ffa450edef68
 2004-04-26 18:58:59 +00:00
André Malo
49f48fb4b4 changed the following APIs to return an error instead of hard exiting: 
ap_add_module, ap_add_loaded_module, ap_setup_prelinked_modules,
and ap_process_resource_config


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103517 13f79535-47bb-0310-9956-ffa450edef68
 2004-04-25 17:23:31 +00:00
André Malo
62e1b7bdbe content-encoding needs to be unset. 
Submitted by: Nick Kew <nick webthing.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103476 13f79535-47bb-0310-9956-ffa450edef68
 2004-04-21 22:08:34 +00:00