httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@hyperreal.org
Subject cvs commit: apache-1.3/src/modules/standard mod_cgi.c
Date Mon, 21 Sep 1998 21:09:52 GMT
coar        98/09/21 14:09:52

  Modified:    src/main http_config.c http_core.c util_script.c
               src/modules/standard mod_cgi.c
  Log:
  	Now that *ERROR_NOTES is set by ap_log_rerror(), remove
  	some cases that manually set it to the same string after
  	the call.
  
  Revision  Changes    Path
  1.128     +4 -4      apache-1.3/src/main/http_config.c
  
  Index: http_config.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/main/http_config.c,v
  retrieving revision 1.127
  retrieving revision 1.128
  diff -u -r1.127 -r1.128
  --- http_config.c	1998/09/19 21:54:57	1.127
  +++ http_config.c	1998/09/21 21:09:47	1.128
  @@ -1240,8 +1240,7 @@
   
   	if (errmsg) {
   	    ap_log_rerror(APLOG_MARK, APLOG_ALERT|APLOG_NOERRNO, r, "%s: %s",
  -                        filename, errmsg);
  -	    ap_table_setn(r->notes, "error-notes", errmsg);
  +			  filename, errmsg);
               return HTTP_INTERNAL_SERVER_ERROR;
   	}
   
  @@ -1252,8 +1251,9 @@
   	    dc = NULL;
   	else {
   	    ap_log_rerror(APLOG_MARK, APLOG_CRIT, r,
  -			"%s pcfg_openfile: unable to check htaccess file, ensure it is readable",
  -			filename);
  +			  "%s pcfg_openfile: unable to check htaccess file, "
  +			  "ensure it is readable",
  +			  filename);
   	    ap_table_setn(r->notes, "error-notes",
   			  "Server unable to read htaccess file, denying "
   			  "access to be safe");
  
  
  
  1.231     +0 -1      apache-1.3/src/main/http_core.c
  
  Index: http_core.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/main/http_core.c,v
  retrieving revision 1.230
  retrieving revision 1.231
  diff -u -r1.230 -r1.231
  --- http_core.c	1998/09/17 20:23:45	1.230
  +++ http_core.c	1998/09/21 21:09:48	1.231
  @@ -2743,7 +2743,6 @@
   	    emsg = ap_pstrcat(r->pool, emsg, r->filename, r->path_info, NULL);
   	}
   	ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, r, emsg);
  -	ap_table_setn(r->notes, "error-notes", emsg);
   	return HTTP_NOT_FOUND;
       }
       if (r->method_number != M_GET) {
  
  
  
  1.132     +0 -4      apache-1.3/src/main/util_script.c
  
  Index: util_script.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/main/util_script.c,v
  retrieving revision 1.131
  retrieving revision 1.132
  diff -u -r1.131 -r1.132
  --- util_script.c	1998/09/14 16:10:22	1.131
  +++ util_script.c	1998/09/21 21:09:48	1.132
  @@ -458,8 +458,6 @@
   	    ap_kill_timeout(r);
   	    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
   			  "Premature end of script headers: %s", r->filename);
  -	    ap_table_setn(r->notes, "error-notes",
  -			  "Premature end of script headers");
   	    return HTTP_INTERNAL_SERVER_ERROR;
   	}
   
  @@ -543,8 +541,6 @@
   	    ap_kill_timeout(r);
   	    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
   			  "%s: %s", malformed, r->filename);
  -	    ap_table_setn(r->notes, "error-notes",
  -			  ap_pstrdup(r->pool, malformed));
   	    return HTTP_INTERNAL_SERVER_ERROR;
   	}
   
  
  
  
  1.86      +0 -1      apache-1.3/src/modules/standard/mod_cgi.c
  
  Index: mod_cgi.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_cgi.c,v
  retrieving revision 1.85
  retrieving revision 1.86
  diff -u -r1.85 -r1.86
  --- mod_cgi.c	1998/09/03 22:40:42	1.85
  +++ mod_cgi.c	1998/09/21 21:09:51	1.86
  @@ -433,7 +433,6 @@
   			 &script_out, &script_in, &script_err)) {
   	ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
   		    "couldn't spawn child process: %s", r->filename);
  -	ap_table_setn(r->notes, "error-notes", "Couldn't spawn child process");
   	return HTTP_INTERNAL_SERVER_ERROR;
       }
   
  
  
  

Mime
View raw message