httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b..@apache.org
Subject cvs commit: httpd-2.0/server config.c
Date Sun, 07 Jan 2001 22:45:26 GMT
ben         01/01/07 14:45:26

  Modified:    server   config.c
  Log:
  Strip trailing stuff from mime types.
  
  Revision  Changes    Path
  1.95      +8 -8      httpd-2.0/server/config.c
  
  Index: config.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/config.c,v
  retrieving revision 1.94
  retrieving revision 1.95
  diff -u -r1.94 -r1.95
  --- config.c	2001/01/07 19:55:58	1.94
  +++ config.c	2001/01/07 22:45:26	1.95
  @@ -281,26 +281,26 @@
       const char *handler;
       const char *p;
       size_t handler_len;
  -    int result = HTTP_INTERNAL_SERVER_ERROR;
  +    int result;
  +    char hbuf[MAX_STRING_LEN];
   
       if (r->handler) {
           handler = r->handler;
  -        handler_len = strlen(handler);
       }
       else {
           handler = r->content_type ? r->content_type : ap_default_type(r);
  -        if ((p = ap_strchr_c(handler, ';')) != NULL) {
  +        if (ap_strchr_c(handler, ';') != NULL) {
  +	    apr_cpystrn(hbuf, handler, sizeof hbuf);
  +	    handler = hbuf;
  +	    p = ap_strchr_c(handler, ';');
   	    /* MIME type arguments */
               while (p > handler && p[-1] == ' ')
   	        --p;		/* strip trailing spaces */
  -	    handler_len = p - handler;
  +	    *p='\0';
   	}
  -	else {
  -	    handler_len = strlen(handler);
  -	}
       }
   
  -    result=ap_run_handler(handler,r);
  +    result = ap_run_handler(handler ,r);
   
       if (result == DECLINED && r->handler && r->filename) {
           ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, r,
  
  
  

Mime
View raw message