Received: (from majordom@localhost)
	by hyperreal.com (8.8.5/8.8.5) id SAA02040;
	Sun, 27 Apr 1997 18:41:03 -0700 (PDT)
Received: (from dgaudet@localhost)
	by hyperreal.com (8.8.5/8.8.5) id SAA02030
	for apache-cvs; Sun, 27 Apr 1997 18:41:01 -0700 (PDT)
Date: Sun, 27 Apr 1997 18:41:01 -0700 (PDT)
From: Dean Gaudet <dgaudet@hyperreal.com>
Message-Id: <199704280141.SAA02030@hyperreal.com>
To: apache-cvs@hyperreal.com
Subject: cvs commit: apache/src CHANGES util_script.c
Sender: apache-cvs-owner@apache.org
Precedence: bulk
Reply-To: new-httpd@apache.org

dgaudet     97/04/27 18:41:00

  Modified:    src       CHANGES util_script.c
  Log:
  Fix an "endless" loop problem in CGI argv creation.
  
  Reviewed by:	Dean, Jim
  Submitted by:	Marc
  
  Revision  Changes    Path
  1.257     +5 -0      apache/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apache/src/CHANGES,v
  retrieving revision 1.256
  retrieving revision 1.257
  diff -C3 -r1.256 -r1.257
  *** CHANGES	1997/04/27 10:13:16	1.256
  --- CHANGES	1997/04/28 01:40:58	1.257
  ***************
  *** 1,3 ****
  --- 1,8 ----
  + Changes with Apache 1.2b10
  + 
  +   *) Fixed a showstopper CGI problem in 1.2b9.  This change caused the rev
  +      to 1.2b10, 1.2b9 was never announced.  [Marc Slemko]
  + 
    Changes with Apache 1.2b9
    
      *) Reset the MODULE_MAGIC_NUMBER to account for the unsigned port
  
  
  
  1.54      +3 -1      apache/src/util_script.c
  
  Index: util_script.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/util_script.c,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -C3 -r1.53 -r1.54
  *** util_script.c	1997/04/27 07:14:02	1.53
  --- util_script.c	1997/04/28 01:40:58	1.54
  ***************
  *** 79,84 ****
  --- 79,85 ----
        char *t;
        char *args = pstrdup(p, reqargs);
        int idx = 0;
  +     char *strtok_arg = args;
    
        av = (char **)palloc(p, APACHE_ARG_MAX * sizeof(char *));
        
  ***************
  *** 91,97 ****
    
        av[idx++] = av0;
        
  !     while ((idx < APACHE_ARG_MAX) && ((t = strtok(args, "+")) != NULL)) {
    	unescape_url(t);
    	av[idx++] = escape_shell_cmd(p, t);
        }
  --- 92,99 ----
    
        av[idx++] = av0;
        
  !     while ((idx < APACHE_ARG_MAX) && ((t = strtok(strtok_arg, "+")) != NULL)) {
  !         strtok_arg = NULL;
    	unescape_url(t);
    	av[idx++] = escape_shell_cmd(p, t);
        }