Return-Path: Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 45576 invoked by uid 500); 17 May 2002 11:24:18 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 45565 invoked by uid 500); 17 May 2002 11:24:18 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Date: 17 May 2002 11:24:17 -0000 Message-ID: <20020517112417.12330.qmail@icarus.apache.org> From: trawick@apache.org To: httpd-2.0-cvs@apache.org Subject: cvs commit: httpd-2.0/modules/ssl mod_ssl.c ssl_engine_init.c ssl_engine_io.c ssl_engine_kernel.c ssl_engine_log.c ssl_engine_pphrase.c ssl_engine_rand.c ssl_scache.c ssl_scache_dbm.c ssl_scache_shmcb.c ssl_scache_shmht.c X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N trawick 02/05/17 04:24:17 Modified: modules/dav/main mod_dav.h modules/mappers mod_actions.c mod_alias.c mod_imap.c mod_negotiation.c mod_rewrite.c mod_so.c mod_speling.c modules/proxy mod_proxy.c proxy_connect.c proxy_ftp.c proxy_http.c proxy_util.c modules/ssl mod_ssl.c ssl_engine_init.c ssl_engine_io.c ssl_engine_kernel.c ssl_engine_log.c ssl_engine_pphrase.c ssl_engine_rand.c ssl_scache.c ssl_scache_dbm.c ssl_scache_shmcb.c ssl_scache_shmht.c Log: stop using APLOG_NOERRNO in calls to ap_log_[pr]error() Revision Changes Path 1.62 +4 -4 httpd-2.0/modules/dav/main/mod_dav.h Index: mod_dav.h =================================================================== RCS file: /home/cvs/httpd-2.0/modules/dav/main/mod_dav.h,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- mod_dav.h 8 Apr 2002 12:46:41 -0000 1.61 +++ mod_dav.h 17 May 2002 11:24:16 -0000 1.62 @@ -97,13 +97,13 @@ #define DAV_DEBUG 1 #define DEBUG_CR "\n" #define DBG0(f) ap_log_error(APLOG_MARK, \ - APLOG_ERR|APLOG_NOERRNO, 0, NULL, (f)) + APLOG_ERR, 0, NULL, (f)) #define DBG1(f,a1) ap_log_error(APLOG_MARK, \ - APLOG_ERR|APLOG_NOERRNO, 0, NULL, f, a1) + APLOG_ERR, 0, NULL, f, a1) #define DBG2(f,a1,a2) ap_log_error(APLOG_MARK, \ - APLOG_ERR|APLOG_NOERRNO, 0, NULL, f, a1, a2) + APLOG_ERR, 0, NULL, f, a1, a2) #define DBG3(f,a1,a2,a3) ap_log_error(APLOG_MARK, \ - APLOG_ERR|APLOG_NOERRNO, 0, NULL, f, a1, a2, a3) + APLOG_ERR, 0, NULL, f, a1, a2, a3) #else #undef DAV_DEBUG #define DEBUG_CR "" 1.28 +1 -1 httpd-2.0/modules/mappers/mod_actions.c Index: mod_actions.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_actions.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- mod_actions.c 13 Mar 2002 20:47:50 -0000 1.27 +++ mod_actions.c 17 May 2002 11:24:16 -0000 1.28 @@ -207,7 +207,7 @@ action ? action : ap_default_type(r)))) { script = t; if (r->finfo.filetype == 0) { - ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "File does not exist: %s", r->filename); return HTTP_NOT_FOUND; } 1.40 +2 -2 httpd-2.0/modules/mappers/mod_alias.c Index: mod_alias.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_alias.c,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- mod_alias.c 7 May 2002 00:17:11 -0000 1.39 +++ mod_alias.c 17 May 2002 11:24:16 -0000 1.40 @@ -443,14 +443,14 @@ char *orig_target = ret; ret = ap_construct_url(r->pool, ret, r); - ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, "incomplete redirection target of '%s' for " "URI '%s' modified to '%s'", orig_target, r->uri, ret); } if (!ap_is_url(ret)) { status = HTTP_INTERNAL_SERVER_ERROR; - ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "cannot redirect '%s' to '%s'; " "target is not a valid absoluteURI or abs_path", r->uri, ret); 1.40 +3 -3 httpd-2.0/modules/mappers/mod_imap.c Index: mod_imap.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_imap.c,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- mod_imap.c 29 Apr 2002 02:36:10 -0000 1.39 +++ mod_imap.c 17 May 2002 11:24:16 -0000 1.40 @@ -420,7 +420,7 @@ /* must be a relative URL to be combined with base */ if (ap_strchr_c(base, '/') == NULL && (!strncmp(value, "../", 3) || !strcmp(value, ".."))) { - ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "invalid base directive in map file: %s", r->uri); return NULL; } @@ -480,7 +480,7 @@ value */ } else if (directory) { - ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "invalid directory name in map file: %s", r->uri); return NULL; } @@ -887,7 +887,7 @@ we failed. They lose! */ need_2_fields: - ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "map file %s, line %d syntax error: requires at " "least two fields", r->uri, imap->line_number); /* fall through */ 1.102 +8 -8 httpd-2.0/modules/mappers/mod_negotiation.c Index: mod_negotiation.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_negotiation.c,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- mod_negotiation.c 29 Mar 2002 08:17:23 -0000 1.101 +++ mod_negotiation.c 17 May 2002 11:24:16 -0000 1.102 @@ -652,7 +652,7 @@ } #ifdef NEG_DEBUG - ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, + ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, "dont_fiddle_headers=%d use_rvsa=%d ua_supports_trans=%d " "send_alternates=%d, may_choose=%d", neg->dont_fiddle_headers, neg->use_rvsa, @@ -877,7 +877,7 @@ } if (!*cp) { - ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "Syntax error in type map, no ':' in %s for header %s", r->filename, header); return NULL; @@ -888,7 +888,7 @@ } while (*cp && apr_isspace(*cp)); if (!*cp) { - ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "Syntax error in type map --- no header body: %s for %s", r->filename, header); return NULL; @@ -977,7 +977,7 @@ while (--eol >= tag && apr_isspace(*eol)) *eol = '\0'; if ((mime_info.body = get_body(buffer, &len, tag, *map)) < 0) { - ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "Syntax error in type map, no end tag '%s'" "found in %s for Body: content.", tag, r->filename); @@ -1232,7 +1232,7 @@ * request must die. */ if (anymatch && !neg->avail_vars->nelts) { - ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "Negotiation: discovered file(s) matching request: %s" " (None could be negotiated).", r->filename); @@ -2004,7 +2004,7 @@ */ #ifdef NEG_DEBUG - ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, + ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, "Variant: file=%s type=%s lang=%s sourceq=%1.3f " "mimeq=%1.3f langq=%1.3f charq=%1.3f encq=%1.3f " "q=%1.5f definite=%d", @@ -2075,7 +2075,7 @@ */ #ifdef NEG_DEBUG - ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, + ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, "Variant: file=%s type=%s lang=%s sourceq=%1.3f " "mimeq=%1.3f langq=%1.3f langidx=%d charq=%1.3f encq=%1.3f ", (variant->file_name ? variant->file_name : ""), @@ -2731,7 +2731,7 @@ } if (!*bestp) { - ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "no acceptable variant: %s", r->filename); return HTTP_NOT_ACCEPTABLE; } 1.114 +3 -3 httpd-2.0/modules/mappers/mod_rewrite.c Index: mod_rewrite.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_rewrite.c,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- mod_rewrite.c 6 May 2002 22:59:56 -0000 1.113 +++ mod_rewrite.c 17 May 2002 11:24:16 -0000 1.114 @@ -1144,7 +1144,7 @@ * we can actually use it! */ if (!proxy_available) { - ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "attempt to make remote request from mod_rewrite " "without proxy enabled: %s", r->filename); return HTTP_FORBIDDEN; @@ -1387,7 +1387,7 @@ */ if (!(ap_allow_options(r) & (OPT_SYM_LINKS | OPT_SYM_OWNER))) { /* FollowSymLinks is mandatory! */ - ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "Options FollowSymLinks or SymLinksIfOwnerMatch is off " "which implies that RewriteRule directive is forbidden: " "%s", r->filename); @@ -3155,7 +3155,7 @@ if (*conf->rewritelogfile == '|') { if ((pl = ap_open_piped_log(p, conf->rewritelogfile+1)) == NULL) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "mod_rewrite: could not open reliable pipe " "to RewriteLog filter %s", conf->rewritelogfile+1); exit(1); 1.50 +5 -5 httpd-2.0/modules/mappers/mod_so.c Index: mod_so.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_so.c,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- mod_so.c 19 Apr 2002 18:31:20 -0000 1.49 +++ mod_so.c 17 May 2002 11:24:16 -0000 1.50 @@ -228,7 +228,7 @@ for (i = 0; i < sconf->loaded_modules->nelts; i++) { modi = &modie[i]; if (modi->name != NULL && strcmp(modi->name, modname) == 0) { - ap_log_perror(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO, 0, + ap_log_perror(APLOG_MARK, APLOG_WARNING, 0, cmd->pool, "module %s is already loaded, skipping", modname); return NULL; @@ -287,7 +287,7 @@ apr_dso_error(modhandle, my_error, sizeof(my_error)), NULL); } - ap_log_perror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, cmd->pool, + ap_log_perror(APLOG_MARK, APLOG_DEBUG, 0, cmd->pool, "loaded module %s", modname); /* @@ -363,7 +363,7 @@ NULL); } - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, NULL, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, NULL, "loaded file %s", filename); return NULL; @@ -373,7 +373,7 @@ static const char *load_file(cmd_parms *cmd, void *dummy, const char *filename) { - ap_log_perror(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, cmd->pool, + ap_log_perror(APLOG_MARK, APLOG_STARTUP, 0, cmd->pool, "WARNING: LoadFile not supported on this platform"); return NULL; } @@ -381,7 +381,7 @@ static const char *load_module(cmd_parms *cmd, void *dummy, const char *modname, const char *filename) { - ap_log_perror(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, cmd->pool, + ap_log_perror(APLOG_MARK, APLOG_STARTUP, 0, cmd->pool, "WARNING: LoadModule not supported on this platform"); return NULL; } 1.35 +2 -2 httpd-2.0/modules/mappers/mod_speling.c Index: mod_speling.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_speling.c,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- mod_speling.c 13 Mar 2002 20:47:51 -0000 1.34 +++ mod_speling.c 17 May 2002 11:24:16 -0000 1.35 @@ -431,7 +431,7 @@ apr_table_setn(r->headers_out, "Location", ap_construct_url(r->pool, nuri, r)); - ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_INFO, APR_SUCCESS, + ap_log_rerror(APLOG_MARK, APLOG_INFO, APR_SUCCESS, r, ref ? "Fixed spelling: %s to %s from %s" : "Fixed spelling: %s to %s", @@ -540,7 +540,7 @@ apr_pool_destroy(sub_pool); - ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_INFO, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, ref ? "Spelling fix: %s: %d candidates from %s" : "Spelling fix: %s: %d candidates", r->uri, candidates->nelts, ref); 1.83 +9 -9 httpd-2.0/modules/proxy/mod_proxy.c Index: mod_proxy.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/proxy/mod_proxy.c,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- mod_proxy.c 24 Apr 2002 17:40:48 -0000 1.82 +++ mod_proxy.c 17 May 2002 11:24:16 -0000 1.83 @@ -326,7 +326,7 @@ APR_URI_UNP_REVEALPASSWORD); apr_table_set(r->headers_out, "Location", nuri); - ap_log_rerror(APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, "Domain missing: %s sent to %s%s%s", r->uri, apr_uri_unparse(r->pool, &r->parsed_uri, APR_URI_UNP_OMITUSERINFO), @@ -425,7 +425,7 @@ direct_connect = list[ii].matcher(&list[ii], r); } #if DEBUGGING - ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, (direct_connect) ? "NoProxy for %s" : "UseProxy for %s", r->uri); #endif @@ -442,7 +442,7 @@ strncasecmp(url, ents[i].scheme, strlen(ents[i].scheme)) == 0)) { /* handle the scheme */ - ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "Trying to run scheme_handler against proxy"); access_status = proxy_run_scheme_handler(r, conf, url, ents[i].hostname, ents[i].port); @@ -461,11 +461,11 @@ */ /* handle the scheme */ - ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "Trying to run scheme_handler"); access_status = proxy_run_scheme_handler(r, conf, url, NULL, 0); if (DECLINED == access_status) { - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_WARNING, 0, r->server, "proxy: No protocol handler was valid for the URL %s. " "If you are using a DSO version of mod_proxy, make sure " "the proxy submodules are included in the configuration " @@ -762,23 +762,23 @@ if (ap_proxy_is_ipaddr(New, parms->pool)) { #if DEBUGGING - ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, + ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, "Parsed addr %s", inet_ntoa(New->addr)); - ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, + ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, "Parsed mask %s", inet_ntoa(New->mask)); #endif } else if (ap_proxy_is_domainname(New, parms->pool)) { ap_str_tolower(New->name); #if DEBUGGING - ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, + ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, "Parsed domain %s", New->name); #endif } else if (ap_proxy_is_hostname(New, parms->pool)) { ap_str_tolower(New->name); #if DEBUGGING - ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, + ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, "Parsed host %s", New->name); #endif } 1.59 +13 -13 httpd-2.0/modules/proxy/proxy_connect.c Index: proxy_connect.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/proxy/proxy_connect.c,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- proxy_connect.c 7 May 2002 15:06:32 -0000 1.58 +++ proxy_connect.c 17 May 2002 11:24:16 -0000 1.59 @@ -112,7 +112,7 @@ if (r->method_number != M_CONNECT) { return DECLINED; } - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: CONNECT: canonicalising URL %s", url); return OK; @@ -141,11 +141,11 @@ /* is this for us? */ if (r->method_number != M_CONNECT) { - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: CONNECT: declining URL %s", url); return DECLINED; } - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: CONNECT: serving URL %s", url); @@ -161,7 +161,7 @@ apr_pstrcat(p, "URI cannot be parsed: ", url, NULL)); } - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: CONNECT: connecting %s to %s:%d", url, uri.hostname, uri.port); /* do a DNS lookup for the destination host */ @@ -178,7 +178,7 @@ connectport = uri.port; connect_addr = uri_addr; } - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: CONNECT: connecting to remote proxy %s on port %d", connectname, connectport); /* check if ProxyBlock directive on this host */ @@ -262,7 +262,7 @@ if (proxyport) { /* FIXME: Error checking ignored. */ - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: CONNECT: sending the CONNECT request to the remote proxy"); nbytes = apr_snprintf(buffer, sizeof(buffer), "CONNECT %s HTTP/1.0" CRLF, r->uri); @@ -272,7 +272,7 @@ apr_send(sock, buffer, &nbytes); } else { - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: CONNECT: Returning 200 OK Status"); nbytes = apr_snprintf(buffer, sizeof(buffer), "HTTP/1.0 200 Connection Established" CRLF); @@ -293,7 +293,7 @@ #endif } - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: CONNECT: setting up poll()"); /* @@ -319,20 +319,20 @@ apr_poll_socket_add(pollfd, sock, APR_POLLIN); while (1) { /* Infinite loop until error (one side closes the connection) */ -/* ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server, "proxy: CONNECT: going to sleep (poll)");*/ +/* ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: CONNECT: going to sleep (poll)");*/ if ((rv = apr_poll(pollfd, &pollcnt, -1)) != APR_SUCCESS) { apr_socket_close(sock); ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, "proxy: CONNECT: error apr_poll()"); return HTTP_INTERNAL_SERVER_ERROR; } -/* ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server, +/* ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: CONNECT: woke from select(), i=%d", pollcnt);*/ if (pollcnt) { apr_poll_revents_get(&pollevent, sock, pollfd); if (pollevent & APR_POLLIN) { -/* ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server, +/* ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: CONNECT: sock was set");*/ nbytes = sizeof(buffer); if (apr_recv(sock, buffer, &nbytes) == APR_SUCCESS) { @@ -362,7 +362,7 @@ apr_poll_revents_get(&pollevent, client_socket, pollfd); if (pollevent & APR_POLLIN) { -/* ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server, +/* ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: CONNECT: client was set");*/ nbytes = sizeof(buffer); if (apr_recv(client_socket, buffer, &nbytes) == APR_SUCCESS) { @@ -387,7 +387,7 @@ break; } - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: CONNECT: finished with poll() - cleaning up"); /* 1.120 +28 -28 httpd-2.0/modules/proxy/proxy_ftp.c Index: proxy_ftp.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/proxy/proxy_ftp.c,v retrieving revision 1.119 retrieving revision 1.120 diff -u -r1.119 -r1.120 --- proxy_ftp.c 26 Apr 2002 14:43:18 -0000 1.119 +++ proxy_ftp.c 17 May 2002 11:24:16 -0000 1.120 @@ -190,7 +190,7 @@ } def_port = apr_uri_default_port_for_scheme("ftp"); - ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: FTP: canonicalising URL %s", url); port = def_port; @@ -277,7 +277,7 @@ return -1; } /* - ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, NULL, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, NULL, "proxy: server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy:>FTP: %s", message); } @@ -659,7 +659,7 @@ if ((crlf = strchr(message, '\r')) != NULL || (crlf = strchr(message, '\n')) != NULL) *crlf = '\0'; - ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy:pool, &r->parsed_uri, APR_URI_UNP_OMITPATHINFO)); @@ -811,16 +811,16 @@ /* is this for us? */ if (proxyhost) { - ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: FTP: declining URL %s - proxyhost %s specified:", url, proxyhost); return DECLINED; /* proxy connections are via HTTP */ } if (strncasecmp(url, "ftp:", 4)) { - ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: FTP: declining URL %s - not ftp:", url); return DECLINED; /* only interested in FTP */ } - ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: FTP: serving URL %s", url); /* create space for state information */ @@ -913,7 +913,7 @@ password = "apache-proxy@"; } - ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: FTP: connecting %s to %s:%d", url, connectname, connectport); /* do a DNS lookup for the destination host */ @@ -978,7 +978,7 @@ (int)(r->server->timeout * APR_USEC_PER_SEC)); } - ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: FTP: socket has been created"); @@ -1003,7 +1003,7 @@ * (either do it in this loop, or make at least two attempts * with the AF_INET and AF_INET6 elements in the list) */ - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: FTP: trying to connect to %pI (%s)...", connect_addr, connectname); /* make the connection out of the socket */ @@ -1038,7 +1038,7 @@ * the peer reset the connection already; ap_run_create_connection() closed * the socket */ - ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: FTP: an error occurred creating a new connection to %pI (%s)", connect_addr, connectname); return HTTP_INTERNAL_SERVER_ERROR; } @@ -1051,7 +1051,7 @@ origin_sock = NULL; } - ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: FTP: control connection complete"); @@ -1281,7 +1281,7 @@ apr_sockaddr_t *epsv_addr; data_port = atoi(pstr + 3); - ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: FTP: EPSV contacting remote host on port %d", data_port); @@ -1367,7 +1367,7 @@ apr_sockaddr_t *pasv_addr; apr_port_t pasvport = (p1 << 8) + p0; - ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: FTP: PASV contacting host %d.%d.%d.%d:%d", h3, h2, h1, h0, pasvport); @@ -1537,7 +1537,7 @@ size = ftpmessage; /* already pstrdup'ed: no copy necessary */ } else if (rc == 550) { /* Not a regular file */ - ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: FTP: SIZE shows this is a directory"); dirlisting = 1; rc = proxy_ftp_command(apr_pstrcat(p, "CWD ", @@ -1670,7 +1670,7 @@ "Error reading from remote server"); } if (rc == 550) { - ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: FTP: RETR failed, trying LIST instead"); /* Directory Listings should always be fetched in ASCII mode */ @@ -1732,7 +1732,7 @@ } else { if (r->content_type) { - ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: FTP: Content-Type set to %s", r->content_type); } else { @@ -1741,12 +1741,12 @@ if (xfer_type != 'A' && size != NULL) { /* We "trust" the ftp server to really serve (size) bytes... */ apr_table_setn(r->headers_out, "Content-Length", size); - ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: FTP: Content-Length set to %s", size); } } apr_table_setn(r->headers_out, "Content-Type", r->content_type); - ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: FTP: Content-Type set to %s", r->content_type); #if defined(USE_MDTM) && (defined(HAVE_TIMEGM) || defined(HAVE_GMTOFF)) @@ -1754,7 +1754,7 @@ char datestr[APR_RFC822_DATE_LEN]; apr_rfc822_date(datestr, mtime); apr_table_set(r->headers_out, "Last-Modified", datestr); - ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: FTP: Last-Modified set to %s", datestr); } #endif /* USE_MDTM */ @@ -1768,7 +1768,7 @@ /* set content-encoding (not for dir listings, they are uncompressed)*/ if (r->content_encoding != NULL && r->content_encoding[0] != '\0') { - ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: FTP: Content-Encoding set to %s", r->content_encoding); apr_table_setn(r->headers_out, "Content-Encoding", r->content_encoding); } @@ -1799,7 +1799,7 @@ * the peer reset the connection already; ap_run_create_connection() closed * the socket */ - ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: FTP: an error occurred creating the transfer connection"); return HTTP_INTERNAL_SERVER_ERROR; } @@ -1826,7 +1826,7 @@ apr_bucket *e; int finish = FALSE; - ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: FTP: start body send"); /* read the body, pass it to the output filters */ @@ -1839,7 +1839,7 @@ { apr_off_t readbytes; apr_brigade_length(bb, 0, &readbytes); - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy (PID %d): readbytes: %#x", getpid(), readbytes); } @@ -1860,7 +1860,7 @@ ap_flush_conn(data); apr_socket_close(data_sock); data_sock = NULL; - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: FTP: data connection closed"); /* signal that we must leave */ finish = TRUE; @@ -1886,14 +1886,14 @@ break; } } - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: FTP: end body send"); } if (data_sock) { ap_flush_conn(data); apr_socket_close(data_sock); - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: FTP: data connection closed"); } 1.149 +20 -20 httpd-2.0/modules/proxy/proxy_http.c Index: proxy_http.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/proxy/proxy_http.c,v retrieving revision 1.148 retrieving revision 1.149 diff -u -r1.148 -r1.149 --- proxy_http.c 26 Apr 2002 12:29:38 -0000 1.148 +++ proxy_http.c 17 May 2002 11:24:16 -0000 1.149 @@ -106,7 +106,7 @@ } def_port = apr_uri_default_port_for_scheme(scheme); - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: HTTP: canonicalising URL %s", url); /* do syntatic check. @@ -218,7 +218,7 @@ uri->port = apr_uri_default_port_for_scheme(uri->scheme); } - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: HTTP connecting %s to %s:%d", *url, uri->hostname, uri->port); @@ -300,10 +300,10 @@ (backend->port == p_conn->port) && (backend->hostname) && (!apr_strnatcasecmp(backend->hostname, p_conn->name))) { - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: keepalive address match (keep original socket)"); } else { - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: keepalive address mismatch / connection has" " changed (close old socket (%s/%s, %d/%d))", p_conn->name, backend->hostname, p_conn->port, @@ -334,7 +334,7 @@ /* put back old timeout */ apr_setsocketopt(p_conn->sock, APR_SO_TIMEOUT, current_timeout); if ( APR_STATUS_IS_EOF(socket_status) ) { - ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, NULL, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL, "proxy: HTTP: previous connection is closed"); new = 1; } @@ -367,7 +367,7 @@ } } - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: socket is connected"); /* the socket is now open, create a new backend server connection */ @@ -378,7 +378,7 @@ /* the peer reset the connection already; ap_run_create_connection() * closed the socket */ - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: an error occurred creating a " "new connection to %pI (%s)", p_conn->addr, p_conn->name); @@ -391,7 +391,7 @@ if (backend->is_ssl) { if (!ap_proxy_ssl_enable(backend->connection)) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, "proxy: failed to enable ssl support " "for %pI (%s)", p_conn->addr, p_conn->name); return HTTP_INTERNAL_SERVER_ERROR; @@ -401,7 +401,7 @@ ap_proxy_ssl_disable(backend->connection); } - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: connection complete to %pI (%s)", p_conn->addr, p_conn->name); @@ -469,7 +469,7 @@ const char* hostname = apr_table_get(r->headers_in,"Host"); if (!hostname) { hostname = r->server->server_hostname; - ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, "proxy: no HTTP 0.9 request (with no host line) " "on incoming request and preserve host set " "forcing hostname to be %s for uri %s", @@ -675,7 +675,7 @@ if (len <= 0) { apr_socket_close(p_conn->sock); backend->connection = NULL; - ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "proxy: error reading status line from remote " "server %s", p_conn->name); return ap_proxyerror(r, HTTP_BAD_GATEWAY, @@ -717,7 +717,7 @@ r->headers_out = ap_proxy_read_headers(r, rp, buffer, sizeof(buffer), origin); if (r->headers_out == NULL) { - ap_log_error(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO, 0, + ap_log_error(APLOG_MARK, APLOG_WARNING, 0, r->server, "proxy: bad HTTP/%d.%d header " "returned by %s (%s)", major, minor, r->uri, r->method); @@ -780,7 +780,7 @@ if ( r->status != HTTP_CONTINUE ) { received_continue = 0; } else { - ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, 0, NULL, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, NULL, "proxy: HTTP: received 100 CONTINUE"); } @@ -848,7 +848,7 @@ apr_table_unset(r->headers_out,"Transfer-Encoding"); apr_table_unset(r->headers_out,"Content-Length"); - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: start body send"); /* @@ -868,7 +868,7 @@ { apr_off_t readbytes; apr_brigade_length(bb, 0, &readbytes); - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy (PID %d): readbytes: %#x", getpid(), readbytes); } @@ -907,10 +907,10 @@ } } } - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: end body send"); } else { - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: header only"); } } @@ -994,7 +994,7 @@ /* is it for us? */ if (strncasecmp(url, "https:", 6) == 0) { if (!ap_proxy_ssl_enable(NULL)) { - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: HTTPS: declining URL %s" " (mod_ssl not configured?)", url); return DECLINED; @@ -1002,11 +1002,11 @@ is_ssl = 1; } else if (strncasecmp(url, "http:", 5)) { - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: HTTP: declining URL %s", url); return DECLINED; /* only interested in HTTP */ } - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: HTTP: serving URL %s", url); 1.91 +25 -25 httpd-2.0/modules/proxy/proxy_util.c Index: proxy_util.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/proxy/proxy_util.c,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- proxy_util.c 25 Apr 2002 22:12:51 -0000 1.90 +++ proxy_util.c 17 May 2002 11:24:16 -0000 1.91 @@ -455,7 +455,7 @@ return NULL; } - ap_log_error(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_WARNING, 0, r->server, "proxy: Ignoring duplicate HTTP header " "returned by %s (%s)", r->uri, r->method); continue; @@ -624,7 +624,7 @@ apr_table_setn(r->notes, "verbose-error-to", apr_pstrdup(r->pool, "*")); r->status_line = apr_psprintf(r->pool, "%3.3u Proxy Error", statuscode); - ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "proxy: %s returned by %s", message, r->uri); return statuscode; } @@ -648,7 +648,7 @@ err = ap_proxy_canon_netloc(r->pool, &url, &user, &password, &host, &port); if (err != NULL) - ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "%s", err); r->hostname = host; @@ -736,7 +736,7 @@ bits = 8 * quads; if (bits != 32) /* no warning for fully qualified IP address */ - ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, + ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, "Warning: NetMask not supplied with IP-Addr; guessing: %s/%ld\n", inet_ntoa(This->addr), bits); } @@ -744,11 +744,11 @@ This->mask.s_addr = htonl(APR_INADDR_NONE << (32 - bits)); if (*addr == '\0' && (This->addr.s_addr & ~This->mask.s_addr) != 0) { - ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, + ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, "Warning: NetMask and IP-Addr disagree in %s/%ld\n", inet_ntoa(This->addr), bits); This->addr.s_addr &= This->mask.s_addr; - ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, + ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, " Set to %s/%ld\n", inet_ntoa(This->addr), bits); } @@ -780,22 +780,22 @@ if (This->addr.s_addr == (addr.s_addr & This->mask.s_addr)) { #if DEBUGGING - ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, + ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, "1)IP-Match: %s[%s] <-> ", host, inet_ntoa(addr)); - ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, + ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, "%s/", inet_ntoa(This->addr)); - ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, + ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, "%s", inet_ntoa(This->mask)); #endif return 1; } #if DEBUGGING else { - ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, + ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, "1)IP-NoMatch: %s[%s] <-> ", host, inet_ntoa(addr)); - ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, + ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, "%s/", inet_ntoa(This->addr)); - ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, + ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, "%s", inet_ntoa(This->mask)); } #endif @@ -806,7 +806,7 @@ if (apr_sockaddr_info_get(&reqaddr, host, APR_UNSPEC, 0, 0, r->pool) != APR_SUCCESS) { #if DEBUGGING - ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, + ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, "2)IP-NoMatch: hostname=%s msg=Host not found", host); #endif @@ -819,24 +819,24 @@ ip = (struct in_addr *) reqaddr->ipaddr_ptr; if (This->addr.s_addr == (ip->s_addr & This->mask.s_addr)) { #if DEBUGGING - ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, + ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, "3)IP-Match: %s[%s] <-> ", host, inet_ntoa(*ip)); - ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, + ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, "%s/", inet_ntoa(This->addr)); - ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, + ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, "%s", inet_ntoa(This->mask)); #endif return 1; } #if DEBUGGING else { - ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, + ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, "3)IP-NoMatch: %s[%s] <-> ", host, inet_ntoa(*ip)); - ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, + ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, "%s/", inet_ntoa(This->addr)); - ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, + ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, "%s", inet_ntoa(This->mask)); } #endif @@ -863,7 +863,7 @@ #if 0 if (addr[i] == ':') { - ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, + ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, "@@@@ handle optional port in proxy_is_domainname()"); /* @@@@ handle optional port */ } @@ -985,11 +985,11 @@ for (j = 0; j < conf->noproxies->nelts; j++) { struct noproxy_entry *npent = (struct noproxy_entry *) conf->noproxies->elts; struct apr_sockaddr_t *conf_addr = npent[j].addr; - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: checking remote machine [%s] against [%s]", uri_addr->hostname, npent[j].name); if ((npent[j].name && ap_strstr_c(uri_addr->hostname, npent[j].name)) || npent[j].name[0] == '*') { - ap_log_error(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_WARNING, 0, r->server, "proxy: connect to remote machine %s blocked: name %s matched", uri_addr->hostname, npent[j].name); return HTTP_FORBIDDEN; } @@ -999,10 +999,10 @@ char *uri_ip; apr_sockaddr_ip_get(&conf_ip, conf_addr); apr_sockaddr_ip_get(&uri_ip, uri_addr); - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: ProxyBlock comparing %s and %s", conf_ip, uri_ip); if (!apr_strnatcasecmp(conf_ip, uri_ip)) { - ap_log_error(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_WARNING, 0, r->server, "proxy: connect to remote machine %s blocked: IP %s matched", uri_addr->hostname, conf_ip); return HTTP_FORBIDDEN; } @@ -1166,7 +1166,7 @@ (int)(s->timeout * APR_USEC_PER_SEC)); } - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "proxy: %s: fam %d socket created to connect to %s", proxy_function, backend_addr->family, backend_name); 1.68 +12 -12 httpd-2.0/modules/ssl/mod_ssl.c Index: mod_ssl.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/ssl/mod_ssl.c,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- mod_ssl.c 16 May 2002 06:09:13 -0000 1.67 +++ mod_ssl.c 17 May 2002 11:24:17 -0000 1.68 @@ -244,7 +244,7 @@ SSLConnRec *sslconn = ssl_init_connection_ctx(c); if (!sc->proxy_enabled) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, c->base_server, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, c->base_server, "SSL Proxy requested for %s but not enabled " "[Hint: SSLProxyEngine]", sc->vhost_id); @@ -307,7 +307,7 @@ * later access inside callback functions */ - ap_log_error(APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, 0, c->base_server, + ap_log_error(APLOG_MARK, APLOG_INFO, 0, c->base_server, "Connection to child %ld established " "(server %s, client %s)", c->id, sc->vhost_id, c->remote_ip ? c->remote_ip : "unknown"); @@ -325,7 +325,7 @@ * so we can detach later. */ if (!(ssl = SSL_new(mctx->ssl_ctx))) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, c->base_server, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, c->base_server, "Unable to create a new SSL connection from the SSL " "context"); ssl_log_ssl_error(APLOG_MARK, APLOG_ERR, c->base_server); @@ -340,7 +340,7 @@ if (!SSL_set_session_id_context(ssl, (unsigned char *)vhost_md5, MD5_DIGESTSIZE*2)) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, c->base_server, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, c->base_server, "Unable to set session id context to `%s'", vhost_md5); ssl_log_ssl_error(APLOG_MARK, APLOG_ERR, c->base_server); @@ -408,7 +408,7 @@ if (!SSL_is_init_finished(filter->pssl)) { if (sslconn->is_proxy) { if ((n = SSL_connect(filter->pssl)) <= 0) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, c->base_server, "SSL Proxy connect failed"); ssl_log_ssl_error(APLOG_MARK, APLOG_ERR, c->base_server); @@ -427,7 +427,7 @@ * was transferred. That's not a real error and can occur * sporadically with some clients. */ - ap_log_error(APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, 0, + ap_log_error(APLOG_MARK, APLOG_INFO, 0, c->base_server, "SSL handshake stopped: connection was closed"); } @@ -452,14 +452,14 @@ (errno != EINTR)) { if (errno > 0) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, c->base_server, "SSL handshake interrupted by system " "[Hint: Stop button pressed in browser?!]"); ssl_log_ssl_error(APLOG_MARK, APLOG_ERR, c->base_server); } else { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, c->base_server, "Spurious SSL handshake interrupt [Hint: " "Usually just one of those OpenSSL " @@ -471,7 +471,7 @@ /* * Ok, anything else is a fatal error */ - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, c->base_server, "SSL handshake failed (server %s, client %s)", ssl_util_vhostid(c->pool, c->base_server), @@ -501,7 +501,7 @@ * optional_no_ca doesn't appear to work as advertised * in 1.x */ - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, c->base_server, "SSL client authentication failed, " "accepting certificate based on " @@ -514,7 +514,7 @@ sslconn->verify_error : X509_verify_cert_error_string(verify_result); - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, c->base_server, "SSL client authentication failed: %s", error ? error : "unknown"); @@ -539,7 +539,7 @@ if ((sc->server->auth.verify_mode == SSL_CVERIFY_REQUIRE) && !sslconn->client_cert) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, c->base_server, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, c->base_server, "No acceptable peer certificate available"); return ssl_abort(filter, c); 1.98 +45 -45 httpd-2.0/modules/ssl/ssl_engine_init.c Index: ssl_engine_init.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_init.c,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- ssl_engine_init.c 16 May 2002 06:09:13 -0000 1.97 +++ ssl_engine_init.c 17 May 2002 11:24:17 -0000 1.98 @@ -98,7 +98,7 @@ version_components[i]); } - ap_log_error(APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_INFO, 0, s, "Server: %s, Interface: %s, Library: %s", AP_SERVER_BASEVERSION, vals[1], /* SSL_VERSION_INTERFACE */ @@ -111,7 +111,7 @@ */ static void ssl_init_SSLLibrary(server_rec *s) { - ap_log_error(APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_INFO, 0, s, "Init: Initializing %s library", SSL_LIBRARY_NAME); CRYPTO_malloc_init(); @@ -149,7 +149,7 @@ if (!(mc->pTmpKeys[idx] = RSA_generate_key(bits, RSA_F4, NULL, NULL))) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "Init: Failed to generate temporary " "%d bit RSA private key", bits); ssl_die(); @@ -165,7 +165,7 @@ if (!(mc->pTmpKeys[idx] = ssl_dh_GetTmpParam(bits))) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "Init: Failed to generate temporary " "%d bit DH parameters", bits); ssl_die(); @@ -180,13 +180,13 @@ static void ssl_tmp_keys_init(server_rec *s) { - ap_log_error(APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_INFO, 0, s, "Init: Generating temporary RSA private keys (512/1024 bits)"); MODSSL_TMP_KEY_INIT_RSA(s, 512); MODSSL_TMP_KEY_INIT_RSA(s, 1024); - ap_log_error(APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_INFO, 0, s, "Init: Generating temporary DH parameters (512/1024 bits)"); MODSSL_TMP_KEY_INIT_DH(s, 512); @@ -302,7 +302,7 @@ /* * initialize servers */ - ap_log_error(APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, 0, base_server, + ap_log_error(APLOG_MARK, APLOG_INFO, 0, base_server, "Init: Initializing (virtual) servers for SSL"); for (s = base_server; s; s = s->next) { @@ -347,7 +347,7 @@ if (mc->szCryptoDevice) { if (!(e = ENGINE_by_id(mc->szCryptoDevice))) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "Init: Failed to load Crypto Device API `%s'", mc->szCryptoDevice); ssl_die(); @@ -358,7 +358,7 @@ } if (!ENGINE_set_default(e, ENGINE_METHOD_ALL)) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "Init: Failed to enable Crypto Device API `%s'", mc->szCryptoDevice); ssl_die(); @@ -379,7 +379,7 @@ * possibility that the user forgot to set them. */ if (!mctx->pks->cert_files[0]) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "No SSL Certificate set [hint: SSLCertificateFile]"); ssl_die(); } @@ -390,7 +390,7 @@ if (mctx->pks->certs[SSL_AIDX_RSA] || mctx->pks->certs[SSL_AIDX_DSA]) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "Illegal attempt to re-initialise SSL for server " "(theoretically shouldn't happen!)"); ssl_die(); @@ -411,7 +411,7 @@ * Create the new per-server SSL context */ if (protocol == SSL_PROTOCOL_NONE) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "No SSL protocols available [hint: SSLProtocol]"); ssl_die(); } @@ -423,7 +423,7 @@ NULL); cp[strlen(cp)-2] = NUL; - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "Creating new SSL context (protocols: %s)", cp); if (protocol == SSL_PROTOCOL_SSLV2) { @@ -540,14 +540,14 @@ * Configure Client Authentication details */ if (mctx->auth.ca_cert_file || mctx->auth.ca_cert_path) { - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "Configuring client authentication"); if (!SSL_CTX_load_verify_locations(ctx, mctx->auth.ca_cert_file, mctx->auth.ca_cert_path)) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "Unable to configure verify locations " "for client authentication"); ssl_log_ssl_error(APLOG_MARK, APLOG_ERR, s); @@ -558,7 +558,7 @@ mctx->auth.ca_cert_file, mctx->auth.ca_cert_path); if (!ca_list) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "Unable to determine list of available " "CA certificates for client authentication"); ssl_die(); @@ -575,7 +575,7 @@ ca_list = (STACK_OF(X509_NAME) *)SSL_CTX_get_client_CA_list(ctx); if (sk_X509_NAME_num(ca_list) == 0) { - ap_log_error(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, "Init: Oops, you want to request client " "authentication, but no CAs are known for " "verification!? [Hint: SSLCACertificate*]"); @@ -598,12 +598,12 @@ return; } - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "Configuring permitted SSL ciphers [%s]", suite); if (!SSL_CTX_set_cipher_list(ctx, suite)) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "Unable to configure permitted SSL ciphers"); ssl_log_ssl_error(APLOG_MARK, APLOG_ERR, s); ssl_die(); @@ -623,7 +623,7 @@ return; } - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "Configuring certificate revocation facility"); mctx->crl = @@ -631,7 +631,7 @@ (char *)mctx->crl_path); if (!mctx->crl) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "Unable to configure X.509 CRL storage " "for certificate revocation"); ssl_log_ssl_error(APLOG_MARK, APLOG_ERR, s); @@ -677,12 +677,12 @@ (char *)chain, skip_first, NULL); if (n < 0) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "Failed to configure CA certificate chain!"); ssl_die(); } - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "Configuring server certificate chain " "(%d CA certificate%s)", n, n == 1 ? "" : "s"); @@ -726,19 +726,19 @@ return FALSE; } - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "Configuring %s server certificate", type); ptr = asn1->cpData; if (!(cert = d2i_X509(NULL, &ptr, asn1->nData))) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "Unable to import %s server certificate", type); ssl_log_ssl_error(APLOG_MARK, APLOG_ERR, s); ssl_die(); } if (SSL_CTX_use_certificate(mctx->ssl_ctx, cert) <= 0) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "Unable to configure %s server certificate", type); ssl_log_ssl_error(APLOG_MARK, APLOG_ERR, s); ssl_die(); @@ -765,20 +765,20 @@ return FALSE; } - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "Configuring %s server private key", type); ptr = asn1->cpData; if (!(pkey = d2i_PrivateKey(pkey_type, NULL, &ptr, asn1->nData))) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "Unable to import %s server private key", type); ssl_log_ssl_error(APLOG_MARK, APLOG_ERR, s); ssl_die(); } if (SSL_CTX_use_PrivateKey(mctx->ssl_ctx, pkey) <= 0) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "Unable to configure %s server private key", type); ssl_log_ssl_error(APLOG_MARK, APLOG_ERR, s); ssl_die(); @@ -793,7 +793,7 @@ if (pubkey && EVP_PKEY_missing_parameters(pubkey)) { EVP_PKEY_copy_parameters(pubkey, pkey); - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "Copying DSA parameters from private key to certificate"); ssl_log_ssl_error(APLOG_MARK, APLOG_ERR, s); } @@ -821,7 +821,7 @@ */ if (SSL_X509_isSGC(cert)) { - ap_log_error(APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_INFO, 0, s, "%s server certificate enables " "Server Gated Cryptography (SGC)", ssl_asn1_keystr(type)); @@ -829,14 +829,14 @@ if (SSL_X509_getBC(cert, &is_ca, &pathlen)) { if (is_ca) { - ap_log_error(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, "%s server certificate is a CA certificate " "(BasicConstraints: CA == TRUE !?)", ssl_asn1_keystr(type)); } if (pathlen > 0) { - ap_log_error(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, "%s server certificate is not a leaf certificate " "(BasicConstraints: pathlen == %d > 0 !?)", ssl_asn1_keystr(type), pathlen); @@ -850,13 +850,13 @@ (apr_fnmatch(cn, s->server_hostname, fnm_flags) == FNM_NOMATCH)) { - ap_log_error(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, "%s server certificate wildcard CommonName (CN) `%s' " "does NOT match server name!?", ssl_asn1_keystr(type), cn); } else if (strNE(s->server_hostname, cn)) { - ap_log_error(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, "%s server certificate CommonName (CN) `%s' " "does NOT match server name!?", ssl_asn1_keystr(type), cn); @@ -881,7 +881,7 @@ have_dsa = ssl_server_import_cert(s, mctx, dsa_id, SSL_AIDX_DSA); if (!(have_rsa || have_dsa)) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "Oops, no RSA or DSA server certificate found?!"); ssl_die(); } @@ -894,7 +894,7 @@ have_dsa = ssl_server_import_key(s, mctx, dsa_id, SSL_AIDX_DSA); if (!(have_rsa || have_dsa)) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "Oops, no RSA or DSA server private key found?!"); ssl_die(); } @@ -927,14 +927,14 @@ } if ((ncerts = sk_X509_INFO_num(sk)) > 0) { - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "loaded %d client certs for SSL proxy", ncerts); pkp->certs = sk; } else { - ap_log_error(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, "no client certs found for SSL proxy"); sk_X509_INFO_free(sk); } @@ -971,7 +971,7 @@ SSLSrvConfigRec *sc) { if (sc->enabled) { - ap_log_error(APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_INFO, 0, s, "Configuring server for SSL protocol"); ssl_init_server_ctx(s, p, ptemp, sc); } @@ -999,7 +999,7 @@ sc = mySrvConfig(s); if (sc->enabled && (s->port == DEFAULT_HTTP_PORT)) { - ap_log_error(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO, 0, + ap_log_error(APLOG_MARK, APLOG_WARNING, 0, base_server, "Init: (%s) You configured HTTPS(%d) " "on the standard HTTP(%d) port!", @@ -1008,7 +1008,7 @@ } if (!sc->enabled && (s->port == DEFAULT_HTTPS_PORT)) { - ap_log_error(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO, 0, + ap_log_error(APLOG_MARK, APLOG_WARNING, 0, base_server, "Init: (%s) You configured HTTP(%d) " "on the standard HTTPS(%d) port!", @@ -1037,7 +1037,7 @@ klen = strlen(key); if ((ps = (server_rec *)apr_hash_get(table, key, klen))) { - ap_log_error(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO, 0, + ap_log_error(APLOG_MARK, APLOG_WARNING, 0, base_server, "Init: SSL server IP/port conflict: " "%s (%s:%d) vs. %s (%s:%d)", @@ -1055,7 +1055,7 @@ } if (conflict) { - ap_log_error(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO, 0, base_server, + ap_log_error(APLOG_MARK, APLOG_WARNING, 0, base_server, "Init: You should not use name-based " "virtual hosts in conjunction with SSL!!"); } @@ -1082,7 +1082,7 @@ char name_buf[256]; X509_NAME *name = sk_X509_NAME_value(sk, n); - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "CA certificate: %s", X509_NAME_oneline(name, name_buf, sizeof(name_buf))); 1.77 +10 -10 httpd-2.0/modules/ssl/ssl_engine_io.c Index: ssl_engine_io.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_io.c,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- ssl_engine_io.c 16 May 2002 06:09:13 -0000 1.76 +++ ssl_engine_io.c 17 May 2002 11:24:17 -0000 1.77 @@ -502,7 +502,7 @@ * Log SSL errors */ conn_rec *c = (conn_rec *)SSL_get_app_data(ssl); - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, c->base_server, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, c->base_server, "SSL error on reading data"); ssl_log_ssl_error(APLOG_MARK, APLOG_ERR, c->base_server); } @@ -535,7 +535,7 @@ * Log SSL errors */ conn_rec *c = (conn_rec *)SSL_get_app_data(ssl); - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, c->base_server, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, c->base_server, "SSL error on writing data"); ssl_log_ssl_error(APLOG_MARK, APLOG_ERR, c->base_server); } @@ -567,7 +567,7 @@ reason = "likely due to failed renegotiation"; } - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, c->base_server, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, c->base_server, "failed to write %d of %d bytes (%s)", n > 0 ? len - n : len, len, reason); @@ -765,7 +765,7 @@ switch (status) { case HTTP_BAD_REQUEST: /* log the situation */ - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, f->c->base_server, "SSL handshake failed: HTTP spoken on HTTPS port; " "trying to send HTML error page"); @@ -959,7 +959,7 @@ rows = (len / DUMP_WIDTH); if ((rows * DUMP_WIDTH) < len) rows++; - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, srvr, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, srvr, "+-------------------------------------------------------------------------+"); for(i = 0 ; i< rows; i++) { apr_snprintf(tmp, sizeof(tmp), "| %04x: ", i * DUMP_WIDTH); @@ -984,13 +984,13 @@ } } apr_cpystrn(buf+strlen(buf), " |", sizeof(buf)-strlen(buf)); - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, srvr, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, srvr, "%s", buf); } if (trunc > 0) - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, srvr, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, srvr, "| %04ld - ", len + trunc); - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, srvr, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, srvr, "+-------------------------------------------------------------------------+"); return; } @@ -1012,7 +1012,7 @@ if ( cmd == (BIO_CB_WRITE|BIO_CB_RETURN) || cmd == (BIO_CB_READ |BIO_CB_RETURN) ) { if (rc >= 0) { - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "%s: %s %ld/%d bytes %s BIO#%p [mem: %p] %s", SSL_LIBRARY_NAME, (cmd == (BIO_CB_WRITE|BIO_CB_RETURN) ? "write" : "read"), @@ -1023,7 +1023,7 @@ ssl_io_data_dump(s, argp, rc); } else { - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "%s: I/O error, %d bytes expected to %s on BIO#%p [mem: %p]", SSL_LIBRARY_NAME, argi, (cmd == (BIO_CB_WRITE|BIO_CB_RETURN) ? "write" : "read"), 1.71 +52 -52 httpd-2.0/modules/ssl/ssl_engine_kernel.c Index: ssl_engine_kernel.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_kernel.c,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- ssl_engine_kernel.c 16 May 2002 06:09:13 -0000 1.70 +++ ssl_engine_kernel.c 17 May 2002 11:24:17 -0000 1.71 @@ -146,7 +146,7 @@ /* and finally log the fact that we've closed the connection */ if (conn->base_server->loglevel >= APLOG_INFO) { - ap_log_error(APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, 0, conn->base_server, + ap_log_error(APLOG_MARK, APLOG_INFO, 0, conn->base_server, "Connection to child %ld closed with %s shutdown" "(server %s, client %s)", conn->id, type, @@ -244,7 +244,7 @@ * Log information about incoming HTTPS requests */ if (r->server->loglevel >= APLOG_INFO && ap_is_initial_req(r)) { - ap_log_error(APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_INFO, 0, r->server, "%s HTTPS request received for child %ld (server %s)", (r->connection->keepalives <= 0 ? "Initial (No.1)" : @@ -337,7 +337,7 @@ * Support for SSLRequireSSL directive */ if (dc->bSSLRequired && !ssl) { - ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "access to %s failed, reason: %s", r->filename, "SSL connection required"); @@ -411,7 +411,7 @@ /* configure new state */ if (!modssl_set_cipher_list(ssl, dc->szCipherSuite)) { - ap_log_error(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO, 0, + ap_log_error(APLOG_MARK, APLOG_WARNING, 0, r->server, "Unable to reconfigure (per-directory) " "permitted SSL ciphers"); @@ -479,7 +479,7 @@ /* tracing */ if (renegotiate) { - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "Reconfigured cipher suite will force renegotiation"); } } @@ -505,7 +505,7 @@ /* determine whether a renegotiation has to be forced */ if (dc->nVerifyDepth < n) { renegotiate = TRUE; - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "Reduced client verification depth will force " "renegotiation"); } @@ -565,7 +565,7 @@ renegotiate_quick = TRUE; } - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "Changed client verification type will force " "%srenegotiation", @@ -603,7 +603,7 @@ cert_store = X509_STORE_new(); if (!X509_STORE_load_locations(cert_store, ca_file, ca_path)) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, "Unable to reconfigure verify locations " "for client authentication"); ssl_log_ssl_error(APLOG_MARK, APLOG_ERR, r->server); @@ -619,7 +619,7 @@ if (!(ca_list = ssl_init_FindCAList(r->server, r->pool, ca_file, ca_path))) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, "Unable to determine list of available " "CA certificates for client authentication"); @@ -629,7 +629,7 @@ SSL_set_client_CA_list(ssl, ca_list); renegotiate = TRUE; - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "Changed client verification locations will force " "renegotiation"); } @@ -696,7 +696,7 @@ * !! BUT ALL THIS IS STILL NOT RE-IMPLEMENTED FOR APACHE 2.0 !! */ if (renegotiate && (r->method_number == M_POST)) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, "SSL Re-negotiation in conjunction " "with POST method not supported!"); @@ -718,21 +718,21 @@ * here because it resets too much of the connection. So we set the * state explicitly and continue the handshake manually. */ - ap_log_error(APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_INFO, 0, r->server, "Requesting connection re-negotiation"); if (renegotiate_quick) { STACK_OF(X509) *cert_stack; /* perform just a manual re-verification of the peer */ - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "Performing quick renegotiation: " "just re-verifying the peer"); cert_stack = (STACK_OF(X509) *)SSL_get_peer_cert_chain(ssl); if (!cert_stack || (sk_X509_num(cert_stack) == 0)) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, "Cannot find peer certificate chain"); return HTTP_FORBIDDEN; @@ -741,7 +741,7 @@ if (!(cert_store || (cert_store = SSL_CTX_get_cert_store(ctx)))) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, "Cannot find certificate storage"); return HTTP_FORBIDDEN; @@ -760,7 +760,7 @@ (char *)ssl); if (!modssl_X509_verify_cert(&cert_store_ctx)) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, "Re-negotiation verification step failed"); ssl_log_ssl_error(APLOG_MARK, APLOG_ERR, r->server); } @@ -772,7 +772,7 @@ request_rec *id = r->main ? r->main : r; /* do a full renegotiation */ - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "Performing full renegotiation: " "complete handshake protocol"); @@ -784,20 +784,20 @@ SSL_do_handshake(ssl); if (SSL_get_state(ssl) != SSL_ST_OK) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, "Re-negotiation request failed"); return HTTP_FORBIDDEN; } - ap_log_error(APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_INFO, 0, r->server, "Awaiting re-negotiation handshake"); SSL_set_state(ssl, SSL_ST_ACCEPT); SSL_do_handshake(ssl); if (SSL_get_state(ssl) != SSL_ST_OK) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, "Re-negotiation handshake failed: " "Not accepted by client!?"); @@ -820,7 +820,7 @@ BOOL do_verify = (dc->nVerifyClient == SSL_CVERIFY_REQUIRE); if (do_verify && (SSL_get_verify_result(ssl) != X509_V_OK)) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, "Re-negotiation handshake failed: " "Client verification failed"); @@ -828,7 +828,7 @@ } if (do_verify && !SSL_get_peer_certificate(ssl)) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, "Re-negotiation handshake failed: " "Client certificate missing"); @@ -853,7 +853,7 @@ "SSL requirement expression: %s", ssl_expr_get_error()); - ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "access to %s failed, reason: %s", r->filename, cp); @@ -864,15 +864,15 @@ } if (ok != 1) { - ap_log_error(APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_INFO, 0, r->server, "Access to %s denied for %s " "(requirement expression not fulfilled)", r->filename, r->connection->remote_ip); - ap_log_error(APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_INFO, 0, r->server, "Failed expression: %s", req->cpExpr); - ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "access to %s failed, reason: %s", r->filename, "SSL requirement expression not fulfilled " @@ -984,7 +984,7 @@ apr_snprintf(buf1, sizeof(buf1), "Basic %s", buf2); apr_table_set(r->headers_in, "Authorization", buf1); - ap_log_error(APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, 0, r->server, + ap_log_error(APLOG_MARK, APLOG_INFO, 0, r->server, "Faking HTTP Basic Auth header: \"Authorization: %s\"", buf1); return DECLINED; @@ -1207,7 +1207,7 @@ SSLModConfigRec *mc = myModConfig(c->base_server); int idx; - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, c->base_server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, c->base_server, "handing out temporary %d bit RSA key", keylen); /* doesn't matter if export flag is on, @@ -1239,7 +1239,7 @@ SSLModConfigRec *mc = myModConfig(c->base_server); int idx; - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, c->base_server, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, c->base_server, "handing out temporary %d bit DH key", keylen); switch (keylen) { @@ -1285,7 +1285,7 @@ char *sname = X509_NAME_oneline(X509_get_subject_name(cert), NULL, 0); char *iname = X509_NAME_oneline(X509_get_issuer_name(cert), NULL, 0); - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "Certificate Verification: " "depth: %d, subject: %s, issuer: %s", errdepth, @@ -1323,7 +1323,7 @@ if (ssl_verify_error_is_optional(errnum) && (verify == SSL_CVERIFY_OPTIONAL_NO_CA)) { - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "Certificate Verification: Verifiable Issuer is " "configured as optional, therefore we're accepting " "the certificate"); @@ -1345,7 +1345,7 @@ * If we already know it's not ok, log the real reason */ if (!ok) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "Certificate Verification: Error (%d): %s", errnum, X509_verify_cert_error_string(errnum)); @@ -1365,7 +1365,7 @@ } if (errdepth > depth) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "Certificate Verification: Certificate Chain too long " "(chain has %d certificates, but maximum allowed are " "only %d)", @@ -1473,14 +1473,14 @@ BIO_free(bio); - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, buff); + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, buff); } /* * Verify the signature on this CRL */ if (X509_CRL_verify(crl, X509_get_pubkey(cert)) <= 0) { - ap_log_error(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, "Invalid signature on CRL"); X509_STORE_CTX_set_error(ctx, X509_V_ERR_CRL_SIGNATURE_FAILURE); @@ -1495,7 +1495,7 @@ i = X509_cmp_current_time(X509_CRL_get_nextUpdate(crl)); if (i == 0) { - ap_log_error(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, "Found CRL has invalid nextUpdate field"); X509_STORE_CTX_set_error(ctx, @@ -1506,7 +1506,7 @@ } if (i < 0) { - ap_log_error(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, "Found CRL is expired - " "revoking all certificates until you get updated CRL"); @@ -1545,7 +1545,7 @@ char *cp = X509_NAME_oneline(issuer, NULL, 0); long serial = ASN1_INTEGER_get(sn); - ap_log_error(APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_INFO, 0, s, "Certificate with serial %ld (0x%lX) " "revoked per CRL from issuer %s", serial, serial, cp); @@ -1584,7 +1584,7 @@ name = X509_get_subject_name(info->x509); dn = X509_NAME_oneline(name, name_buf, sizeof(name_buf)); - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, SSLPROXY_CERT_CB_LOG_FMT "%s, sending %s", sc->vhost_id, msg, dn ? dn : "-uknown-"); } @@ -1611,12 +1611,12 @@ STACK_OF(X509_INFO) *certs = sc->proxy->pkp->certs; int i, j; - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, SSLPROXY_CERT_CB_LOG_FMT "entered", sc->vhost_id); if (!certs || (sk_X509_INFO_num(certs) <= 0)) { - ap_log_error(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, SSLPROXY_CERT_CB_LOG_FMT "downstream server wanted client certificate " "but none are configured", sc->vhost_id); @@ -1656,7 +1656,7 @@ } } - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, SSLPROXY_CERT_CB_LOG_FMT "no client certificate found!?", sc->vhost_id); @@ -1683,7 +1683,7 @@ "timeout=%lds ", (timeout - time(NULL))); } - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "Inter-Process Session Cache: " "request=%s status=%s id=%s %s(session %s)", request, status, @@ -1837,31 +1837,31 @@ */ if (s->loglevel >= APLOG_DEBUG) { if (where & SSL_CB_HANDSHAKE_START) { - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "%s: Handshake: start", SSL_LIBRARY_NAME); } else if (where & SSL_CB_HANDSHAKE_DONE) { - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "%s: Handshake: done", SSL_LIBRARY_NAME); } else if (where & SSL_CB_LOOP) { - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "%s: Loop: %s", SSL_LIBRARY_NAME, SSL_state_string_long(ssl)); } else if (where & SSL_CB_READ) { - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "%s: Read: %s", SSL_LIBRARY_NAME, SSL_state_string_long(ssl)); } else if (where & SSL_CB_WRITE) { - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "%s: Write: %s", SSL_LIBRARY_NAME, SSL_state_string_long(ssl)); } else if (where & SSL_CB_ALERT) { char *str = (where & SSL_CB_READ) ? "read" : "write"; - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "%s: Alert: %s:%s:%s\n", SSL_LIBRARY_NAME, str, SSL_alert_type_string_long(rc), @@ -1869,12 +1869,12 @@ } else if (where & SSL_CB_EXIT) { if (rc == 0) { - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "%s: Exit: failed in %s", SSL_LIBRARY_NAME, SSL_state_string_long(ssl)); } else if (rc < 0) { - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "%s: Exit: error in %s", SSL_LIBRARY_NAME, SSL_state_string_long(ssl)); } @@ -1887,7 +1887,7 @@ * right after a finished handshake. */ if (where & SSL_CB_HANDSHAKE_DONE) { - ap_log_error(APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_INFO, 0, s, "Connection: Client IP: %s, Protocol: %s, " "Cipher: %s (%s/%s bits)", ssl_var_lookup(NULL, s, c, NULL, "REMOTE_ADDR"), 1.21 +2 -2 httpd-2.0/modules/ssl/ssl_engine_log.c Index: ssl_engine_log.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_log.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- ssl_engine_log.c 16 May 2002 06:09:13 -0000 1.20 +++ ssl_engine_log.c 17 May 2002 11:24:17 -0000 1.21 @@ -123,12 +123,12 @@ annotation = ssl_log_annotation(err); if (annotation) { - ap_log_error(file, line, level|APLOG_NOERRNO, 0, s, + ap_log_error(file, line, level, 0, s, "SSL Library Error: %ld %s %s", e, err, annotation); } else { - ap_log_error(file, line, level|APLOG_NOERRNO, 0, s, + ap_log_error(file, line, level, 0, s, "SSL Library Error: %ld %s", e, err); } 1.40 +20 -20 httpd-2.0/modules/ssl/ssl_engine_pphrase.c Index: ssl_engine_pphrase.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_pphrase.c,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- ssl_engine_pphrase.c 16 May 2002 10:45:22 -0000 1.39 +++ ssl_engine_pphrase.c 17 May 2002 11:24:17 -0000 1.40 @@ -207,7 +207,7 @@ continue; cpVHostID = ssl_util_vhostid(p, pServ); - ap_log_error(APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, 0, pServ, + ap_log_error(APLOG_MARK, APLOG_INFO, 0, pServ, "Loading certificate & private key of SSL-aware server"); /* @@ -215,7 +215,7 @@ * because this file isn't encrypted in any way. */ if (sc->server->pks->cert_files[0] == NULL) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, pServ, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, pServ, "Server should be SSL-aware but has no certificate " "configured [Hint: SSLCertificateFile]"); ssl_die(); @@ -232,7 +232,7 @@ ssl_die(); } if ((pX509Cert = SSL_read_X509(szPath, NULL, NULL)) == NULL) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "Init: Unable to read server certificate from file %s", szPath); ssl_log_ssl_error(APLOG_MARK, APLOG_ERR, s); ssl_die(); @@ -245,7 +245,7 @@ at = ssl_util_algotypeof(pX509Cert, NULL); an = ssl_util_algotypestr(at); if (algoCert & at) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "Init: Multiple %s server certificates not " "allowed", an); ssl_log_ssl_error(APLOG_MARK, APLOG_ERR, s); @@ -357,7 +357,7 @@ ssl_asn1_table_get(mc->tPrivateKey, key_id); if (asn1 && (asn1->source_mtime == pkey_mtime)) { - ap_log_error(APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, + ap_log_error(APLOG_MARK, APLOG_INFO, 0, pServ, "%s reusing existing " "%s private key on restart", @@ -417,7 +417,7 @@ } #ifdef WIN32 if (sc->server->pphrase_dialog_type == SSL_PPTYPE_BUILTIN) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "Init: PassPhraseDialog BuiltIn not " "supported in server private key from file " "%s", szPath); @@ -433,7 +433,7 @@ if (nPassPhraseDialogCur && pkey_mtime && !(isterm = isatty(fileno(stdout)))) /* XXX: apr_isatty() */ { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, pServ, "Init: Unable to read pass phrase " "[Hint: key introduced or changed " @@ -441,7 +441,7 @@ ssl_log_ssl_error(APLOG_MARK, APLOG_ERR, pServ); } else { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, pServ, "Init: Private key not found"); ssl_log_ssl_error(APLOG_MARK, APLOG_ERR, pServ); } @@ -452,7 +452,7 @@ } } else { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, pServ, "Init: Pass phrase incorrect"); ssl_log_ssl_error(APLOG_MARK, APLOG_ERR, pServ); @@ -466,7 +466,7 @@ } if (pPrivateKey == NULL) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "Init: Unable to read server private key from " "file %s [Hint: Perhaps it is in a separate file? " " See SSLCertificateKeyFile]", szPath); @@ -481,7 +481,7 @@ at = ssl_util_algotypeof(NULL, pPrivateKey); an = ssl_util_algotypestr(at); if (algoKey & at) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "Init: Multiple %s server private keys not " "allowed", an); ssl_log_ssl_error(APLOG_MARK, APLOG_ERR, s); @@ -493,19 +493,19 @@ * Log the type of reading */ if (nPassPhraseDialogCur == 0) { - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, pServ, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, pServ, "unencrypted %s private key - pass phrase not " "required", an); } else { if (cpPassPhraseCur != NULL) { - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, pServ, "encrypted %s private key - pass phrase " "requested", an); } else { - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, pServ, "encrypted %s private key - pass phrase" " reused", an); @@ -563,7 +563,7 @@ */ if (aPassPhrase->nelts) { pphrase_array_clear(aPassPhrase); - ap_log_error(APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_INFO, 0, s, "Init: Wiped out the queried pass phrases from memory"); } @@ -700,12 +700,12 @@ if (sc->server->pphrase_dialog_type == SSL_PPTYPE_PIPE) { if (!readtty) { - ap_log_error(APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_INFO, 0, s, "Init: Creating pass phrase dialog pipe child " "'%s'", sc->server->pphrase_dialog_path); if (ssl_pipe_child_create(p, sc->server->pphrase_dialog_path) != APR_SUCCESS) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "Init: Failed to create pass phrase pipe '%s'", sc->server->pphrase_dialog_path); PEMerr(PEM_F_DEF_CALLBACK,PEM_R_PROBLEMS_GETTING_PASSWORD); @@ -713,7 +713,7 @@ return (-1); } } - ap_log_error(APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_INFO, 0, s, "Init: Requesting pass phrase via piped dialog"); } else { /* sc->server->pphrase_dialog_type == SSL_PPTYPE_BUILTIN */ @@ -730,7 +730,7 @@ */ apr_file_open_stdout(&writetty, p); - ap_log_error(APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_INFO, 0, s, "Init: Requesting pass phrase via builtin terminal " "dialog"); #endif @@ -789,7 +789,7 @@ const char **argv = apr_palloc(p, sizeof(char *) * 4); char *result; - ap_log_error(APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_INFO, 0, s, "Init: Requesting pass phrase from dialog filter " "program (%s)", cmd); 1.19 +2 -2 httpd-2.0/modules/ssl/ssl_engine_rand.c Index: ssl_engine_rand.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_rand.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- ssl_engine_rand.c 16 May 2002 05:17:10 -0000 1.18 +++ ssl_engine_rand.c 17 May 2002 11:24:17 -0000 1.19 @@ -157,11 +157,11 @@ } } } - ap_log_error(APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_INFO, 0, s, "%sSeeding PRNG with %d bytes of entropy", prefix, nDone); if (RAND_status() == 0) - ap_log_error(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, "%sPRNG still contains not sufficient entropy!", prefix); return nDone; 1.13 +1 -1 httpd-2.0/modules/ssl/ssl_scache.c Index: ssl_scache.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_scache.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ssl_scache.c 16 May 2002 05:17:10 -0000 1.12 +++ ssl_scache.c 17 May 2002 11:24:17 -0000 1.13 @@ -78,7 +78,7 @@ * But we can operate without it, of course. */ if (mc->nSessionCacheMode == SSL_SCMODE_UNSET) { - ap_log_error(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, "Init: Session Cache is not configured " "[hint: SSLSessionCache]"); mc->nSessionCacheMode = SSL_SCMODE_NONE; 1.16 +2 -2 httpd-2.0/modules/ssl/ssl_scache_dbm.c Index: ssl_scache_dbm.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_scache_dbm.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- ssl_scache_dbm.c 16 May 2002 05:17:11 -0000 1.15 +++ ssl_scache_dbm.c 17 May 2002 11:24:17 -0000 1.16 @@ -67,7 +67,7 @@ /* for the DBM we need the data file */ if (mc->szSessionCacheDataFile == NULL) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "SSLSessionCache required"); ssl_die(); } @@ -413,7 +413,7 @@ } ssl_mutex_off(s); - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "Inter-Process Session Cache (DBM) Expiry: " "old: %d, new: %d, removed: %d", nElements, nElements-nDeleted, nDeleted); 1.14 +75 -75 httpd-2.0/modules/ssl/ssl_scache_shmcb.c Index: ssl_scache_shmcb.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_scache_shmcb.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- ssl_scache_shmcb.c 16 May 2002 05:17:11 -0000 1.13 +++ ssl_scache_shmcb.c 17 May 2002 11:24:17 -0000 1.14 @@ -368,7 +368,7 @@ * Create shared memory segment */ if (mc->szSessionCacheDataFile == NULL) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "SSLSessionCache required"); ssl_die(); } @@ -378,7 +378,7 @@ mc->szSessionCacheDataFile, mc->pPool)) != APR_SUCCESS) { char buf[100]; - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "Cannot allocate shared memory: (%d)%s", rv, apr_strerror(rv, buf, sizeof(buf))); ssl_die(); @@ -386,15 +386,15 @@ shm_segment = apr_shm_baseaddr_get(mc->pSessionCacheDataMM); shm_segsize = apr_shm_size_get(mc->pSessionCacheDataMM); - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "shmcb_init allocated %u bytes of shared memory", shm_segsize); if (!shmcb_init_memory(s, shm_segment, shm_segsize)) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "Failure initialising 'shmcb' shared memory"); ssl_die(); } - ap_log_error(APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_INFO, 0, s, "Shared memory session cache initialised"); /* @@ -429,11 +429,11 @@ ssl_mutex_on(s); if (!shmcb_store_session(s, shm_segment, id, idlen, pSession, timeout)) /* in this cache engine, "stores" should never fail. */ - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "'shmcb' code was unable to store a " "session in the cache."); else { - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "shmcb_store successful"); to_return = TRUE; } @@ -453,12 +453,12 @@ pSession = shmcb_retrieve_session(s, shm_segment, id, idlen); ssl_mutex_off(s); if (pSession) - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "shmcb_retrieve had a hit"); else { - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "shmcb_retrieve had a miss"); - ap_log_error(APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_INFO, 0, s, "Client requested a 'session-resume' but " "we have no such session."); } @@ -497,7 +497,7 @@ double expiry_total; time_t average_expiry, now, max_expiry, min_expiry, idxexpiry; - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "inside ssl_scache_shmcb_status"); /* We've kludged our pointer into the other cache's member variable. */ @@ -568,7 +568,7 @@ func(apr_psprintf(p, "total removes since starting: %lu hit, " "%lu miss
", header->num_removes_hit, header->num_removes_miss), arg); - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "leaving shmcb_status"); return; } @@ -588,7 +588,7 @@ SHMCBCache cache; unsigned int temp, loop, granularity; - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "entered shmcb_init_memory()"); /* Calculate some sizes... */ @@ -596,7 +596,7 @@ /* If the segment is ridiculously too small, bail out */ if (shm_mem_size < (2*temp)) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "shared memory segment too small"); return FALSE; } @@ -610,7 +610,7 @@ * the cache is full, which is a lot less stupid than having * having not enough index space to utilise the whole cache!. */ temp /= 120; - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "for %u bytes, recommending %u indexes", shm_mem_size, temp); @@ -627,7 +627,7 @@ /* Too small? Bail ... */ if (temp < 5) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "shared memory segment too small"); return FALSE; } @@ -653,38 +653,38 @@ header->queue_size - header->cache_data_offset; /* Output trace info */ - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "shmcb_init_memory choices follow"); - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "division_mask = 0x%02X", header->division_mask); - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "division_offset = %u", header->division_offset); - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "division_size = %u", header->division_size); - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "queue_size = %u", header->queue_size); - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "index_num = %u", header->index_num); - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "index_offset = %u", header->index_offset); - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "index_size = %u", header->index_size); - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "cache_data_offset = %u", header->cache_data_offset); - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "cache_data_size = %u", header->cache_data_size); /* The header is done, make the caches empty */ for (loop = 0; loop < granularity; loop++) { if (!shmcb_get_division(header, &queue, &cache, loop)) - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, "shmcb_init_memory, " "internal error"); + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "shmcb_init_memory, " "internal error"); shmcb_set_safe_uint(cache.first_pos, 0); shmcb_set_safe_uint(cache.pos_count, 0); shmcb_set_safe_uint(queue.first_pos, 0); shmcb_set_safe_uint(queue.pos_count, 0); } - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "leaving shmcb_init_memory()"); return TRUE; } @@ -704,17 +704,17 @@ time_t expiry_time; unsigned char *session_id = SSL_SESSION_get_session_id(pSession); - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "inside shmcb_store_session"); /* Get the header structure, which division this session will fall into etc. */ shmcb_get_header(shm_segment, &header); masked_index = session_id[0] & header->division_mask; - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "session_id[0]=%u, masked index=%u", session_id[0], masked_index); if (!shmcb_get_division(header, &queue, &cache, (unsigned int)masked_index)) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "shmcb_store_session internal error"); return FALSE; } @@ -724,7 +724,7 @@ * or we find some assurance that it will never be necessary. */ len_encoded = i2d_SSL_SESSION(pSession, NULL); if (len_encoded > SSL_SESSION_MAX_DER) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "session is too big (%u bytes)", len_encoded); return FALSE; } @@ -734,11 +734,11 @@ if (!shmcb_insert_encoded_session(s, &queue, &cache, encoded, len_encoded, session_id, expiry_time)) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "can't store a session!"); return FALSE; } - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "leaving shmcb_store successfully"); header->num_stores++; return TRUE; @@ -754,10 +754,10 @@ unsigned char masked_index; SSL_SESSION *pSession; - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "inside shmcb_retrieve_session"); if (idlen < 2) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, "unusably short session_id provided " + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "unusably short session_id provided " "(%u bytes)", idlen); return FALSE; } @@ -766,10 +766,10 @@ * will come from etc. */ shmcb_get_header(shm_segment, &header); masked_index = id[0] & header->division_mask; - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "id[0]=%u, masked index=%u", id[0], masked_index); if (!shmcb_get_division(header, &queue, &cache, (unsigned int) masked_index)) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "shmcb_retrieve_session internal error"); header->num_retrieves_miss++; return FALSE; @@ -782,7 +782,7 @@ header->num_retrieves_hit++; else header->num_retrieves_miss++; - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "leaving shmcb_retrieve_session"); return pSession; } @@ -797,10 +797,10 @@ unsigned char masked_index; BOOL res; - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "inside shmcb_remove_session"); if (id == NULL) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, "remove called with NULL session_id!"); + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "remove called with NULL session_id!"); return FALSE; } @@ -808,10 +808,10 @@ * will happen in etc. */ shmcb_get_header(shm_segment, &header); masked_index = id[0] & header->division_mask; - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "id[0]=%u, masked index=%u", id[0], masked_index); if (!shmcb_get_division(header, &queue, &cache, (unsigned int)masked_index)) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, "shmcb_remove_session, internal error"); + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "shmcb_remove_session, internal error"); header->num_removes_miss++; return FALSE; } @@ -820,7 +820,7 @@ header->num_removes_hit++; else header->num_removes_miss++; - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "leaving shmcb_remove_session"); return res; } @@ -1009,7 +1009,7 @@ unsigned int loop, index_num, pos_count, new_pos; SHMCBHeader *header; - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "entering shmcb_expire_division"); /* We must calculate num and space ourselves based on expiry times. */ @@ -1033,7 +1033,7 @@ /* Find the new_offset and make the expiries happen. */ if (loop > 0) { - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "will be expiring %u sessions", loop); /* We calculate the new_offset by "peeking" (or in the * case it's the last entry, "sneaking" ;-). */ @@ -1058,7 +1058,7 @@ shmcb_get_safe_uint(&(idx->offset)))); shmcb_set_safe_uint(cache->first_pos, shmcb_get_safe_uint(&(idx->offset))); } - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "we now have %u sessions", shmcb_get_safe_uint(queue->pos_count)); } @@ -1085,7 +1085,7 @@ unsigned int gap, new_pos, loop, new_offset; int need; - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "entering shmcb_insert_encoded_session, " "*queue->pos_count = %u", shmcb_get_safe_uint(queue->pos_count)); @@ -1108,7 +1108,7 @@ shmcb_get_safe_uint(&(idx->offset))); } if (loop > 0) { - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "about to scroll %u sessions from %u", loop, shmcb_get_safe_uint(queue->pos_count)); /* We are removing "loop" items from the cache. */ @@ -1120,7 +1120,7 @@ shmcb_set_safe_uint(cache->first_pos, shmcb_get_safe_uint(&(idx->offset))); shmcb_set_safe_uint(queue->pos_count, shmcb_get_safe_uint(queue->pos_count) - loop); shmcb_set_safe_uint(queue->first_pos, new_pos); - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "now only have %u sessions", shmcb_get_safe_uint(queue->pos_count)); /* Update the stats!!! */ @@ -1132,16 +1132,16 @@ * is verified. */ if (shmcb_get_safe_uint(cache->pos_count) + encoded_len > header->cache_data_size) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "shmcb_insert_encoded_session internal error"); return FALSE; } if (shmcb_get_safe_uint(queue->pos_count) == header->index_num) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "shmcb_insert_encoded_session internal error"); return FALSE; } - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "we have %u bytes and %u indexes free - enough", header->cache_data_size - shmcb_get_safe_uint(cache->pos_count), header->index_num - @@ -1170,12 +1170,12 @@ new_pos = shmcb_cyclic_increment(header->index_num, shmcb_get_safe_uint(queue->first_pos), shmcb_get_safe_uint(queue->pos_count)); - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "storing in index %u, at offset %u", new_pos, new_offset); idx = shmcb_get_index(queue, new_pos); if (idx == NULL) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "shmcb_insert_encoded_session internal error"); return FALSE; } @@ -1185,7 +1185,7 @@ /* idx->removed = (unsigned char)0; */ /* Not needed given the memset above. */ idx->s_id2 = session_id[1]; - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "session_id[0]=%u, idx->s_id2=%u", session_id[0], session_id[1]); @@ -1196,11 +1196,11 @@ shmcb_get_safe_uint(queue->pos_count) + 1); /* And just for good debugging measure ... */ - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "leaving now with %u bytes in the cache and %u indexes", shmcb_get_safe_uint(cache->pos_count), shmcb_get_safe_uint(queue->pos_count)); - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "leaving shmcb_insert_encoded_session"); return TRUE; } @@ -1221,7 +1221,7 @@ unsigned char *ptr; time_t now; - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "entering shmcb_lookup_session_id"); /* If there are entries to expire, ditch them first thing. */ @@ -1231,11 +1231,11 @@ count = shmcb_get_safe_uint(queue->pos_count); header = queue->header; for (loop = 0; loop < count; loop++) { - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "loop=%u, count=%u, curr_pos=%u", loop, count, curr_pos); idx = shmcb_get_index(queue, curr_pos); - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "idx->s_id2=%u, id[1]=%u, offset=%u", idx->s_id2, id[1], shmcb_get_safe_uint(&(idx->offset))); /* Only look into the session further if; @@ -1252,7 +1252,7 @@ unsigned int session_id_length; unsigned char *session_id; - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "at index %u, found possible session match", curr_pos); shmcb_cyclic_cton_memcpy(header->cache_data_size, @@ -1265,24 +1265,24 @@ session_id = SSL_SESSION_get_session_id(pSession); if (pSession == NULL) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "scach2_lookup_session_id internal error"); return NULL; } if ((session_id_length == idlen) && (memcmp(session_id, id, idlen) == 0)) { - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "a match!"); return pSession; } - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "not a match"); SSL_SESSION_free(pSession); pSession = NULL; } curr_pos = shmcb_cyclic_increment(header->index_num, curr_pos, 1); } - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "no matching sessions were found"); return NULL; } @@ -1299,7 +1299,7 @@ unsigned char *ptr; BOOL to_return = FALSE; - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "entering shmcb_remove_session_id"); /* If there's entries to expire, ditch them first thing. */ @@ -1318,11 +1318,11 @@ count = shmcb_get_safe_uint(queue->pos_count); header = cache->header; for (loop = 0; loop < count; loop++) { - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "loop=%u, count=%u, curr_pos=%u", loop, count, curr_pos); idx = shmcb_get_index(queue, curr_pos); - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "idx->s_id2=%u, id[1]=%u", idx->s_id2, id[1]); /* Only look into the session further if the second byte of the @@ -1331,7 +1331,7 @@ unsigned int session_id_length; unsigned char *session_id; - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "at index %u, found possible " "session match", curr_pos); shmcb_cyclic_cton_memcpy(header->cache_data_size, @@ -1341,7 +1341,7 @@ ptr = tempasn; pSession = d2i_SSL_SESSION(NULL, &ptr, SSL_SESSION_MAX_DER); if (pSession == NULL) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "shmcb_remove_session_id, internal error"); goto end; } @@ -1350,7 +1350,7 @@ if ((session_id_length == idlen) && (memcmp(id, session_id, idlen) == 0)) { - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "a match!"); /* Scrub out this session "quietly" */ idx->removed = (unsigned char) 1; @@ -1358,20 +1358,20 @@ to_return = TRUE; goto end; } - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "not a match"); SSL_SESSION_free(pSession); pSession = NULL; } curr_pos = shmcb_cyclic_increment(header->index_num, curr_pos, 1); } - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "no matching sessions were found"); /* If there's entries to expire, ditch them now. */ shmcb_expire_division(s, queue, cache); end: - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "leaving shmcb_remove_session_id"); return to_return; } 1.10 +5 -5 httpd-2.0/modules/ssl/ssl_scache_shmht.c Index: ssl_scache_shmht.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_scache_shmht.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ssl_scache_shmht.c 16 May 2002 05:17:11 -0000 1.9 +++ ssl_scache_shmht.c 17 May 2002 11:24:17 -0000 1.10 @@ -117,7 +117,7 @@ * Create shared memory segment */ if (mc->szSessionCacheDataFile == NULL) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "SSLSessionCache required"); ssl_die(); } @@ -137,7 +137,7 @@ "Cannot initialize rmm"); ssl_die(); } - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "initialize MM %p RMM %p", mc->pSessionCacheDataMM, mc->pSessionCacheDataRMM); @@ -157,7 +157,7 @@ ssl_scache_shmht_calloc, ssl_scache_shmht_realloc, ssl_scache_shmht_free, s )) == NULL) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "Cannot allocate hash table in shared memory: %s", table_strerror(ta_errno)); ssl_die(); @@ -171,7 +171,7 @@ /* * Log the done work */ - ap_log_error(APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_INFO, 0, s, "Init: Created hash-table (%d buckets) " "in shared memory (%d bytes) for SSL session cache", n, avail); @@ -340,7 +340,7 @@ /* (vpKeyThis != vpKey) && (nKeyThis != nKey) */ } ssl_mutex_off(s); - ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "Inter-Process Session Cache (SHMHT) Expiry: " "old: %d, new: %d, removed: %d", nElements, nElements-nDeleted, nDeleted);