httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject cvs commit: httpd-2.0/server error_bucket.c Makefile.in
Date Sun, 25 Feb 2001 04:24:17 GMT
rbb         01/02/24 20:24:17

  Modified:    .        CHANGES
               modules/http config.m4
               server   Makefile.in
  Added:       server   error_bucket.c
  Removed:     modules/http error_bucket.c
  Log:
  Move the error_bucket definition from the HTTP module to the core server.
  Every protocol will need this definition, so it belongs in the core.
  
  Revision  Changes    Path
  1.110     +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.109
  retrieving revision 1.110
  diff -u -d -b -w -u -r1.109 -r1.110
  --- CHANGES	2001/02/23 18:57:35	1.109
  +++ CHANGES	2001/02/25 04:24:16	1.110
  @@ -1,5 +1,9 @@
   Changes with Apache 2.0.12-dev
   
  +  *) Move the error_bucket definition from the http module to the
  +     core server.  Every protocol will need this ability, not just
  +     HTTP.  [Ryan Bloom]
  +
     *) Modify mod_file_cache to save pre-formatted strings for 
        content-length and last-modified headers for performance. 
        [Mike Abbot <mja@trudge.engr.sgi.com>]
  
  
  
  1.3       +1 -1      httpd-2.0/modules/http/config.m4
  
  Index: config.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/http/config.m4,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -d -b -w -u -r1.2 -r1.3
  --- config.m4	2001/01/27 07:13:39	1.2
  +++ config.m4	2001/02/25 04:24:17	1.3
  @@ -2,7 +2,7 @@
   
   APACHE_MODPATH_INIT(http)
   
  -http_objects="http_core.lo http_protocol.lo http_request.lo error_bucket.lo"
  +http_objects="http_core.lo http_protocol.lo http_request.lo"
   
   APACHE_MODULE(core, HTTP protocol handling, $http_objects, , yes)
   APACHE_MODULE(mime, mapping of file-extension to MIME, , , yes)
  
  
  
  1.35      +2 -1      httpd-2.0/server/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/Makefile.in,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -d -b -w -u -r1.34 -r1.35
  --- Makefile.in	2001/02/18 16:07:31	1.34
  +++ Makefile.in	2001/02/25 04:24:17	1.35
  @@ -12,7 +12,8 @@
   	util_script.c util_uri.c util_md5.c util_cfgtree.c util_ebcdic.c \
   	rfc1413.c connection.c listen.c \
           mpm_common.c util_charset.c util_debug.c util_xml.c \
  -	util_filter.c exports.c buildmark.c scoreboard.c
  +	util_filter.c exports.c buildmark.c scoreboard.c \
  +	error_bucket.c
   
   targets = delete-exports $(LTLIBRARY_NAME)
   
  
  
  
  1.1                  httpd-2.0/server/error_bucket.c
  
  Index: error_bucket.c
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution,
   *    if any, must include the following acknowledgment:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgment may appear in the software itself,
   *    if and wherever such third-party acknowledgments normally appear.
   *
   * 4. The names "Apache" and "Apache Software Foundation" must
   *    not be used to endorse or promote products derived from this
   *    software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache",
   *    nor may "Apache" appear in their name, without prior written
   *    permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  #include "http_protocol.h"
  #include "apr_buckets.h"
  #include "apr_strings.h"
  #include <stdlib.h>
  #if APR_HAVE_STRINGS_H
  #include <strings.h>
  #endif
  
  static apr_status_t error_read(apr_bucket *b, const char **str, 
  			       apr_size_t *len, apr_read_type_e block)
  {
      *str = NULL;
      *len = 0;
      return APR_SUCCESS;
  }
  
  AP_DECLARE(apr_bucket *) ap_bucket_error_make(apr_bucket *b, int error, 
  		const char *buf, apr_pool_t *p)
  {
      ap_bucket_error *h;
  
      h = malloc(sizeof(*h));
      if (h == NULL) {
          return NULL;
      }
      h->status = error;
      if (buf) {
          h->start = apr_pstrdup(p, buf);
      }
  
      b->length = 0;
      b->type = &ap_bucket_type_error;
      b->data = h;
      return b;
  }
  
  AP_DECLARE(apr_bucket *) ap_bucket_error_create(int error, 
  		const char *buf, apr_pool_t *p)
  {
      apr_bucket_do_create(ap_bucket_error_make(b, error, buf, p));
  }
  
  AP_DECLARE_DATA const apr_bucket_type_t ap_bucket_type_error = {
      "ERROR", 5,
      free,
      error_read,
      apr_bucket_setaside_notimpl,
      apr_bucket_split_notimpl,
      apr_bucket_copy_notimpl
  };
  
  
  

Mime
View raw message