1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-06 09:01:14 +03:00
Commit Graph

4072 Commits

Author SHA1 Message Date
Bradley Nicholes
2e0569de3d Report the NetWare socket error since we are using native socket calls
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102986 13f79535-47bb-0310-9956-ffa450edef68
2004-03-16 02:49:15 +00:00
Bradley Nicholes
3df96d441f Add modules/ssl to the include path for the NetWare build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102984 13f79535-47bb-0310-9956-ffa450edef68
2004-03-16 01:32:58 +00:00
Jeff Trawick
18edbaaf56 mod_cgid: Fix storage corruption caused by use of incorrect pool.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102961 13f79535-47bb-0310-9956-ffa450edef68
2004-03-15 20:00:13 +00:00
Joe Orton
56c15784a0 Forward-port from mod_dav 1.0:
* modules/dav/main/util.c (dav_validate_resource_state): Fix a 2617
violation: if the lock user validation fails, rather than giving a 401
without a WWW-Authenticate header, give a 403.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102958 13f79535-47bb-0310-9956-ffa450edef68
2004-03-14 19:51:08 +00:00
André Malo
4d651c4a11 repos.c: In function `dav_fs_copymove_file':
repos.c:315: warning: `perms' might be used uninitialized in this function


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102953 13f79535-47bb-0310-9956-ffa450edef68
2004-03-14 16:13:20 +00:00
André Malo
28b9a34268 emit the config filename when warning about overlapping aliases
Submitted by: Guenter Knauf <eflash gmx.net>
Reviewed by: Dirk-Willem van Gulik


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102949 13f79535-47bb-0310-9956-ffa450edef68
2004-03-13 21:19:56 +00:00
Joe Orton
e44704a468 Fix litmus test copy_nodestcoll; 2518 requires that MKCOL MUST fail
with 409 on missing intermediates:

* modules/dav/fs/repos.c (dav_fs_create_collection): Give a 409 rather
than a 403 if apr_dir_make fails with ENOENT.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102946 13f79535-47bb-0310-9956-ffa450edef68
2004-03-13 12:56:47 +00:00
Joe Orton
087d576ab8 Forward-port from mod_dav 1.0: maintain the {DAV:}executable property
across COPY and MOVE:

* modules/dav/fs/repos.c (dav_fs_copymove_file): Take src_info,
dst_info arguments and set permissions on dst if necessary.
(dav_fs_copymove_state, dav_fs_copymove_walker,
dav_fs_copymove_resource): Update accordingly.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102945 13f79535-47bb-0310-9956-ffa450edef68
2004-03-13 12:52:04 +00:00
Joe Orton
b40d18f81a * modules/dav/fs/repos.c (MAP_IO2HTTP): New macro.
(dav_fs_copymove_file): Use it to give a 507 if open() returns ENOSPC,
and use it to handle apr_file_write_full() return code.
(dav_fs_open_stream): Use MAP_IO2HTTP.
(dav_fs_create_collection): Use APR_STATUS_IS_ENOSPC.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102944 13f79535-47bb-0310-9956-ffa450edef68
2004-03-12 18:06:55 +00:00
Joe Orton
670b834207 * modules/ssl/ssl_engine_log.c (ssl_log_annotation): const-ify more.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102943 13f79535-47bb-0310-9956-ffa450edef68
2004-03-12 17:14:28 +00:00
William A. Rowe Jr
ce9d647ae5 Pick up mod_status.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102938 13f79535-47bb-0310-9956-ffa450edef68
2004-03-11 20:19:24 +00:00
William A. Rowe Jr
62515c06dd Tie in ../ssl/mod_ssl.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102937 13f79535-47bb-0310-9956-ffa450edef68
2004-03-11 20:11:44 +00:00
Joe Orton
a636051074 * modules/proxy/proxy_http.c (ap_proxy_http_process_response):
Consistently check whether r->status is "successful" or not; fix
screwy handling of 2xx-but-not-200 responses when ProxyErrorOverride
is used.

PR: 20183
Submitted by: Marcus Janson <marcus.janson@tre.se>, Joe Orton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102935 13f79535-47bb-0310-9956-ffa450edef68
2004-03-11 17:21:47 +00:00
Joe Orton
af018fda00 * modules/dav/fs/repos.c (dav_fs_copymove_file): Update for the fact
that apr_file_read() has guaranteed len == 0 at EOF for a looong time;
and avoid a redundant call to write(,,0) when EOF is reached.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102934 13f79535-47bb-0310-9956-ffa450edef68
2004-03-11 14:32:00 +00:00
Joe Orton
3f4721a9b6 * modules/dav/main/mod_dav.c (dav_finish_multistatus): New function;
factored out, sends an EOS bucket after the response body.
(dav_send_multistatus, dav_method_propfind): Use it.

[might be related to PR 27576 if there is a real issue described
there]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102933 13f79535-47bb-0310-9956-ffa450edef68
2004-03-11 13:46:48 +00:00
Joe Orton
ddecd8ab9e * modules/ssl/ssl_engine_log.c (ssl_log_annotate, ssl_log_annotation,
ssl_log_ssl_error): const-ify annotation strings and simplify
ssl_log_annotation.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102927 13f79535-47bb-0310-9956-ffa450edef68
2004-03-10 21:54:17 +00:00
Joe Orton
7d90e82bac * modules/standard/mod_autoindex.c (index_directory): If stat() fails
for a particular dirent, ignore that entry rather than truncating the
directory listing.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102924 13f79535-47bb-0310-9956-ffa450edef68
2004-03-10 20:51:10 +00:00
Madhusudan Mathihalli
bc33efe94a Enable mod_rewrite to recognize SSL variables (using ssl_var_lookup)
Submitted by: Joe Orton
Reviewed by: Madhusudan Mathihalli


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102904 13f79535-47bb-0310-9956-ffa450edef68
2004-03-09 17:33:15 +00:00
Justin Erenkrantz
9b26889a19 Fix bug in mod_usertrack when no CookieName is set.
PR: 24483
Submitted by:	Manni Wood <manniwood planet-save.com>
Reviewed by:	Cliff Woolley, Jim Jagielski


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102890 13f79535-47bb-0310-9956-ffa450edef68
2004-03-08 23:27:31 +00:00
Bradley Nicholes
fb318cf248 Add the ssl_is_https() and ssl_var_lookup() optional functions to the mod_nw_ssl module for Netware
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102877 13f79535-47bb-0310-9956-ffa450edef68
2004-03-07 03:08:21 +00:00
Bradley Nicholes
c7174f4244 Allow make files to create a cc.opt compiler options file per NLM rather than a single file per directory
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102876 13f79535-47bb-0310-9956-ffa450edef68
2004-03-07 03:04:51 +00:00
Bradley Nicholes
7bb8fc09df Add the include path to modules/ssl to resolve the include of mod_ssl.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102875 13f79535-47bb-0310-9956-ffa450edef68
2004-03-06 22:26:51 +00:00
Joe Orton
15e2a44274 Fix use of mod_ssl as a DSO linked against static SSL libraries; also
stop linking all of support/* against the SSL libraries:

* acinclude.m4 (APACHE_MODULE): Define MOD_FOO_LDADD which each
module .la library will be linked against.
(APACHE_MODPATH_ADD): Link static modules against the provided libraries.
(APACHE_CHECK_SSL_TOOLKIT): Put SSL libraries in SSL_LIBS and export
that to config_vars.mk.

* support/Makefile.in: Link ab against SSL_LIBS.

* modules/ssl/config.m4: Add SSL_LIBS and distcache libraries to
MOD_SSL_LDADD.

PR: 17217


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102870 13f79535-47bb-0310-9956-ffa450edef68
2004-03-06 16:47:41 +00:00
Bradley Nicholes
74c5908625 Allow the enabled flag to be set to more than just TRUE or FALSE so that
the OPTIONAL flag can be correctly merged within the
ssl_config_server_merge() function.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102860 13f79535-47bb-0310-9956-ffa450edef68
2004-03-05 02:44:40 +00:00
Bradley Nicholes
344ea84d8e Allow the enabled flag to be set to more that just TRUE or FALSE so that
the OPTIONAL flag is correctly merged within the
ssl_config_server_merge() function.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102859 13f79535-47bb-0310-9956-ffa450edef68
2004-03-05 02:41:39 +00:00
Joe Orton
1c5889d105 * modules/ssl/ssl_engine_init.c (ssl_init_Engine): Log the OpenSSL
error stack contents if engine load/init fails.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102857 13f79535-47bb-0310-9956-ffa450edef68
2004-03-04 22:00:25 +00:00
Joe Orton
f205725d2e * modules/ssl/ssl_engine_log.c (ssl_log_ssl_error): Use %lu to print
an unsigned long.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102856 13f79535-47bb-0310-9956-ffa450edef68
2004-03-04 21:54:09 +00:00
Joe Orton
4c36ea2ab5 * modules/ssl/ssl_engine_vars.c (ssl_var_lookup,
ssl_var_lookup_ssl_cipher): Use apr_itoa instead of psprintf %d.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102855 13f79535-47bb-0310-9956-ffa450edef68
2004-03-04 20:44:13 +00:00
Joe Orton
919194363c * modules/ssl/ssl_engine_vars (ssl_var_lookup): const'ify result and
drop a bunch of casts; use apr_table_get directly in place of
ssl_var_lookup_header.
(ssl_var_lookup_header): Remove function.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102854 13f79535-47bb-0310-9956-ffa450edef68
2004-03-04 20:39:53 +00:00
Joe Orton
0015ef74b5 * modules/ssl/ssl_engine_vars (ssl_var_lookup): Optimise such that
lookup of SSL_* variables (the common case) requires 2 rather than 29
strcasecmp calls before getting to ssl_var_lookup_ssl().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102851 13f79535-47bb-0310-9956-ffa450edef68
2004-03-04 13:42:09 +00:00
Joe Orton
0f7f4106a3 * modules/ssl/mod_ssl.h: Declare ssl_is_https optional function.
* modules/ssl/ssl_engine_vars (ssl_is_https): New function.
(ssl_var_register): Register it.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102850 13f79535-47bb-0310-9956-ffa450edef68
2004-03-04 13:06:54 +00:00
Joe Orton
3f58695141 * modules/ssl/ssl_engine_vars (ssl_var_lookup): Fix potential
segfaults if called with r=NULL, c!=NULL, spotted by Andr��.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102849 13f79535-47bb-0310-9956-ffa450edef68
2004-03-04 07:59:30 +00:00
Allan K. Edwards
2f1cf770a5 fix windows build: add path to mod_ssl.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102837 13f79535-47bb-0310-9956-ffa450edef68
2004-03-01 18:06:08 +00:00
Joe Orton
0dbf5a122e * modules/metadata/mod_headers.c (header_inout_cmd): Remove redundant
conditional.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102832 13f79535-47bb-0310-9956-ffa450edef68
2004-03-01 15:51:25 +00:00
Joe Orton
e878bf757b * modules/ssl/ssl_engine_io.c (ssl_io_filter_disable,
ssl_io_filter_error): Clear the SSL * pointer in the SSLConnRec too.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102819 13f79535-47bb-0310-9956-ffa450edef68
2004-02-29 00:29:20 +00:00
Joe Orton
dd2b6c2bf8 * modules/ssl/ssl_engine_vars.c (ssl_var_lookup_ssl_cert_dn): Simplify
to use apr_pstrmemdup.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102815 13f79535-47bb-0310-9956-ffa450edef68
2004-02-28 23:03:15 +00:00
Joe Orton
eb78a22c85 * modules/ssl/ssl_engine_vars.c (ssl_var_lookup_ssl_cert_dn): For a DN
which includes several RDNs with the same OID, allow lookup of any
particular RDN using an "_<n>" suffix on the name.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102813 13f79535-47bb-0310-9956-ffa450edef68
2004-02-28 22:56:01 +00:00
Joe Orton
0fed1575be Add 's' format tag to mod_headers to allow access to mod_ssl variables
without the overhead of SSLOptions +StdEnvVars/+ExportCertData; also
ensure that any multi-line envvars are unwrapped onto a single line.

* modules/metadata/mod_headers.c (header_request_ssl_var, unwrap_header,
header_post_config): New functions.
(header_pre_config): Register the 's' tag type.
(register_hooks): Add the post_config hook.

PR: 23223


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102809 13f79535-47bb-0310-9956-ffa450edef68
2004-02-28 21:44:30 +00:00
Joe Orton
3ca3524c31 Move mod_ssl-internal interfaces into ssl_private.h; allow mod_ssl.h
to be included even when mod_ssl is not enabled.

* Makefile.in (install-include): Only install mod_ssl.h.

* modules/ssl/ssl_private.h: New file.

* modules/ssl/mod_ssl.h: Move everything apart from than the optional
hook definitions into ssl_private.h.

* modules/ssl/*.c: Include ssl_private.h not mod_ssl.h

* modules/ssl/config.m4: Always add the mod_ssl directory to the
include path so other modules can find mod_ssl.h.

* modules/proxy/mod_proxy.c: Include mod_ssl.h to pick up the optional
hook definitions rather than copy'n'pasting them.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102803 13f79535-47bb-0310-9956-ffa450edef68
2004-02-28 18:06:35 +00:00
Joe Orton
3b3113012f Relicense.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102799 13f79535-47bb-0310-9956-ffa450edef68
2004-02-28 11:55:46 +00:00
Madhusudan Mathihalli
48c38a4533 Send the 'Close Alert' message to the peer upon closing a SSL session. This
required creating a new EOC (End-Of-Connection) bucket type to notify mod_ssl
that the connection is about to be closed.


Reviewed by: Joe Orton, Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102793 13f79535-47bb-0310-9956-ffa450edef68
2004-02-28 00:45:26 +00:00
Jeff Trawick
3273ddb6de fix an old misfeature: "BufferedLogs Off" would sort-of turn
buffered logging on as it set the log writer to the buffered log
writer, though it would leave the are-logs-buffered flag off

this misfeature combined with recent mutex logic for buffered logs
led to a segfault with "BufferedLogs Off"


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102783 13f79535-47bb-0310-9956-ffa450edef68
2004-02-26 20:15:26 +00:00
Jeff Trawick
7122d6ea3a a kind fix for a compile error unfortunately broke an order
dependency...  the buffered logs array needs to be initialized
prior to opening the logs


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102781 13f79535-47bb-0310-9956-ffa450edef68
2004-02-26 20:00:55 +00:00
Joe Orton
0e34b8f5f4 * modules/ssl/ssl_engine_io.c (ssl_io_filter_disable): Don't leak an
SSL structure for each plain-HTTP-on-SSL-port request.

PR: 27106


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102770 13f79535-47bb-0310-9956-ffa450edef68
2004-02-25 10:54:29 +00:00
Joe Orton
825005a089 * modules/ssl/ssl_engine_pphrase.c (ssl_pphrase_Handle): Wording
tweaks.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102747 13f79535-47bb-0310-9956-ffa450edef68
2004-02-22 10:27:21 +00:00
Joe Orton
ba689780fa * modules/ssl/ssl_scache_shmcb.c (ssl_scache_shmcb_init): Use an
anonymous shm segment by default or fall back on name-based shm.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102746 13f79535-47bb-0310-9956-ffa450edef68
2004-02-22 10:23:01 +00:00
André Malo
9dc7d9ff58 remove support for Remote_User variable, which never worked at all.
PR: 25725


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102734 13f79535-47bb-0310-9956-ffa450edef68
2004-02-21 18:28:30 +00:00
André Malo
d20937008b forward port to not log twice
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102730 13f79535-47bb-0310-9956-ffa450edef68
2004-02-21 17:09:20 +00:00
André Malo
f93ccbd7c2 do not exit() from inside a module!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102729 13f79535-47bb-0310-9956-ffa450edef68
2004-02-21 16:38:36 +00:00
André Malo
c3617eb632 ugh! Fix log open error condition, which never matched.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102728 13f79535-47bb-0310-9956-ffa450edef68
2004-02-21 15:53:49 +00:00