httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Brian Behlendorf <br...@hyperreal.com>
Subject cvs commit: apache/src http_request.c httpd.h http_protocol.c
Date Tue, 08 Oct 1996 20:43:37 GMT
brian       96/10/08 13:43:36

  Modified:    src       http_request.c httpd.h http_protocol.c
  Log:
  Reviewed by:	Brian Behlendorf
  Submitted by:	Rob Hartil <robh@us.imdb.com>
  
  Rob wrote:
  > "no_cache" had been borrowed to do stuff that it shouldn't have.
  
  Revision  Changes    Path
  1.16      +5 -4      apache/src/http_request.c
  
  Index: http_request.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/http_request.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -C3 -r1.15 -r1.16
  *** http_request.c	1996/08/20 11:50:51	1.15
  --- http_request.c	1996/10/08 20:43:31	1.16
  ***************
  *** 50,56 ****
     *
     */
    
  ! /* $Id: http_request.c,v 1.15 1996/08/20 11:50:51 paul Exp $ */
    
    /*
     * http_request.c: functions to get and process requests
  --- 50,56 ----
     *
     */
    
  ! /* $Id: http_request.c,v 1.16 1996/10/08 20:43:31 brian Exp $ */
    
    /*
     * http_request.c: functions to get and process requests
  ***************
  *** 713,721 ****
    	    r->status = REDIRECT;
    	    table_set (r->headers_out, "Location", custom_response);
    	} else if ( custom_response[0] == '/') {
  ! 	    r->no_cache = 1;	/* Do NOT send USE_LOCAL_COPY for
  ! 				 * error documents!
  ! 				 */
    	    /* This redirect needs to be a GET no matter what the original
    	     * method was.
    	     */
  --- 713,721 ----
    	    r->status = REDIRECT;
    	    table_set (r->headers_out, "Location", custom_response);
    	} else if ( custom_response[0] == '/') {
  ! 	    r->no_local_copy = 1; /* Do NOT send USE_LOCAL_COPY for
  ! 				   * error documents!
  ! 				   */
    	    /* This redirect needs to be a GET no matter what the original
    	     * method was.
    	     */
  ***************
  *** 950,955 ****
  --- 950,956 ----
        new->no_cache = r->no_cache; /* If we've already made up our minds
    				  * about this, don't change 'em back!
    				  */
  +     new->no_local_copy = r->no_local_copy;
    
        sprintf (t, "%d", r->status);
        table_set (new->subprocess_env, "REDIRECT_STATUS", pstrdup (r->pool, t));
  
  
  
  1.52      +2 -1      apache/src/httpd.h
  
  Index: httpd.h
  ===================================================================
  RCS file: /export/home/cvs/apache/src/httpd.h,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -C3 -r1.51 -r1.52
  *** httpd.h	1996/09/30 05:56:26	1.51
  --- httpd.h	1996/10/08 20:43:32	1.52
  ***************
  *** 50,56 ****
     *
     */
    
  ! /* $Id: httpd.h,v 1.51 1996/09/30 05:56:26 brian Exp $ */
    
    /*
     * httpd.h: header for simple (ha! not anymore) http daemon
  --- 50,56 ----
     *
     */
    
  ! /* $Id: httpd.h,v 1.52 1996/10/08 20:43:32 brian Exp $ */
    
    /*
     * httpd.h: header for simple (ha! not anymore) http daemon
  ***************
  *** 409,414 ****
  --- 409,415 ----
      char *content_language;
      
      int no_cache;
  +   int no_local_copy;
      
      /* What object is being requested (either directly, or via include
       * or content-negotiation mapping).
  
  
  
  1.52      +3 -3      apache/src/http_protocol.c
  
  Index: http_protocol.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/http_protocol.c,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -C3 -r1.51 -r1.52
  *** http_protocol.c	1996/09/30 05:56:25	1.51
  --- http_protocol.c	1996/10/08 20:43:33	1.52
  ***************
  *** 50,56 ****
     *
     */
      
  ! /* $Id: http_protocol.c,v 1.51 1996/09/30 05:56:25 brian Exp $ */
    
    /*
     * http_protocol.c --- routines which directly communicate with the
  --- 50,56 ----
     *
     */
      
  ! /* $Id: http_protocol.c,v 1.52 1996/10/08 20:43:33 brian Exp $ */
    
    /*
     * http_protocol.c --- routines which directly communicate with the
  ***************
  *** 357,363 ****
         * not allowing conditional GETs.
         */
    
  !     if (r->no_cache) return OK;
    
        /* Check for conditional GETs --- note that we only want this check
         * to succeed if the GET was successful; ErrorDocuments *always* get sent.
  --- 357,363 ----
         * not allowing conditional GETs.
         */
    
  !     if (r->no_local_copy) return OK;
    
        /* Check for conditional GETs --- note that we only want this check
         * to succeed if the GET was successful; ErrorDocuments *always* get sent.
  ***************
  *** 705,711 ****
    void set_sub_req_protocol (request_rec *rnew, request_rec *r)
    {
        rnew->assbackwards = 1;	/* Don't send headers from this. */
  !     rnew->no_cache = 1;		/* Don't try to send USE_LOCAL_COPY for a
    				 * fragment.
    				 */
        rnew->method = "GET"; rnew->method_number = M_GET;
  --- 705,711 ----
    void set_sub_req_protocol (request_rec *rnew, request_rec *r)
    {
        rnew->assbackwards = 1;	/* Don't send headers from this. */
  !     rnew->no_local_copy = 1;	/* Don't try to send USE_LOCAL_COPY for a
    				 * fragment.
    				 */
        rnew->method = "GET"; rnew->method_number = M_GET;
  
  
  

Mime
View raw message