bnicholes | 1 Oct 2003 19:10
Picon
Favicon

cvs commit: httpd-2.0/modules/proxy mod_proxy.c

bnicholes    2003/10/01 10:10:48

  Modified:    modules/proxy Tag: APACHE_2_0_BRANCH mod_proxy.c
  Log:
  Check to make sure that there is a file name before sending it to strncmp().  This
  fixes a page fault on NetWare when using mod_proxy with mod_cache.

  Revision  Changes    Path
  No                   revision
  No                   revision
  1.90.2.3  +2 -2      httpd-2.0/modules/proxy/mod_proxy.c

  Index: mod_proxy.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/proxy/mod_proxy.c,v
  retrieving revision 1.90.2.2
  retrieving revision 1.90.2.3
  diff -u -r1.90.2.2 -r1.90.2.3
  --- mod_proxy.c	22 Feb 2003 18:38:13 -0000	1.90.2.2
  +++ mod_proxy.c	1 Oct 2003 17:10:48 -0000	1.90.2.3
   <at>  <at>  -275,7 +275,7  <at>  <at> 
       char *url, *p;
       int access_status;

  -    if (!r->proxyreq || strncmp(r->filename, "proxy:", 6) != 0)
  +    if (!r->proxyreq || !r->filename || strncmp(r->filename, "proxy:", 6) != 0)
           return DECLINED;

       /* XXX: Shouldn't we try this before we run the proxy_walk? */
   <at>  <at>  -351,7 +351,7  <at>  <at> 
(Continue reading)

trawick | 2 Oct 2003 13:58
Picon
Favicon

cvs commit: httpd-2.0/modules/generators mod_cgid.c

trawick     2003/10/02 04:58:57

  Modified:    .        CHANGES
               modules/generators mod_cgid.c
  Log:
  mod_cgid: fix a hash table corruption problem which could
  result in the wrong script being cleaned up at the end of a
  request.

  Unique storage was not used for the key, as the code assumed
  incorrectly that apr_hash_set() made a copy of the key.  Thus,
  when the script pid was looked up at the end of the request,
  some other script's pid could be found.

  Revision  Changes    Path
  1.1289    +4 -0      httpd-2.0/CHANGES

  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.1288
  retrieving revision 1.1289
  diff -u -r1.1288 -r1.1289
  --- CHANGES	30 Sep 2003 17:45:54 -0000	1.1288
  +++ CHANGES	2 Oct 2003 11:58:56 -0000	1.1289
   <at>  <at>  -2,6 +2,10  <at>  <at> 

     [Remove entries to the current 2.0 section below, when backported]

  +  *) mod_cgid: fix a hash table corruption problem which could
(Continue reading)

trawick | 2 Oct 2003 16:35
Picon
Favicon

cvs commit: httpd-2.0 STATUS

trawick     2003/10/02 07:35:17

  Modified:    .        Tag: APACHE_2_0_BRANCH STATUS
  Log:
  propose another merge

  Revision  Changes    Path
  No                   revision
  No                   revision
  1.751.2.492 +7 -1      httpd-2.0/STATUS

  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.491
  retrieving revision 1.751.2.492
  diff -u -r1.751.2.491 -r1.751.2.492
  --- STATUS	30 Sep 2003 17:41:58 -0000	1.751.2.491
  +++ STATUS	2 Oct 2003 14:35:17 -0000	1.751.2.492
   <at>  <at>  -270,6 +270,12  <at>  <at> 
           modules/generators/mod_info.c r1.151
         +1: trawick

  +    * mod_cgid: fix a hash table corruption problem which could
  +      result in the wrong script being cleaned up at the end of a
  +      request.
  +        modules/generators/mod_cgid.c r1.157
  +      +1: trawick, stoddard
  +
   CURRENT RELEASE NOTES:
(Continue reading)

soldis | 6 Oct 2003 14:10
Picon
Favicon

cvs commit: httpd-2.0/docs/manual/vhosts index.xml.ru index.html.ru.koi8-r index.html

soldis      2003/10/06 05:10:56

  Modified:    docs/manual/vhosts Tag: APACHE_2_0_BRANCH index.html
  Added:       docs/manual/vhosts Tag: APACHE_2_0_BRANCH index.xml.ru
                        index.html.ru.koi8-r
  Log:
  New document translated and reviewed: vhosts/index.xml. Original revision: 1.3.2.7

  Revision  Changes    Path
  No                   revision
  No                   revision
  1.11.2.2  +4 -0      httpd-2.0/docs/manual/vhosts/index.html

  Index: index.html
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/vhosts/index.html,v
  retrieving revision 1.11.2.1
  retrieving revision 1.11.2.2
  diff -u -r1.11.2.1 -r1.11.2.2
  --- index.html	5 Jul 2003 20:37:07 -0000	1.11.2.1
  +++ index.html	6 Oct 2003 12:10:56 -0000	1.11.2.2
   <at>  <at>  -13,3 +13,7  <at>  <at> 
   URI: index.html.ko.euc-kr
   Content-Language: ko
   Content-type: text/html; charset=EUC-KR
  +
  +URI: index.html.ru.koi8-r
  +Content-Language: ru
  +Content-type: text/html; charset=KOI8-R

(Continue reading)

soldis | 6 Oct 2003 14:13
Picon
Favicon

cvs commit: httpd-2.0/docs/manual/vhosts index.xml.meta

soldis      2003/10/06 05:13:24

  Modified:    docs/manual/vhosts Tag: APACHE_2_0_BRANCH index.xml.meta
  Log:

  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.1.2.4   +1 -0      httpd-2.0/docs/manual/vhosts/index.xml.meta

  Index: index.xml.meta
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/vhosts/index.xml.meta,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  --- index.xml.meta	10 May 2003 16:50:24 -0000	1.1.2.3
  +++ index.xml.meta	6 Oct 2003 12:13:24 -0000	1.1.2.4
   <at>  <at>  -10,5 +10,6  <at>  <at> 
       <variant>en</variant>
       <variant>ja</variant>
       <variant>ko</variant>
  +    <variant>ru</variant>
     </variants>
   </metafile>

trawick | 8 Oct 2003 20:52
Picon
Favicon

cvs commit: httpd-2.0/docs/conf .cvsignore

trawick     2003/10/08 11:52:35

  Modified:    docs/conf Tag: APACHE_2_0_BRANCH .cvsignore
  Log:
  ignore generated file ssl-std.conf

  Revision  Changes    Path
  No                   revision
  No                   revision
  1.3.2.1   +1 -0      httpd-2.0/docs/conf/.cvsignore

  Index: .cvsignore
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/conf/.cvsignore,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- .cvsignore	15 Apr 2002 00:44:30 -0000	1.3
  +++ .cvsignore	8 Oct 2003 18:52:35 -0000	1.3.2.1
   <at>  <at>  -1 +1,2  <at>  <at> 
   httpd-std.conf
  +ssl-std.conf

jwoolley | 10 Oct 2003 05:50
Picon
Favicon

cvs commit: httpd-2.0/docs/icons README

jwoolley    2003/10/09 20:50:03

  Modified:    docs/icons Tag: APACHE_2_0_BRANCH README
  Log:
  Fix a typo

  PR: 23713
  Submitted by: millenix <at> zemos.net

  Revision  Changes    Path
  No                   revision
  No                   revision
  1.1.2.1   +1 -1      httpd-2.0/docs/icons/README

  Index: README
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/icons/README,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -d -u -r1.1 -r1.1.2.1
  --- README	24 Aug 1999 05:33:47 -0000	1.1
  +++ README	10 Oct 2003 03:50:03 -0000	1.1.2.1
   <at>  <at>  -43,7 +43,7  <at>  <at> 
             This can be used as a placeholder or a spacing element.

        bomb.gif
  -          This can be used to repreesnt core files.
  +          This can be used to represent core files.

        box1.gif, box2.gif
(Continue reading)

jwoolley | 10 Oct 2003 05:50
Picon
Favicon

cvs commit: httpd-2.0/docs/icons README

jwoolley    2003/10/09 20:50:58

  Modified:    docs/icons README
  Log:
  fix a typo

  PR: 23713
  Submitted by: millenix <at> zemos.net

  Revision  Changes    Path
  1.2       +1 -1      httpd-2.0/docs/icons/README

  Index: README
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/icons/README,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -d -u -r1.1 -r1.2
  --- README	24 Aug 1999 05:33:47 -0000	1.1
  +++ README	10 Oct 2003 03:50:58 -0000	1.2
   <at>  <at>  -43,7 +43,7  <at>  <at> 
             This can be used as a placeholder or a spacing element.

        bomb.gif
  -          This can be used to repreesnt core files.
  +          This can be used to represent core files.

        box1.gif, box2.gif
             These icons can be used to represent generic 3D applications and

(Continue reading)

trawick | 10 Oct 2003 11:19
Picon
Favicon

cvs commit: httpd-2.0/modules/experimental mod_example.c

trawick     2003/10/10 02:19:12

  Modified:    modules/experimental mod_example.c
  Log:
  add map_to_storage hook to mod_example

  Submitted by: Geoffrey Young <geoff <at> modperlcookbook.org>
  Reviewed by:  Jeff Trawick

  Revision  Changes    Path
  1.43      +23 -0     httpd-2.0/modules/experimental/mod_example.c

  Index: mod_example.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/experimental/mod_example.c,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- mod_example.c	3 Feb 2003 17:53:00 -0000	1.42
  +++ mod_example.c	10 Oct 2003 09:19:12 -0000	1.43
   <at>  <at>  -1096,6 +1096,28  <at>  <at> 
   }

   /*
  + * This routine maps r->filename to a physical file on disk.  Useful for
  + * overriding default core behavior, including skipping mapping for
  + * requests that are not file based.
  + *
  + * The return value is OK, DECLINED, or HTTP_mumble.  If we return OK, no
  + * further modules are called for this phase.
(Continue reading)

wrowe | 10 Oct 2003 18:05
Picon
Favicon

cvs commit: httpd-2.0 Apache.dsp

wrowe       2003/10/10 09:05:01

  Modified:    .        Tag: APACHE_2_0_BRANCH Apache.dsp
  Log:
    Dunno why I never committed this in the last round of msvc project file fixes,
    but the source .pdb debugging database shouldn't be the same as the linker
    output for .pdb distribution.

  Revision  Changes    Path
  No                   revision
  No                   revision
  1.25.2.6  +2 -2      httpd-2.0/Apache.dsp

  Index: Apache.dsp
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/Apache.dsp,v
  retrieving revision 1.25.2.5
  retrieving revision 1.25.2.6
  diff -u -r1.25.2.5 -r1.25.2.6
  --- Apache.dsp	11 Mar 2003 01:07:59 -0000	1.25.2.5
  +++ Apache.dsp	10 Oct 2003 16:05:01 -0000	1.25.2.6
   <at>  <at>  -42,7 +42,7  <at>  <at> 
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "SHARED_MODULE" /FD /c
  -# ADD CPP /nologo /MD /W3 /Zi /O2 /I "./include" /I "./srclib/apr/include" /I
"./srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /Fd"Release\Apache" /FD /c
  +# ADD CPP /nologo /MD /W3 /Zi /O2 /I "./include" /I "./srclib/apr/include" /I
"./srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /Fd"Release\Apache_src" /FD /c
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
(Continue reading)


Gmane