httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dgau...@hyperreal.org
Subject cvs commit: apache-1.3/src/main http_core.c http_protocol.c util_script.c
Date Sat, 14 Mar 1998 00:03:41 GMT
dgaudet     98/03/13 16:03:41

  Modified:    src/main http_core.c http_protocol.c util_script.c
  Log:
  a few less pstrdup
  
  Revision  Changes    Path
  1.170     +6 -6      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.169
  retrieving revision 1.170
  diff -u -r1.169 -r1.170
  --- http_core.c	1998/03/13 19:20:14	1.169
  +++ http_core.c	1998/03/14 00:03:37	1.170
  @@ -1267,7 +1267,7 @@
       const char *err = check_cmd_context(cmd, NOT_IN_DIR_LOC_FILE|NOT_IN_LIMIT);
       if (err != NULL) return err;
   
  -    *(char **)(struct_ptr + offset) = pstrdup (cmd->pool, arg);
  +    *(char **)(struct_ptr + offset) = arg;
       return NULL;
   }
   
  @@ -1335,7 +1335,7 @@
       if (err != NULL) return err;
   
       if (!cmd->server->is_virtual) {
  -	user_name = pstrdup (cmd->pool, arg);
  +	user_name = arg;
   	cmd->server->server_uid = user_id = uname2id(arg);
       }
       else {
  @@ -1444,7 +1444,7 @@
   
       if (cmd->server->is_virtual)
   	return "PidFile directive not allowed in <VirtualHost>";
  -    pid_fname = pstrdup (cmd->pool, arg);
  +    pid_fname = arg;
       return NULL;
   }
   
  @@ -1453,7 +1453,7 @@
       const char *err = check_cmd_context(cmd, GLOBAL_ONLY);
       if (err != NULL) return err;
   
  -    scoreboard_fname = pstrdup (cmd->pool, arg);
  +    scoreboard_fname = arg;
       return NULL;
   }
   
  @@ -1462,7 +1462,7 @@
       const char *err = check_cmd_context(cmd, GLOBAL_ONLY);
       if (err != NULL) return err;
   
  -    lock_fname = pstrdup (cmd->pool, arg);
  +    lock_fname = arg;
       return NULL;
   }
   
  @@ -1498,7 +1498,7 @@
       const char *err = check_cmd_context(cmd, NOT_IN_DIR_LOC_FILE|NOT_IN_LIMIT);
       if (err != NULL) return err;
   
  -    cmd->server->path = pstrdup (cmd->pool, arg);
  +    cmd->server->path = arg;
       cmd->server->pathlen = strlen (arg);
       return NULL;
   }
  
  
  
  1.197     +1 -1      apache-1.3/src/main/http_protocol.c
  
  Index: http_protocol.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/main/http_protocol.c,v
  retrieving revision 1.196
  retrieving revision 1.197
  diff -u -r1.196 -r1.197
  --- http_protocol.c	1998/03/13 07:12:54	1.196
  +++ http_protocol.c	1998/03/14 00:03:38	1.197
  @@ -1888,7 +1888,7 @@
       int status = r->status;
       int idx = index_of_response(status);
       char *custom_response;
  -    char *location = pstrdup(r->pool, table_get(r->headers_out, "Location"));
  +    char *location = table_get(r->headers_out, "Location");
   
       /* We need to special-case the handling of 204 and 304 responses,
        * since they have specific HTTP requirements and do not include a
  
  
  
  1.102     +7 -7      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.101
  retrieving revision 1.102
  diff -u -r1.101 -r1.102
  --- util_script.c	1998/03/12 10:28:58	1.101
  +++ util_script.c	1998/03/14 00:03:39	1.102
  @@ -244,7 +244,7 @@
       table_setn(e, "SERVER_PORT", pstrdup(r->pool,port));
       host = get_remote_host(c, r->per_dir_config, REMOTE_HOST);
       if (host) {
  -	table_setn(e, "REMOTE_HOST", pstrdup(r->pool, host));
  +	table_setn(e, "REMOTE_HOST", host);
       }
       table_setn(e, "REMOTE_ADDR", c->remote_ip);
       table_setn(e, "DOCUMENT_ROOT", document_root(r));	/* Apache */
  @@ -477,13 +477,13 @@
   	    r->status_line = pstrdup(r->pool, l);
   	}
   	else if (!strcasecmp(w, "Location")) {
  -	    table_setn(r->headers_out, pstrdup(r->pool,w), pstrdup(r->pool,l));
  +	    table_set(r->headers_out, w, l);
   	}
   	else if (!strcasecmp(w, "Content-Length")) {
  -	    table_setn(r->headers_out, pstrdup(r->pool,w), pstrdup(r->pool,l));
  +	    table_set(r->headers_out, w, l);
   	}
   	else if (!strcasecmp(w, "Transfer-Encoding")) {
  -	    table_setn(r->headers_out, pstrdup(r->pool,w), pstrdup(r->pool,l));
  +	    table_set(r->headers_out, w, l);
   	}
   	/*
   	 * If the script gave us a Last-Modified header, we can't just
  @@ -500,7 +500,7 @@
   	 * we'll use - otherwise we assume 200 OK.
   	 */
   	else if (!strcasecmp(w, "Status")) {
  -	    table_setn(r->headers_out, pstrdup(r->pool,w), pstrdup(r->pool,l));
  +	    table_set(r->headers_out, w, l);
   	    cgi_status = atoi(l);
   	}
   
  @@ -510,10 +510,10 @@
   	 * separately.  Lets humour those browsers.
   	 */
   	else if (!strcasecmp(w, "Set-Cookie")) {
  -	    table_addn(r->err_headers_out, pstrdup(r->pool,w), pstrdup(r->pool,l));
  +	    table_add(r->err_headers_out, w, l);
   	}
   	else {
  -	    table_mergen(r->err_headers_out, pstrdup(r->pool,w), pstrdup(r->pool,l));
  +	    table_merge(r->err_headers_out, w, l);
   	}
       }
   }
  
  
  

Mime
View raw message