cvs commit: apache/src CHANGES httpd.h

[dgaudet]

dgaudet 98/01/13 16:00:40

  Modified:.Tag: APACHE_1_2_X STATUS
   src  Tag: APACHE_1_2_X CHANGES httpd.h
  Log:
  more #define wrappers from FreeBSD port
  
  Submitted by:   Ralf Engelschall
  Reviewed by:Ralf Engelschall, Dean Gaudet, Martin Kraemer, Roy Fielding
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.1.2.11  +1 -85 apache/Attic/STATUS
  
  Index: STATUS
  ===
  RCS file: /export/home/cvs/apache/Attic/STATUS,v
  retrieving revision 1.1.2.10
  retrieving revision 1.1.2.11
  diff -u -r1.1.2.10 -r1.1.2.11
  --- STATUS1998/01/13 23:52:11 1.1.2.10
  +++ STATUS1998/01/14 00:00:35 1.1.2.11
  @@ -8,6 +8,7 @@
   * Martin's [PATCH]-1.2.6: passing escaped CC='$(CC)'
   * Martin's [PATCH]-1.2.6: avoid B_ERROR redeclaration
   * Mark Bixby's MPE port patch
  +* more #define wrappers from FreeBSD port
   
   Available:
   
  @@ -23,10 +24,6 @@
see below
Status: Ralf +1, Dean +1, Roy +1
   
  -* Something from the FreeBSD port -- more #define wrappers
  - see below
  - Status: Ralf +1, Dean +1, Martin +1, Roy +1
  -
   * Dean's backport of the bputc()/chunking bugfix.
<[EMAIL PROTECTED]>
Status: Dean +1, Martin +1, Roy +1
  @@ -69,85 +66,4 @@
   
 For 1.3 this bugfix is different and already replaced by the new patch
 replacing the complete rewriting engine I'll post these days .
  -
  -* The following patch from the FreeBSD ports area which I find very useful
  -  because it allows one to set the pathnames from Configuration without
  -  hacking the httpd.h every time. It is already comitted in 1.3.
  -
  -Index: httpd.h
  -===
  -RCS file: /e/apache/REPOS/apache/src/httpd.h,v
  -retrieving revision 1.111.2.17
  -diff -u -r1.111.2.17 httpd.h
  ---- httpd.h 1997/08/22 08:04:27 1.111.2.17
  -+++ httpd.h 1997/11/04 12:38:45
  -@@ -74,6 +74,7 @@
  - #endif
  - #endif
  - 
  -+#ifndef DOCUMENT_LOCATION
  - /* Root of server */
  - #ifdef __EMX__
  - /* Set default for OS/2 file system */ 
  -@@ -81,6 +82,7 @@
  - #else
  - #define DOCUMENT_LOCATION "/usr/local/etc/httpd/htdocs"
  - #endif
  -+#endif
  - 
  - /* Max. number of dynamically loaded modules */
  - #define DYNAMIC_MODULE_LIMIT 64
  -@@ -112,21 +114,31 @@
  - #endif
  - 
  - /* The name of the log files */
  -+#ifndef DEFAULT_XFERLOG
  - #ifdef __EMX__
  - /* Set default for OS/2 file system */ 
  - #define DEFAULT_XFERLOG "logs/access.log"
  - #else
  - #define DEFAULT_XFERLOG "logs/access_log"
  - #endif
  -+#endif /* DEFAULT_XFERLOG */
  -+#ifndef DEFAULT_ERRORLOG
  - #ifdef __EMX__
  - /* Set default for OS/2 file system */ 
  - #define DEFAULT_ERRORLOG "logs/error.log"
  - #else
  - #define DEFAULT_ERRORLOG "logs/error_log"
  - #endif
  -+#endif /* DEFAULT_ERRORLOG */
  -+#ifndef DEFAULT_PIDLOG
  - #define DEFAULT_PIDLOG "logs/httpd.pid"
  -+#endif
  -+#ifndef DEFAULT_SCOREBOARD
  - #define DEFAULT_SCOREBOARD "logs/apache_runtime_status"
  -+#endif
  -+#ifndef DEFAULT_LOCKFILE
  - #define DEFAULT_LOCKFILE "logs/accept.lock"
  -+#endif
  - 
  - /* Define this to be what your HTML directory content files are called 
*/
  - #define DEFAULT_INDEX "index.html"
  -@@ -151,14 +163,20 @@
  - #define SERVER_CONFIG_FILE "conf/httpd.conf"
  - #endif
  - 
  -+#ifndef RESOURCE_CONFIG_FILE
  - /* The name of the document config file */
  - #define RESOURCE_CONFIG_FILE "conf/srm.conf"
  -+#endif
  - 
  -+#ifndef TYPES_CONFIG_FILE
  - /* The name of the MIME types file */
  - #define TYPES_CONFIG_FILE "conf/mime.types"
  -+#endif
  - 
  -+#ifndef ACCESS_CONFIG_FILE
  - /* The name of the access file */
  - #define ACCESS_CONFIG_FILE "conf/access.conf"
  -+#endif
  - 
  - /* Whether we should enable rfc1413 identity checking */
  - #define DEFAULT_RFC1413 0
   
  
  
  
  No   revision
  
  
  No   revision
  
  
  1.286.2.63 +3 -0  apache/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache/src/CHANGES,v
  retrieving revision 1.286.2.62
  retrieving revision 1.286.2.63
  diff -u -r1.286.2.62 -r1.286.2.63
  --- CHANGES   1998/01/10 03:48:48 1.286.2.62
  +++ CHANGES   1998/01/14 00:00:37 1.286.2.63
  @@ -1,5 +1,8 @@
   Changes with Apache 1.2.6
   
  +  *) #ifdef wrap a few #defines in httpd.h to make life easier on
  + some ports.  [Ralf Engelschall]
  +
 *) Fix MPE compilation error in mod_usertrack.c.  [Mark Bixby]
  

cvs commit: apache/src CHANGES buff.c

[dgaudet]

dgaudet 98/01/13 16:02:57

  Modified:.Tag: APACHE_1_2_X STATUS
   src  Tag: APACHE_1_2_X CHANGES buff.c
  Log:
  fix chunking and rputc()/bputc()
  
  Reviewed by:  Martin Kraemer, Roy Fielding
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.1.2.12  +1 -5  apache/Attic/STATUS
  
  Index: STATUS
  ===
  RCS file: /export/home/cvs/apache/Attic/STATUS,v
  retrieving revision 1.1.2.11
  retrieving revision 1.1.2.12
  diff -u -r1.1.2.11 -r1.1.2.12
  --- STATUS1998/01/14 00:00:35 1.1.2.11
  +++ STATUS1998/01/14 00:02:52 1.1.2.12
  @@ -9,6 +9,7 @@
   * Martin's [PATCH]-1.2.6: avoid B_ERROR redeclaration
   * Mark Bixby's MPE port patch
   * more #define wrappers from FreeBSD port
  +* Dean's backport of the bputc()/chunking bugfix.
   
   Available:
   
  @@ -23,11 +24,6 @@
   * Ralf's mod_rewrite bugfix for %3f
see below
Status: Ralf +1, Dean +1, Roy +1
  -
  -* Dean's backport of the bputc()/chunking bugfix.
  - <[EMAIL PROTECTED]>
  - Status: Dean +1, Martin +1, Roy +1
  - This fix does fix Henrik's HTTP/1.1 chunking problem.
   
   * Marc's "headers too big" patch, repost it please?
   
  
  
  
  No   revision
  
  
  No   revision
  
  
  1.286.2.64 +4 -0  apache/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache/src/CHANGES,v
  retrieving revision 1.286.2.63
  retrieving revision 1.286.2.64
  diff -u -r1.286.2.63 -r1.286.2.64
  --- CHANGES   1998/01/14 00:00:37 1.286.2.63
  +++ CHANGES   1998/01/14 00:02:55 1.286.2.64
  @@ -1,5 +1,9 @@
   Changes with Apache 1.2.6
   
  +  *) Apache could generate improperly chunked HTTP/1.1 responses when
  + the bputc() or rputc() functions were used by modules (such as
  + mod_include).  [Dean Gaudet]
  +
 *) #ifdef wrap a few #defines in httpd.h to make life easier on
some ports.  [Ralf Engelschall]
   
  
  
  
  1.26.2.2  +8 -1  apache/src/buff.c
  
  Index: buff.c
  ===
  RCS file: /export/home/cvs/apache/src/buff.c,v
  retrieving revision 1.26.2.1
  retrieving revision 1.26.2.2
  diff -u -r1.26.2.1 -r1.26.2.2
  --- buff.c1997/08/07 08:41:46 1.26.2.1
  +++ buff.c1998/01/14 00:02:56 1.26.2.2
  @@ -584,9 +584,16 @@
   bflsbuf(int c, BUFF *fb)
   {
   char ss[1];
  +int rc;
   
   ss[0] = c;
  -return bwrite(fb, ss, 1);
  +rc = bwrite(fb, ss, 1);
  +/* We do start_chunk() here so that the bputc macro can be smaller
  + * and faster
  + */
  +if (rc == 1 && (fb->flags & B_CHUNK))
  + start_chunk(fb);
  +return rc;
   }
   
   /*
  
  
  

cvs commit: apache/src CHANGES mod_rewrite.c

[dgaudet]

dgaudet 98/01/13 16:05:01

  Modified:.Tag: APACHE_1_2_X STATUS
   src  Tag: APACHE_1_2_X CHANGES mod_rewrite.c
  Log:
  fix %3f problem in mod_rewrite
  
  Submitted by: Ralf Engelschall
  Reviewed by:  Dean Gaudet, Roy Fielding
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.1.2.13  +1 -30 apache/Attic/STATUS
  
  Index: STATUS
  ===
  RCS file: /export/home/cvs/apache/Attic/STATUS,v
  retrieving revision 1.1.2.12
  retrieving revision 1.1.2.13
  diff -u -r1.1.2.12 -r1.1.2.13
  --- STATUS1998/01/14 00:02:52 1.1.2.12
  +++ STATUS1998/01/14 00:04:56 1.1.2.13
  @@ -10,6 +10,7 @@
   * Mark Bixby's MPE port patch
   * more #define wrappers from FreeBSD port
   * Dean's backport of the bputc()/chunking bugfix.
  +* Ralf's mod_rewrite bugfix for %3f
   
   Available:
   
  @@ -21,10 +22,6 @@
Alternate solution already in 1.3.
Needs update against new mod_include.
   
  -* Ralf's mod_rewrite bugfix for %3f
  - see below
  - Status: Ralf +1, Dean +1, Roy +1
  -
   * Marc's "headers too big" patch, repost it please?
   
   * backport of the netscape header padding fix, it's needed for 255
  @@ -37,29 +34,3 @@
   * Some fix for the bogus byte ranges bug.
   
   * fix os_escape_path()
  -
  -Stuff from Ralf:
  -
  -* The following 1.2.5-adjusted bugfix for mod_rewrite.c 
  -  which fixes the "Location: http://host/bar%3fquery"; problem (the "?"
  -  is escaped but have not!)
  -
  -Index: mod_rewrite.c
  -===
  -RCS file: /e/apache/REPOS/apache/src/mod_rewrite.c,v
  -retrieving revision 1.28.2.3
  -diff -u -r1.28.2.3 mod_rewrite.c
  ---- mod_rewrite.c   1997/08/17 20:35:49 1.28.2.3
  -+++ mod_rewrite.c   1997/10/28 11:53:52
  -@@ -1590,6 +1590,7 @@
  - }
  - rewritelog(r, 2, "[per-dir %s] redirect %s -> %s", perdir, 
r->filename, newuri);
  - r->filename = pstrdup(r->pool, newuri);
  -+splitout_queryargs(r, p->flags & RULEFLAG_QSAPPEND);
  - r->status = p->forced_responsecode;
  - return 1;
  - }
  -
  -  For 1.3 this bugfix is different and already replaced by the new patch
  -  replacing the complete rewriting engine I'll post these days .
  -
  
  
  
  No   revision
  
  
  No   revision
  
  
  1.286.2.65 +3 -0  apache/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache/src/CHANGES,v
  retrieving revision 1.286.2.64
  retrieving revision 1.286.2.65
  diff -u -r1.286.2.64 -r1.286.2.65
  --- CHANGES   1998/01/14 00:02:55 1.286.2.64
  +++ CHANGES   1998/01/14 00:04:58 1.286.2.65
  @@ -1,5 +1,8 @@
   Changes with Apache 1.2.6
   
  +  *) mod_rewrite would not handle %3f properly in some situations.
  + [Ralf Engelschall]
  +
 *) Apache could generate improperly chunked HTTP/1.1 responses when
the bputc() or rputc() functions were used by modules (such as
mod_include).  [Dean Gaudet]
  
  
  
  1.28.2.4  +1 -0  apache/src/mod_rewrite.c
  
  Index: mod_rewrite.c
  ===
  RCS file: /export/home/cvs/apache/src/mod_rewrite.c,v
  retrieving revision 1.28.2.3
  retrieving revision 1.28.2.4
  diff -u -r1.28.2.3 -r1.28.2.4
  --- mod_rewrite.c 1997/08/17 20:35:49 1.28.2.3
  +++ mod_rewrite.c 1998/01/14 00:04:59 1.28.2.4
  @@ -1590,6 +1590,7 @@
   }
   rewritelog(r, 2, "[per-dir %s] redirect %s -> %s", perdir, 
r->filename, newuri);
   r->filename = pstrdup(r->pool, newuri);
  +splitout_queryargs(r, p->flags & RULEFLAG_QSAPPEND);
   r->status = p->forced_responsecode;
   return 1;
   }
  
  
  

cvs commit: apache/src CHANGES http_protocol.c

[dgaudet]

dgaudet 98/01/13 16:09:35

  Modified:.Tag: APACHE_1_2_X STATUS
   src  Tag: APACHE_1_2_X CHANGES http_protocol.c
  Log:
  netscape needs padding on the 255th byte as well as 256 and 257
  
  Reviewed by:  Martin Kraemer, Roy Fielding
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.1.2.14  +1 -5  apache/Attic/STATUS
  
  Index: STATUS
  ===
  RCS file: /export/home/cvs/apache/Attic/STATUS,v
  retrieving revision 1.1.2.13
  retrieving revision 1.1.2.14
  diff -u -r1.1.2.13 -r1.1.2.14
  --- STATUS1998/01/14 00:04:56 1.1.2.13
  +++ STATUS1998/01/14 00:09:30 1.1.2.14
  @@ -11,6 +11,7 @@
   * more #define wrappers from FreeBSD port
   * Dean's backport of the bputc()/chunking bugfix.
   * Ralf's mod_rewrite bugfix for %3f
  +* backport of the netscape header padding fix
   
   Available:
   
  @@ -23,11 +24,6 @@
Needs update against new mod_include.
   
   * Marc's "headers too big" patch, repost it please?
  -
  -* backport of the netscape header padding fix, it's needed for 255
  - as well as 256, 257 bytes
  - <[EMAIL PROTECTED]>
  - Status: Dean +1, Martin +1, Roy +1
   
   Needs patch:
   
  
  
  
  No   revision
  
  
  No   revision
  
  
  1.286.2.66 +4 -0  apache/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache/src/CHANGES,v
  retrieving revision 1.286.2.65
  retrieving revision 1.286.2.66
  diff -u -r1.286.2.65 -r1.286.2.66
  --- CHANGES   1998/01/14 00:04:58 1.286.2.65
  +++ CHANGES   1998/01/14 00:09:32 1.286.2.66
  @@ -1,5 +1,9 @@
   Changes with Apache 1.2.6
   
  +  *) It appears the "257th byte" bug (see
  + htdocs/manual/misc/known_client_problems.html#257th-byte) can happen
  + at the 256th byte as well.  Fixed.  [Dean Gaudet]
  +
 *) mod_rewrite would not handle %3f properly in some situations.
[Ralf Engelschall]
   
  
  
  
  1.126.2.7 +1 -1  apache/src/http_protocol.c
  
  Index: http_protocol.c
  ===
  RCS file: /export/home/cvs/apache/src/http_protocol.c,v
  retrieving revision 1.126.2.6
  retrieving revision 1.126.2.7
  diff -u -r1.126.2.6 -r1.126.2.7
  --- http_protocol.c   1997/08/15 17:08:51 1.126.2.6
  +++ http_protocol.c   1998/01/14 00:09:33 1.126.2.7
  @@ -1091,7 +1091,7 @@
   long int bs;
   
   bgetopt(client, BO_BYTECT, &bs);
  -if (bs == 256 || bs == 257)
  +if (bs >= 255 && bs <= 257)
   bputs("X-Pad: avoid browser bug\015\012", client);
   
   bputs("\015\012", client);/* Send the terminating empty line */
  
  
  

cvs commit: apachen ABOUT_APACHE

[coar]

coar98/01/13 19:27:37

  Modified:.ABOUT_APACHE
  Log:
Update ABOUT_APACHE text file to mention the AG core group
  
  Reviewed by:  Marc Slemko, Roy Fielding, Brian Behlendorg
  
  Revision  ChangesPath
  1.8   +29 -20apachen/ABOUT_APACHE
  
  Index: ABOUT_APACHE
  ===
  RCS file: /export/home/cvs/apachen/ABOUT_APACHE,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ABOUT_APACHE  1997/11/06 21:23:11 1.7
  +++ ABOUT_APACHE  1998/01/14 03:27:36 1.8
  @@ -3,7 +3,7 @@
   
http://www.apache.org/
   
  -   June 1997
  +  January 1998
   
   The Apache Project is a collaborative software development effort aimed
   at creating a robust, commercial-grade, featureful, and freely-available
  @@ -67,14 +67,14 @@
   
   
   
  -Current Apache Group in alphabetical order as of 1 November 1997:
  +Current Apache Group in alphabetical order as of 1 January 1998:
   
  Brian Behlendorf   Organic Online, California 
  -   Ken Coar   Process Software Corporation, New England, USA 
  +   Ken Coar   MeepZor Consulting, New England, USA 
  Mark J. CoxC2Net Europe, UK 
  Ralf S. EngelschallMunich, Germany.
  Roy T. FieldingUC Irvine, California 
  -   Dean GaudetSteam Tunnel Operations, California 
  +   Dean GaudetTransmeta Corporation, California 
  Rob HartillInternet Movie DB, UK 
  Jim Jagielski  jaguNET ISP, Maryland 
  Alexei Kosut   Stanford University, California 
  @@ -92,8 +92,8 @@
   
   Apache Emeritae (old group members now off doing other things)
   
  -   Robert S. Thau MIT, Massachusetts
  David Robinson Cambridge University, UK
  +   Robert S. Thau MIT, Massachusetts
  
   Other major contributors
   
  @@ -120,16 +120,18 @@
   
   
   
  -How to join the Apache Group
  +How to become involved in the Apache project
   
   There are several levels of contributing.  If you just want to send
   in an occasional suggestion/fix, then you can just use the bug reporting
  -form at .  You can also subscribe to the
  -announcements mailing list ([EMAIL PROTECTED]) which we use to
  -broadcast information about new releases, bugfixes, and upcoming events.
  +form at .  You can also subscribe
  +to the announcements mailing list ([EMAIL PROTECTED]) which we
  +use to broadcast information about new releases, bugfixes, and upcoming
  +events.  There's a lot of information about the development process (much
  +of it in serious need of updating) to be found at .
   
  -If you'd like to become an active member of the Apache Group (the group
  -of volunteers who vote on changes to the distributed server), then
  +If you'd like to become an active contributor to the Apache project (the
  +group of volunteers who vote on changes to the distributed server), then
   you need to start by subscribing to the new-httpd@apache.org mailing list.
   One warning though: traffic is high, 1000 to 1500 messages/month.
   To subscribe to the list, send "subscribe new-httpd" in the body of
  @@ -142,9 +144,17 @@
  directions.  If you have user/configuration questions, send them
  to the USENET newsgroup "comp.infosystems.www.servers.unix".
   
  -The Apache Group is a meritocracy -- the more work you have done, the more
  +There is a core group of contributors (informally called the "core")
  +which was formed from the project founders and is augmented from time
  +to time when core members nominate outstanding contributors and the
  +rest of the core members agree.  The core group focus is more on
  +"business" issues and limited-circulation things like security problems
  +than on mainstream code development.  The term "The Apache Group"
  +technically refers to this core of project contributors.
  +
  +The Apache project is a meritocracy -- the more work you have done, the more
   you are allowed to do.  The group founders set the original rules, but
  -they can be changed by vote of the active members.  There is a core group
  +they can be changed by vote of the active members.  There is a group
   of people who have logins on our server (hyperreal.org) and access to the
   CVS repository.  Everyone has access to the CVS snapshots.  Changes to
   the code are proposed on the mailing list and usually voted on by active
  @@ -157,20 +167,19 @@
   tone. We discuss new features to add, bug fixes, user problems, developments
   in the web server community, release dates, etc.  The actual code deve

cvs commit: apachen ABOUT_APACHE

[coar]

coar98/01/13 20:03:30

  Modified:.ABOUT_APACHE
  Log:
Argh.  Command says "unified" but description still said "context".
  
  Revision  ChangesPath
  1.9   +1 -1  apachen/ABOUT_APACHE
  
  Index: ABOUT_APACHE
  ===
  RCS file: /export/home/cvs/apachen/ABOUT_APACHE,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ABOUT_APACHE  1998/01/14 03:27:36 1.8
  +++ ABOUT_APACHE  1998/01/14 04:03:29 1.9
  @@ -167,7 +167,7 @@
   tone. We discuss new features to add, bug fixes, user problems, developments
   in the web server community, release dates, etc.  The actual code development
   takes place on the developers' local machines, with proposed changes
  -communicated using a patch (output of a context "diff -u oldfile newfile"
  +communicated using a patch (output of a unified "diff -u oldfile newfile"
   command), and committed to the source repository by one of the core
   developers using remote CVS.  Anyone on the mailing list can vote on a
   particular issue, but we only count those made by active members or people
  
  
  

cvs commit: apachen STATUS

[jim]

jim 98/01/14 06:34:30

  Modified:.STATUS
  Log:
  It was a dark and stormy night. Suddenly a shot rang out! Lightning
  flashed and a woman cried out. Another vote!
  
  Revision  ChangesPath
  1.89  +1 -1  apachen/STATUS
  
  Index: STATUS
  ===
  RCS file: /export/home/cvs/apachen/STATUS,v
  retrieving revision 1.88
  retrieving revision 1.89
  diff -u -r1.88 -r1.89
  --- STATUS1998/01/13 23:51:53 1.88
  +++ STATUS1998/01/14 14:34:28 1.89
  @@ -86,7 +86,7 @@
   
   * Dean's [PATCH] protect the environment
<[EMAIL PROTECTED]>
  - Status: Dean +1, Martin +1
  + Status: Dean +1, Martin +1, Jim +1
   
   * Dean's [PATCH] MONCONTROL for profiling children
<[EMAIL PROTECTED]>
  
  
  

cvs commit: apachen STATUS

[coar]

coar98/01/14 07:38:39

  Modified:.STATUS
  Log:
Clear and sunny, though cold.
  
  Revision  ChangesPath
  1.90  +3 -2  apachen/STATUS
  
  Index: STATUS
  ===
  RCS file: /export/home/cvs/apachen/STATUS,v
  retrieving revision 1.89
  retrieving revision 1.90
  diff -u -r1.89 -r1.90
  --- STATUS1998/01/14 14:34:28 1.89
  +++ STATUS1998/01/14 15:38:38 1.90
  @@ -176,13 +176,14 @@
 voting through cvs, by creating a directory under the source tree
 and putting them there?  Please vote.
<[EMAIL PROTECTED]>
  - Status: Ken +1
  + Status: Ken +1, Randy 0, Dean 0, Jim +1, Paul 0
   
   * Ken's [POLL] experiment with commit-then-review
 Shall we permit unreviewed commits to the source tree?  (Details
 of when it's [in]appropriate to be worked out later.)  Vote, please.
<[EMAIL PROTECTED]>
  - Status: Ken +1
  + Status: Ken +1, Randy +1, Ben +1, Martin +1, Dean +1, Brian +1,
  + Jim +1, Rob +1, Paul 0, Ralf +1
   
   * Paul would like to see a 'gdbm' option because he uses
 it a lot. Dean notes that 'gdbm' include 'db' support
  
  
  

cvs commit: apachen STATUS

[coar]

coar98/01/14 08:41:36

  Modified:.STATUS
  Log:
Add update on the status of the great commit/review debate.
  
  Revision  ChangesPath
  1.91  +8 -7  apachen/STATUS
  
  Index: STATUS
  ===
  RCS file: /export/home/cvs/apachen/STATUS,v
  retrieving revision 1.90
  retrieving revision 1.91
  diff -u -r1.90 -r1.91
  --- STATUS1998/01/14 15:38:38 1.90
  +++ STATUS1998/01/14 16:41:34 1.91
  @@ -169,21 +169,22 @@
Ken says he'll try to maintain it, since there are
people/places who need it
   
  +* The decision has been made to experiment with allowing code
  +  changes to be committed without prior review.  Specific guidelines
  +  and implementation date to be worked out.
  +
   Open issues:
   
  +* Guidelines for when prior review is required if commit-then-review
  +  is the normal mode of operation.  Roy has started covering the
  +  whole process in .
  +
   * Ken's [POLL] apachen/patches directory
 Shall we experiment with allowing patches to be distributed for
 voting through cvs, by creating a directory under the source tree
 and putting them there?  Please vote.
<[EMAIL PROTECTED]>
Status: Ken +1, Randy 0, Dean 0, Jim +1, Paul 0
  -
  -* Ken's [POLL] experiment with commit-then-review
  -  Shall we permit unreviewed commits to the source tree?  (Details
  -  of when it's [in]appropriate to be worked out later.)  Vote, please.
  - <[EMAIL PROTECTED]>
  - Status: Ken +1, Randy +1, Ben +1, Martin +1, Dean +1, Brian +1,
  - Jim +1, Rob +1, Paul 0, Ralf +1
   
   * Paul would like to see a 'gdbm' option because he uses
 it a lot. Dean notes that 'gdbm' include 'db' support
  
  
  

cvs commit: apachen/src/main util_script.c

[dgaudet]

dgaudet 98/01/14 13:01:09

  Modified:.STATUS
   src  CHANGES
   src/main util_script.c
  Log:
  protect environment variable names from having bad things in them
  
  Reviewed by:  Martin Kraemer, Jim Jagielski
  
  Revision  ChangesPath
  1.92  +1 -4  apachen/STATUS
  
  Index: STATUS
  ===
  RCS file: /export/home/cvs/apachen/STATUS,v
  retrieving revision 1.91
  retrieving revision 1.92
  diff -u -r1.91 -r1.92
  --- STATUS1998/01/14 16:41:34 1.91
  +++ STATUS1998/01/14 21:01:03 1.92
  @@ -81,12 +81,9 @@
   * Dean's [PATCH] make mod_rewrite use ap_cpystrn
   * Martin's [PORT] Make apache compile & run on an EBCDIC mainframe
   * Martin's [PATCH] mod_speling [300] Multiple Choices bug (Take 2)
  +* Dean's [PATCH] protect the environment
   
   Available Patches:
  -
  -* Dean's [PATCH] protect the environment
  - <[EMAIL PROTECTED]>
  - Status: Dean +1, Martin +1, Jim +1
   
   * Dean's [PATCH] MONCONTROL for profiling children
<[EMAIL PROTECTED]>
  
  
  
  1.566 +9 -0  apachen/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apachen/src/CHANGES,v
  retrieving revision 1.565
  retrieving revision 1.566
  diff -u -r1.565 -r1.566
  --- CHANGES   1998/01/13 23:29:10 1.565
  +++ CHANGES   1998/01/14 21:01:06 1.566
  @@ -1,5 +1,14 @@
   Changes with Apache 1.3b4
   
  +  *) For maximum portability, the environment passed to CGIs should
  + only contain variables whose names match the regex
  + /[a-zA-Z][a-zA-Z0-9_]*/.  This is now enforced by stamping
  + underscores over any character outside the regex.  This
  + affects HTTP_* variables, in a way that should be backward
  + compatible for all the standard headers; and affects variables
  + set with SetEnv/BrowserMatch and similar directives.
  + [Dean Gaudet]
  +
 *) Mod_speling returned incorrect HREF's when an ambigous match
was found. Noticed by <[EMAIL PROTECTED]> (Soeren Ziehe)
[EMAIL PROTECTED] (Soeren Ziehe), Martin Kraemer]
  
  
  
  1.91  +19 -4 apachen/src/main/util_script.c
  
  Index: util_script.c
  ===
  RCS file: /export/home/cvs/apachen/src/main/util_script.c,v
  retrieving revision 1.90
  retrieving revision 1.91
  diff -u -r1.90 -r1.91
  --- util_script.c 1998/01/11 20:55:19 1.90
  +++ util_script.c 1998/01/14 21:01:08 1.91
  @@ -129,11 +129,14 @@
   char *res = pstrcat(a, "HTTP_", w, NULL);
   char *cp = res;
   
  -while (*++cp)
  - if (*cp == '-')
  +while (*++cp) {
  + if (!isalnum(*cp) && *cp != '_') {
*cp = '_';
  - else
  + }
  + else {
*cp = toupper(*cp);
  + }
  +}
   
   return res;
   }
  @@ -145,6 +148,7 @@
   char **env = (char **) palloc(p, (env_arr->nelts + 2) * sizeof(char *));
   int i, j;
   char *tz;
  +char *whack;
   
   j = 0;
   tz = getenv("TZ");
  @@ -153,7 +157,18 @@
   for (i = 0; i < env_arr->nelts; ++i) {
if (!elts[i].key)
continue;
  - env[j++] = pstrcat(p, elts[i].key, "=", elts[i].val, NULL);
  + env[j] = pstrcat(p, elts[i].key, "=", elts[i].val, NULL);
  + whack = env[j];
  + if (isdigit(*whack)) {
  + *whack++ = '_';
  + }
  + while (*whack != '=') {
  + if (!isalnum(*whack) && *whack != '_') {
  + *whack = '_';
  + }
  + ++whack;
  + }
  + ++j;
   }
   
   env[j] = NULL;