date:20030920

[PHP-CVS-DAILY] cvs: php-src / ChangeLog

2003-09-20 Thread changelog

changelog   Sat Sep 20 20:32:00 2003 EDT

  Modified files:  
/php-srcChangeLog 
  Log:
  ChangeLog update
  
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.1393 php-src/ChangeLog:1.1394
--- php-src/ChangeLog:1.1393Fri Sep 19 20:32:02 2003
+++ php-src/ChangeLog   Sat Sep 20 20:31:58 2003
@@ -1,3 +1,59 @@
+2003-09-20  Sascha Schumann  [EMAIL PROTECTED]
+
+* ext/standard/string.c:
+  MFB Avoid zero-length keys which result in a spinning process
+
+* (PHP_4_3)
+  ext/standard/string.c:
+  Avoid zero-length keys which result in a spinning process
+
+2003-09-20  Marcus Boerger  [EMAIL PROTECTED]
+
+* ZendEngine2/zend_reflection_api.c:
+  Add public array Reflection_Class::getDefaultProperties()
+
+2003-09-20  Sascha Schumann  [EMAIL PROTECTED]
+
+* sapi/thttpd/thttpd_patch
+  sapi/thttpd/thttpd_patch
+  sapi/thttpd/thttpd_patch:
+  Fix potential buffer overrun
+
+2003-09-20  Jani Taskinen  [EMAIL PROTECTED]
+
+* win32/glob.c:
+  Nuke compile warnings
+
+2003-09-20  Ilia Alshanetsky  [EMAIL PROTECTED]
+
+* (PHP_4_3)
+  NEWS
+  ext/standard/dir.c:
+  MFH: Fixed bug #25583 (Incorrect handling of paths starting with / on win32
+  inside glob() function).
+
+* ext/standard/dir.c:
+  Fixed bug #25583 (Incorrect handling of paths starting with / on win32
+  inside glob() function).
+
+* (PHP_4_3)
+  TSRM/tsrm_virtual_cwd.h:
+  Revert previous patch.
+
+* TSRM/tsrm_virtual_cwd.h:
+  Revert patch r1.40, bug is in glob() not IS_ABSOLUTE_PATH()
+
+* (PHP_4_3)
+  NEWS:
+  Bug fixing news.
+
+* (PHP_4_3)
+  TSRM/tsrm_virtual_cwd.h:
+  MFH: Fixed bug #25583 (Incorrect handling of absolute path without drive).
+
+* TSRM/tsrm_virtual_cwd.h:
+  Fixed bug #25583 (Incorrect handling of absolute path without drive).
+
 2003-09-19  Tomas V.V.Cox  [EMAIL PROTECTED]
 
 * pear/docs/rfc01_PEAR_pecl-binaries.txt:

[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog

2003-09-20 Thread changelog

changelog   Sat Sep 20 20:32:02 2003 EDT

  Modified files:  
/ZendEngine2ChangeLog 
  Log:
  ChangeLog update
  
Index: ZendEngine2/ChangeLog
diff -u ZendEngine2/ChangeLog:1.306 ZendEngine2/ChangeLog:1.307
--- ZendEngine2/ChangeLog:1.306 Thu Sep 18 20:33:52 2003
+++ ZendEngine2/ChangeLog   Sat Sep 20 20:32:02 2003
@@ -1,3 +1,8 @@
+2003-09-20  Marcus Boerger  [EMAIL PROTECTED]
+
+* zend_reflection_api.c:
+  Add public array Reflection_Class::getDefaultProperties()
+
 2003-09-18  Marcus Boerger  [EMAIL PROTECTED]
 
 * zend_builtin_functions.c:
@@ -1644,7 +1649,7 @@
 2003-06-10  Jani Taskinen  [EMAIL PROTECTED]
 
 * zend_multiply.h:
-  - Missing $Id: ChangeLog,v 1.306 2003/09/19 00:33:52 changelog Exp $ tag
+  - Missing $Id: ChangeLog,v 1.307 2003/09/21 00:32:02 changelog Exp $ tag
 
 2003-06-10  James Cox  [EMAIL PROTECTED]
 
@@ -3368,7 +3373,7 @@
   zend_types.h
   zend_variables.c
   zend_variables.h:
-  - Added some missing CVS $Id: ChangeLog,v 1.306 2003/09/19 00:33:52 changelog 
Exp $ tags, headers and footers.
+  - Added some missing CVS $Id: ChangeLog,v 1.307 2003/09/21 00:32:02 changelog 
Exp $ tags, headers and footers.
 
 2003-01-30  Ilia Alshanetsky  [EMAIL PROTECTED]

[PHP-CVS] cvs: php-src(PHP_4_3) /sapi/thttpd thttpd_patch

2003-09-20 Thread Sascha Schumann

sas Sat Sep 20 08:44:13 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/sapi/thttpdthttpd_patch 
  Log:
  Fix potential buffer overrun
  
  
Index: php-src/sapi/thttpd/thttpd_patch
diff -u php-src/sapi/thttpd/thttpd_patch:1.31.2.12 
php-src/sapi/thttpd/thttpd_patch:1.31.2.13
--- php-src/sapi/thttpd/thttpd_patch:1.31.2.12  Mon Jun 16 15:11:44 2003
+++ php-src/sapi/thttpd/thttpd_patchSat Sep 20 08:44:13 2003
@@ -1,6 +1,6 @@
 diff -ur thttpd-2.21b/Makefile.in thttpd-2.21b-cool/Makefile.in
 --- thttpd-2.21b/Makefile.in   Thu Mar 29 20:36:21 2001
-+++ thttpd-2.21b-cool/Makefile.in  Mon Jun 16 21:08:05 2003
 thttpd-2.21b-cool/Makefile.in  Sat Sep 20 14:43:20 2003
 @@ -46,13 +46,15 @@
  
  # You shouldn't need to edit anything below here.
@@ -40,7 +40,7 @@
  
 diff -ur thttpd-2.21b/config.h thttpd-2.21b-cool/config.h
 --- thttpd-2.21b/config.h  Mon Apr  9 23:57:36 2001
-+++ thttpd-2.21b-cool/config.h Mon Jun 16 21:08:05 2003
 thttpd-2.21b-cool/config.h Sat Sep 20 14:43:20 2003
 @@ -82,6 +82,11 @@
  */
  #define IDLE_READ_TIMELIMIT 60
@@ -64,7 +64,7 @@
  ** index pages for directories that don't have an explicit index file.
 diff -ur thttpd-2.21b/configure thttpd-2.21b-cool/configure
 --- thttpd-2.21b/configure Sat Apr 21 02:07:14 2001
-+++ thttpd-2.21b-cool/configureMon Jun 16 21:08:05 2003
 thttpd-2.21b-cool/configureSat Sep 20 14:43:20 2003
 @@ -1021,7 +1021,7 @@
  fi
  echo $ac_t$CPP 16
@@ -76,7 +76,7 @@
  echo $ac_n checking for $ac_hdr... $ac_c 16
 diff -ur thttpd-2.21b/configure.in thttpd-2.21b-cool/configure.in
 --- thttpd-2.21b/configure.in  Sat Apr 21 02:06:23 2001
-+++ thttpd-2.21b-cool/configure.in Mon Jun 16 21:08:05 2003
 thttpd-2.21b-cool/configure.in Sat Sep 20 14:43:20 2003
 @@ -64,7 +64,7 @@
AC_MSG_RESULT(no)   
  fi
@@ -88,7 +88,7 @@
  
 diff -ur thttpd-2.21b/fdwatch.c thttpd-2.21b-cool/fdwatch.c
 --- thttpd-2.21b/fdwatch.c Fri Apr 13 07:36:08 2001
-+++ thttpd-2.21b-cool/fdwatch.cMon Jun 16 21:08:05 2003
 thttpd-2.21b-cool/fdwatch.cSat Sep 20 14:43:20 2003
 @@ -419,6 +419,7 @@
  if ( pollfds == (struct pollfd*) 0 || poll_fdidx == (int*) 0 ||
 poll_rfdidx == (int*) 0 )
@@ -119,7 +119,7 @@
  }
 diff -ur thttpd-2.21b/libhttpd.c thttpd-2.21b-cool/libhttpd.c
 --- thttpd-2.21b/libhttpd.cTue Apr 24 00:42:40 2001
-+++ thttpd-2.21b-cool/libhttpd.c   Mon Jun 16 21:09:31 2003
 thttpd-2.21b-cool/libhttpd.c   Sat Sep 20 14:43:29 2003
 @@ -56,6 +56,10 @@
  #include unistd.h
  #include stdarg.h
@@ -383,6 +383,15 @@
  (void) my_snprintf( buf, sizeof(buf),
HTMLHEADTITLE%d %s/TITLE/HEAD\nBODY BGCOLOR=\#cc\H2%d 
%s/H2\n,
status, title, status, title );
+@@ -764,7 +844,7 @@
+ char* cp2;
+ 
+ for ( cp1 = str, cp2 = dfstr;
+-*cp1 != '\0'  cp2 - dfstr  dfsize - 1;
++*cp1 != '\0'  cp2 - dfstr  dfsize - 5;
+ ++cp1, ++cp2 )
+   {
+   switch ( *cp1 )
 @@ -834,7 +914,7 @@
  fp = fopen( filename, r );
  if ( fp == (FILE*) 0 )
@@ -964,7 +973,7 @@
str[0] = '?';
 diff -ur thttpd-2.21b/libhttpd.h thttpd-2.21b-cool/libhttpd.h
 --- thttpd-2.21b/libhttpd.hTue Apr 24 00:36:50 2001
-+++ thttpd-2.21b-cool/libhttpd.h   Mon Jun 16 21:09:00 2003
 thttpd-2.21b-cool/libhttpd.h   Sat Sep 20 14:43:20 2003
 @@ -69,6 +69,8 @@
  char* server_hostname;
  int port;
@@ -1026,7 +1035,7 @@
  ** mallocced strings.
 diff -ur thttpd-2.21b/mime_encodings.txt thttpd-2.21b-cool/mime_encodings.txt
 --- thttpd-2.21b/mime_encodings.txtWed May 10 03:22:28 2000
-+++ thttpd-2.21b-cool/mime_encodings.txt   Mon Jun 16 21:08:05 2003
 thttpd-2.21b-cool/mime_encodings.txt   Sat Sep 20 14:43:20 2003
 @@ -3,6 +3,6 @@
  # A list of file extensions followed by the corresponding MIME encoding.
  # Extensions not found in the table proceed to the mime_types table.
@@ -1038,7 +1047,7 @@
  uux-uuencode
 diff -ur thttpd-2.21b/mime_types.txt thttpd-2.21b-cool/mime_types.txt
 --- thttpd-2.21b/mime_types.txtSat Apr 14 04:53:30 2001
-+++ thttpd-2.21b-cool/mime_types.txt   Mon Jun 16 21:08:05 2003
 thttpd-2.21b-cool/mime_types.txt   Sat Sep 20 14:43:20 2003
 @@ -1,135 +1,138 @@
 -# mime_types.txt
 -#
@@ -1289,7 +1298,7 @@
 +ice   x-conference/x-cooltalk
 diff -ur thttpd-2.21b/mmc.c thttpd-2.21b-cool/mmc.c
 --- thttpd-2.21b/mmc.c Fri Apr 13 23:02:15 2001
-+++ thttpd-2.21b-cool/mmc.cMon Jun 16 21:08:05 2003
 thttpd-2.21b-cool/mmc.cSat Sep 20 14:43:20 2003
 @@ -70,6 +70,9 @@
  unsigned int hash;
  int hash_idx;
@@ -1392,7 +1401,7 @@
else
 diff -ur thttpd-2.21b/mmc.h thttpd-2.21b-cool/mmc.h
 --- thttpd-2.21b/mmc.h Fri Apr 13 07:36:54 2001
-+++ thttpd-2.21b-cool/mmc.hMon Jun 16 21:08:05 2003
 thttpd-2.21b-cool/mmc.hSat Sep 20 14:43:20 2003
 @@ -31,8 +31,9 @@
  /* Returns an mmap()ed area for the given file, or (void*) 0 on errors.
  ** If you

[PHP-CVS] cvs: php-src(PHP_4) /sapi/thttpd thttpd_patch

2003-09-20 Thread Sascha Schumann

sas Sat Sep 20 08:44:52 2003 EDT

  Modified files:  (Branch: PHP_4)
/php-src/sapi/thttpdthttpd_patch 
  Log:
  Fix potential buffer overrun
  
  
Index: php-src/sapi/thttpd/thttpd_patch
diff -u php-src/sapi/thttpd/thttpd_patch:1.31.2.12 
php-src/sapi/thttpd/thttpd_patch:1.31.2.12.2.1
--- php-src/sapi/thttpd/thttpd_patch:1.31.2.12  Mon Jun 16 15:11:44 2003
+++ php-src/sapi/thttpd/thttpd_patchSat Sep 20 08:44:51 2003
@@ -1,6 +1,6 @@
 diff -ur thttpd-2.21b/Makefile.in thttpd-2.21b-cool/Makefile.in
 --- thttpd-2.21b/Makefile.in   Thu Mar 29 20:36:21 2001
-+++ thttpd-2.21b-cool/Makefile.in  Mon Jun 16 21:08:05 2003
 thttpd-2.21b-cool/Makefile.in  Sat Sep 20 14:43:20 2003
 @@ -46,13 +46,15 @@
  
  # You shouldn't need to edit anything below here.
@@ -40,7 +40,7 @@
  
 diff -ur thttpd-2.21b/config.h thttpd-2.21b-cool/config.h
 --- thttpd-2.21b/config.h  Mon Apr  9 23:57:36 2001
-+++ thttpd-2.21b-cool/config.h Mon Jun 16 21:08:05 2003
 thttpd-2.21b-cool/config.h Sat Sep 20 14:43:20 2003
 @@ -82,6 +82,11 @@
  */
  #define IDLE_READ_TIMELIMIT 60
@@ -64,7 +64,7 @@
  ** index pages for directories that don't have an explicit index file.
 diff -ur thttpd-2.21b/configure thttpd-2.21b-cool/configure
 --- thttpd-2.21b/configure Sat Apr 21 02:07:14 2001
-+++ thttpd-2.21b-cool/configureMon Jun 16 21:08:05 2003
 thttpd-2.21b-cool/configureSat Sep 20 14:43:20 2003
 @@ -1021,7 +1021,7 @@
  fi
  echo $ac_t$CPP 16
@@ -76,7 +76,7 @@
  echo $ac_n checking for $ac_hdr... $ac_c 16
 diff -ur thttpd-2.21b/configure.in thttpd-2.21b-cool/configure.in
 --- thttpd-2.21b/configure.in  Sat Apr 21 02:06:23 2001
-+++ thttpd-2.21b-cool/configure.in Mon Jun 16 21:08:05 2003
 thttpd-2.21b-cool/configure.in Sat Sep 20 14:43:20 2003
 @@ -64,7 +64,7 @@
AC_MSG_RESULT(no)   
  fi
@@ -88,7 +88,7 @@
  
 diff -ur thttpd-2.21b/fdwatch.c thttpd-2.21b-cool/fdwatch.c
 --- thttpd-2.21b/fdwatch.c Fri Apr 13 07:36:08 2001
-+++ thttpd-2.21b-cool/fdwatch.cMon Jun 16 21:08:05 2003
 thttpd-2.21b-cool/fdwatch.cSat Sep 20 14:43:20 2003
 @@ -419,6 +419,7 @@
  if ( pollfds == (struct pollfd*) 0 || poll_fdidx == (int*) 0 ||
 poll_rfdidx == (int*) 0 )
@@ -119,7 +119,7 @@
  }
 diff -ur thttpd-2.21b/libhttpd.c thttpd-2.21b-cool/libhttpd.c
 --- thttpd-2.21b/libhttpd.cTue Apr 24 00:42:40 2001
-+++ thttpd-2.21b-cool/libhttpd.c   Mon Jun 16 21:09:31 2003
 thttpd-2.21b-cool/libhttpd.c   Sat Sep 20 14:43:29 2003
 @@ -56,6 +56,10 @@
  #include unistd.h
  #include stdarg.h
@@ -383,6 +383,15 @@
  (void) my_snprintf( buf, sizeof(buf),
HTMLHEADTITLE%d %s/TITLE/HEAD\nBODY BGCOLOR=\#cc\H2%d 
%s/H2\n,
status, title, status, title );
+@@ -764,7 +844,7 @@
+ char* cp2;
+ 
+ for ( cp1 = str, cp2 = dfstr;
+-*cp1 != '\0'  cp2 - dfstr  dfsize - 1;
++*cp1 != '\0'  cp2 - dfstr  dfsize - 5;
+ ++cp1, ++cp2 )
+   {
+   switch ( *cp1 )
 @@ -834,7 +914,7 @@
  fp = fopen( filename, r );
  if ( fp == (FILE*) 0 )
@@ -964,7 +973,7 @@
str[0] = '?';
 diff -ur thttpd-2.21b/libhttpd.h thttpd-2.21b-cool/libhttpd.h
 --- thttpd-2.21b/libhttpd.hTue Apr 24 00:36:50 2001
-+++ thttpd-2.21b-cool/libhttpd.h   Mon Jun 16 21:09:00 2003
 thttpd-2.21b-cool/libhttpd.h   Sat Sep 20 14:43:20 2003
 @@ -69,6 +69,8 @@
  char* server_hostname;
  int port;
@@ -1026,7 +1035,7 @@
  ** mallocced strings.
 diff -ur thttpd-2.21b/mime_encodings.txt thttpd-2.21b-cool/mime_encodings.txt
 --- thttpd-2.21b/mime_encodings.txtWed May 10 03:22:28 2000
-+++ thttpd-2.21b-cool/mime_encodings.txt   Mon Jun 16 21:08:05 2003
 thttpd-2.21b-cool/mime_encodings.txt   Sat Sep 20 14:43:20 2003
 @@ -3,6 +3,6 @@
  # A list of file extensions followed by the corresponding MIME encoding.
  # Extensions not found in the table proceed to the mime_types table.
@@ -1038,7 +1047,7 @@
  uux-uuencode
 diff -ur thttpd-2.21b/mime_types.txt thttpd-2.21b-cool/mime_types.txt
 --- thttpd-2.21b/mime_types.txtSat Apr 14 04:53:30 2001
-+++ thttpd-2.21b-cool/mime_types.txt   Mon Jun 16 21:08:05 2003
 thttpd-2.21b-cool/mime_types.txt   Sat Sep 20 14:43:20 2003
 @@ -1,135 +1,138 @@
 -# mime_types.txt
 -#
@@ -1289,7 +1298,7 @@
 +ice   x-conference/x-cooltalk
 diff -ur thttpd-2.21b/mmc.c thttpd-2.21b-cool/mmc.c
 --- thttpd-2.21b/mmc.c Fri Apr 13 23:02:15 2001
-+++ thttpd-2.21b-cool/mmc.cMon Jun 16 21:08:05 2003
 thttpd-2.21b-cool/mmc.cSat Sep 20 14:43:20 2003
 @@ -70,6 +70,9 @@
  unsigned int hash;
  int hash_idx;
@@ -1392,7 +1401,7 @@
else
 diff -ur thttpd-2.21b/mmc.h thttpd-2.21b-cool/mmc.h
 --- thttpd-2.21b/mmc.h Fri Apr 13 07:36:54 2001
-+++ thttpd-2.21b-cool/mmc.hMon Jun 16 21:08:05 2003
 thttpd-2.21b-cool/mmc.hSat Sep 20 14:43:20 2003
 @@ -31,8 +31,9 @@
  /* Returns an mmap()ed area for the given file, or (void*) 0 on errors.
  ** If you

[PHP-CVS] cvs: php-src /sapi/thttpd thttpd_patch

2003-09-20 Thread Sascha Schumann

sas Sat Sep 20 08:45:06 2003 EDT

  Modified files:  
/php-src/sapi/thttpdthttpd_patch 
  Log:
  Fix potential buffer overrun
  
  
Index: php-src/sapi/thttpd/thttpd_patch
diff -u php-src/sapi/thttpd/thttpd_patch:1.43 php-src/sapi/thttpd/thttpd_patch:1.44
--- php-src/sapi/thttpd/thttpd_patch:1.43   Mon Jun 16 15:11:33 2003
+++ php-src/sapi/thttpd/thttpd_patchSat Sep 20 08:45:05 2003
@@ -1,6 +1,6 @@
 diff -ur thttpd-2.21b/Makefile.in thttpd-2.21b-cool/Makefile.in
 --- thttpd-2.21b/Makefile.in   Thu Mar 29 20:36:21 2001
-+++ thttpd-2.21b-cool/Makefile.in  Mon Jun 16 21:08:05 2003
 thttpd-2.21b-cool/Makefile.in  Sat Sep 20 14:43:20 2003
 @@ -46,13 +46,15 @@
  
  # You shouldn't need to edit anything below here.
@@ -40,7 +40,7 @@
  
 diff -ur thttpd-2.21b/config.h thttpd-2.21b-cool/config.h
 --- thttpd-2.21b/config.h  Mon Apr  9 23:57:36 2001
-+++ thttpd-2.21b-cool/config.h Mon Jun 16 21:08:05 2003
 thttpd-2.21b-cool/config.h Sat Sep 20 14:43:20 2003
 @@ -82,6 +82,11 @@
  */
  #define IDLE_READ_TIMELIMIT 60
@@ -64,7 +64,7 @@
  ** index pages for directories that don't have an explicit index file.
 diff -ur thttpd-2.21b/configure thttpd-2.21b-cool/configure
 --- thttpd-2.21b/configure Sat Apr 21 02:07:14 2001
-+++ thttpd-2.21b-cool/configureMon Jun 16 21:08:05 2003
 thttpd-2.21b-cool/configureSat Sep 20 14:43:20 2003
 @@ -1021,7 +1021,7 @@
  fi
  echo $ac_t$CPP 16
@@ -76,7 +76,7 @@
  echo $ac_n checking for $ac_hdr... $ac_c 16
 diff -ur thttpd-2.21b/configure.in thttpd-2.21b-cool/configure.in
 --- thttpd-2.21b/configure.in  Sat Apr 21 02:06:23 2001
-+++ thttpd-2.21b-cool/configure.in Mon Jun 16 21:08:05 2003
 thttpd-2.21b-cool/configure.in Sat Sep 20 14:43:20 2003
 @@ -64,7 +64,7 @@
AC_MSG_RESULT(no)   
  fi
@@ -88,7 +88,7 @@
  
 diff -ur thttpd-2.21b/fdwatch.c thttpd-2.21b-cool/fdwatch.c
 --- thttpd-2.21b/fdwatch.c Fri Apr 13 07:36:08 2001
-+++ thttpd-2.21b-cool/fdwatch.cMon Jun 16 21:08:05 2003
 thttpd-2.21b-cool/fdwatch.cSat Sep 20 14:43:20 2003
 @@ -419,6 +419,7 @@
  if ( pollfds == (struct pollfd*) 0 || poll_fdidx == (int*) 0 ||
 poll_rfdidx == (int*) 0 )
@@ -119,7 +119,7 @@
  }
 diff -ur thttpd-2.21b/libhttpd.c thttpd-2.21b-cool/libhttpd.c
 --- thttpd-2.21b/libhttpd.cTue Apr 24 00:42:40 2001
-+++ thttpd-2.21b-cool/libhttpd.c   Mon Jun 16 21:09:31 2003
 thttpd-2.21b-cool/libhttpd.c   Sat Sep 20 14:43:29 2003
 @@ -56,6 +56,10 @@
  #include unistd.h
  #include stdarg.h
@@ -383,6 +383,15 @@
  (void) my_snprintf( buf, sizeof(buf),
HTMLHEADTITLE%d %s/TITLE/HEAD\nBODY BGCOLOR=\#cc\H2%d 
%s/H2\n,
status, title, status, title );
+@@ -764,7 +844,7 @@
+ char* cp2;
+ 
+ for ( cp1 = str, cp2 = dfstr;
+-*cp1 != '\0'  cp2 - dfstr  dfsize - 1;
++*cp1 != '\0'  cp2 - dfstr  dfsize - 5;
+ ++cp1, ++cp2 )
+   {
+   switch ( *cp1 )
 @@ -834,7 +914,7 @@
  fp = fopen( filename, r );
  if ( fp == (FILE*) 0 )
@@ -964,7 +973,7 @@
str[0] = '?';
 diff -ur thttpd-2.21b/libhttpd.h thttpd-2.21b-cool/libhttpd.h
 --- thttpd-2.21b/libhttpd.hTue Apr 24 00:36:50 2001
-+++ thttpd-2.21b-cool/libhttpd.h   Mon Jun 16 21:09:00 2003
 thttpd-2.21b-cool/libhttpd.h   Sat Sep 20 14:43:20 2003
 @@ -69,6 +69,8 @@
  char* server_hostname;
  int port;
@@ -1026,7 +1035,7 @@
  ** mallocced strings.
 diff -ur thttpd-2.21b/mime_encodings.txt thttpd-2.21b-cool/mime_encodings.txt
 --- thttpd-2.21b/mime_encodings.txtWed May 10 03:22:28 2000
-+++ thttpd-2.21b-cool/mime_encodings.txt   Mon Jun 16 21:08:05 2003
 thttpd-2.21b-cool/mime_encodings.txt   Sat Sep 20 14:43:20 2003
 @@ -3,6 +3,6 @@
  # A list of file extensions followed by the corresponding MIME encoding.
  # Extensions not found in the table proceed to the mime_types table.
@@ -1038,7 +1047,7 @@
  uux-uuencode
 diff -ur thttpd-2.21b/mime_types.txt thttpd-2.21b-cool/mime_types.txt
 --- thttpd-2.21b/mime_types.txtSat Apr 14 04:53:30 2001
-+++ thttpd-2.21b-cool/mime_types.txt   Mon Jun 16 21:08:05 2003
 thttpd-2.21b-cool/mime_types.txt   Sat Sep 20 14:43:20 2003
 @@ -1,135 +1,138 @@
 -# mime_types.txt
 -#
@@ -1289,7 +1298,7 @@
 +ice   x-conference/x-cooltalk
 diff -ur thttpd-2.21b/mmc.c thttpd-2.21b-cool/mmc.c
 --- thttpd-2.21b/mmc.c Fri Apr 13 23:02:15 2001
-+++ thttpd-2.21b-cool/mmc.cMon Jun 16 21:08:05 2003
 thttpd-2.21b-cool/mmc.cSat Sep 20 14:43:20 2003
 @@ -70,6 +70,9 @@
  unsigned int hash;
  int hash_idx;
@@ -1392,7 +1401,7 @@
else
 diff -ur thttpd-2.21b/mmc.h thttpd-2.21b-cool/mmc.h
 --- thttpd-2.21b/mmc.h Fri Apr 13 07:36:54 2001
-+++ thttpd-2.21b-cool/mmc.hMon Jun 16 21:08:05 2003
 thttpd-2.21b-cool/mmc.hSat Sep 20 14:43:20 2003
 @@ -31,8 +31,9 @@
  /* Returns an mmap()ed area for the given file, or (void*) 0 on errors.
  ** If you have a stat buffer on the

[PHP-CVS] cvs: spl /tests array.phpt

2003-09-20 Thread Marcus Boerger

helly   Sat Sep 20 08:51:21 2003 EDT

  Modified files:  
/spl/tests  array.phpt 
  Log:
  Explicit cwqasting is now necessary
  
Index: spl/tests/array.phpt
diff -u spl/tests/array.phpt:1.2 spl/tests/array.phpt:1.3
--- spl/tests/array.phpt:1.2Mon Aug  4 16:17:53 2003
+++ spl/tests/array.phptSat Sep 20 08:51:20 2003
@@ -14,7 +14,7 @@
 var_dump($ar[2]);
 var_dump($ar[3] = 3);
 
-var_dump(array_merge($ar, array(4=4, 5=5)));
+var_dump(array_merge((array)$ar, array(4=4, 5=5)));
 
 var_dump($ar[a] = a);
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_4_3) /ext/standard string.c

2003-09-20 Thread Sascha Schumann

sas Sat Sep 20 12:09:43 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/standard   string.c 
  Log:
  Avoid zero-length keys which result in a spinning process
  
  
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.333.2.33 
php-src/ext/standard/string.c:1.333.2.34
--- php-src/ext/standard/string.c:1.333.2.33Sat Jul 12 05:33:58 2003
+++ php-src/ext/standard/string.c   Sat Sep 20 12:09:41 2003
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: string.c,v 1.333.2.33 2003/07/12 09:33:58 moriyoshi Exp $ */
+/* $Id: string.c,v 1.333.2.34 2003/09/20 16:09:41 sas Exp $ */
 
 /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
 
@@ -1551,7 +1551,7 @@
 
 /* {{{ php_chunk_split
  */
-static char *php_chunk_split(char *src, int srclen, char *end, int endlen,
+static PHP_ATTRIBUTE_MALLOC char *php_chunk_split(char *src, int srclen, char *end, 
int endlen,
 int chunklen, int *destlen)
 {
char *dest;
@@ -1940,6 +1940,9 @@
switch (zend_hash_get_current_key_ex(hash, string_key, 
string_key_len, num_key, 0, hpos)) {
case HASH_KEY_IS_STRING:
len = string_key_len-1;
+   if (len  1) {
+   RETURN_FALSE;
+   }
if (len  maxlen) maxlen = len;
if (len  minlen) minlen = len;
break; 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/standard string.c

2003-09-20 Thread Sascha Schumann

sas Sat Sep 20 12:10:50 2003 EDT

  Modified files:  
/php-src/ext/standard   string.c 
  Log:
  MFB Avoid zero-length keys which result in a spinning process
  
  
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.396 php-src/ext/standard/string.c:1.397
--- php-src/ext/standard/string.c:1.396 Tue Aug 26 20:43:54 2003
+++ php-src/ext/standard/string.c   Sat Sep 20 12:10:49 2003
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: string.c,v 1.396 2003/08/27 00:43:54 pollita Exp $ */
+/* $Id: string.c,v 1.397 2003/09/20 16:10:49 sas Exp $ */
 
 /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
 
@@ -2256,6 +2256,9 @@
switch (zend_hash_get_current_key_ex(hash, string_key, 
string_key_len, num_key, 0, hpos)) {
case HASH_KEY_IS_STRING:
len = string_key_len-1;
+   if (len  1) {
+   RETURN_FALSE;
+   }
if (len  maxlen) {
maxlen = len;
}

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS-DAILY] cvs: php-src / ChangeLog

[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog

[PHP-CVS] cvs: php-src(PHP_4_3) /sapi/thttpd thttpd_patch

[PHP-CVS] cvs: php-src(PHP_4) /sapi/thttpd thttpd_patch

[PHP-CVS] cvs: php-src /sapi/thttpd thttpd_patch

[PHP-CVS] cvs: spl /tests array.phpt

[PHP-CVS] cvs: php-src(PHP_4_3) /ext/standard string.c

[PHP-CVS] cvs: php-src /ext/standard string.c

8 matches

Site Navigation

Mail list logo

Footer information