httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stodd...@apache.org
Subject cvs commit: httpd-2.0/modules/generators mod_cgi.c mod_cgid.c
Date Thu, 02 Sep 2004 22:06:23 GMT
stoddard    2004/09/02 15:06:23

  Modified:    .        Tag: APACHE_2_0_BRANCH STATUS
               modules/generators Tag: APACHE_2_0_BRANCH mod_cgi.c
                        mod_cgid.c
  Log:
  ifndef AP_UNSAFE_ERROR_LOG_UNESCAPED the stderr to errorlog stuff
  for those who don't want to escape (as in server/log.c)
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.751.2.1041 +1 -8      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.1040
  retrieving revision 1.751.2.1041
  diff -u -r1.751.2.1040 -r1.751.2.1041
  --- STATUS	2 Sep 2004 20:09:28 -0000	1.751.2.1040
  +++ STATUS	2 Sep 2004 22:06:22 -0000	1.751.2.1041
  @@ -98,13 +98,6 @@
                native chars here and it will be converted later? (I'm not sure)
            (2) I'd put out (null) only if val is NULL, not if it's empty.
   
  -    *) Escape errfn strings before sending them to the log file (and
  -       analogus patch to mod_cgid)
  -       http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/generators/mod_cgi.c?r1=1.167&r2=1.168
  -       +1: stoddard, trawick, jorton
  -       nd: I'd like to add 1.169
  -       trawick: 1.169 is fine with me
  -
       *) Add -l option to rotatelogs to let it use local time rather than
          UTC.  PR 24417.  [Ken Coar, Uli Zappe <uli ritual.org>]
            support/rotatelogs.c: r1.33, r1.34, r1.35
  
  
  
  No                   revision
  No                   revision
  1.148.2.9 +9 -1      httpd-2.0/modules/generators/mod_cgi.c
  
  Index: mod_cgi.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/generators/mod_cgi.c,v
  retrieving revision 1.148.2.8
  retrieving revision 1.148.2.9
  diff -u -r1.148.2.8 -r1.148.2.9
  --- mod_cgi.c	16 Jun 2004 08:40:00 -0000	1.148.2.8
  +++ mod_cgi.c	2 Sep 2004 22:06:22 -0000	1.148.2.9
  @@ -348,11 +348,19 @@
       char errbuf[200];
   
       apr_file_open_stderr(&stderr_log, pool);
  +    /* Escape the logged string because it may be something that
  +     * came in over the network.
  +     */
       apr_file_printf(stderr_log,
                       "(%d)%s: %s\n",
                       err,
                       apr_strerror(err, errbuf, sizeof(errbuf)),
  -                    description);
  +#ifdef AP_UNSAFE_ERROR_LOG_UNESCAPED
  +                    description
  +#else
  +                    ap_escape_logitem(pool, description)
  +#endif
  +                    );
   }
   
   static apr_status_t run_cgi_child(apr_file_t **script_out,
  
  
  
  1.145.2.16 +7 -1      httpd-2.0/modules/generators/mod_cgid.c
  
  Index: mod_cgid.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/generators/mod_cgid.c,v
  retrieving revision 1.145.2.15
  retrieving revision 1.145.2.16
  diff -u -r1.145.2.15 -r1.145.2.16
  --- mod_cgid.c	16 Mar 2004 21:10:16 -0000	1.145.2.15
  +++ mod_cgid.c	2 Sep 2004 22:06:22 -0000	1.145.2.16
  @@ -559,7 +559,13 @@
        * have r->headers_in and possibly other storage referenced by
        * ap_log_rerror()
        */
  -    ap_log_error(APLOG_MARK, APLOG_ERR, err, r->server, "%s", description);
  +    ap_log_error(APLOG_MARK, APLOG_ERR, err, r->server, "%s", 
  +#ifdef AP_UNSAFE_ERROR_LOG_UNESCAPED
  +                 description
  +#else
  +                 ap_escape_logitem(pool, description)
  +#endif
  +                 );
   }
   
   static int cgid_server(void *data) 
  
  
  

Mime
View raw message