[PHP-CVS] cvs: php4 /tests/strings 002.phpt

2003-04-01 Thread Sara Golemon 
pollita Tue Apr  1 20:51:34 2003 EDT

  Modified files:  
/php4/tests/strings 002.phpt 
  Log:
  Avoid having output_buffering cause this test to improperly fail.
  
Index: php4/tests/strings/002.phpt
diff -u php4/tests/strings/002.phpt:1.5 php4/tests/strings/002.phpt:1.6
--- php4/tests/strings/002.phpt:1.5 Thu Jan  9 12:29:31 2003
+++ php4/tests/strings/002.phpt Tue Apr  1 20:51:34 2003
@@ -4,9 +4,13 @@
 --GET--
 --FILE--
 
 --EXPECT--
+fprintf test 1:abcde
+int(20)
 printf test 1:simple string
 printf test 2:42
 printf test 3:3.33
@@ -82,5 +83,3 @@
 printf test 29:2   1
 printf test 30:x
 vprintf test 1:2   1
-fprintf test 1:abcde
-int(20)



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

[PHP-CVS] cvs: php4 /ext/standard/tests/file userfilters.phpt

2003-04-01 Thread Sara Golemon 
pollita Tue Apr  1 19:41:09 2003 EDT

  Modified files:  
/php4/ext/standard/tests/file   userfilters.phpt 
  Log:
  New test for userfilters rewrite
  
Index: php4/ext/standard/tests/file/userfilters.phpt
diff -u php4/ext/standard/tests/file/userfilters.phpt:1.3 
php4/ext/standard/tests/file/userfilters.phpt:1.4
--- php4/ext/standard/tests/file/userfilters.phpt:1.3   Mon Jan  6 09:04:23 2003
+++ php4/ext/standard/tests/file/userfilters.phpt   Tue Apr  1 19:41:09 2003
@@ -1,60 +1,37 @@
 --TEST--
-User-space filters
+stream userfilter test
 --FILE--
 data = strtoupper($bucket->data);
+  $consumed += strlen($bucket->data);
+  stream_bucket_append($out, $bucket);
+}
+return PSFS_PASS_ON;
+  }
+
+  function oncreate() {
+echo "params: {$this->params}\n";
+  }
+}
 
-class UpperCaseFilter extends php_user_filter {
-   function oncreate()
-   {
-   echo "oncreate:\n";
-   var_dump($this->filtername);
-   var_dump($this->params);
-   }
-
-   function flush($closing)
-   {
-   echo "flush:\n";
-   }
-
-   function onclose()
-   {
-   echo "onclose:\n";
-   }
-
-   function write($data)
-   {
-   echo "write:\n";
-   $x = parent::write($data);
-   return strlen($data);
-   }
-
-   function read($bytes)
-   {
-   echo "read:\n";
-   $x = parent::read($bytes);
-   return strtoupper($x);
-   }
-};
+stream_register_filter('testfilter','testfilter');
+
+$text = "Hello There!";
 
-var_dump(stream_register_filter("string.uppercase", "UpperCaseFilter"));
 $fp = tmpfile();
+fwrite($fp, $text);
 
-fwrite($fp, "hello there");
 rewind($fp);
+stream_filter_append($fp, 'testfilter', STREAM_FILTER_READ, 'testuserfilter');
 
-var_dump(stream_filter_prepend($fp, "string.uppercase"));
 var_dump(fgets($fp));
 fclose($fp);
+
 ?>
 --EXPECT--
-bool(true)
-oncreate:
-string(16) "string.uppercase"
-NULL
-bool(true)
-read:
-read:
-string(11) "HELLO THERE"
-flush:
-onclose:
+params: testuserfilter
+string(12) "HELLO THERE!"



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

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

2003-04-01 Thread Ilia Alshanetsky 
iliaa   Tue Apr  1 19:25:57 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/standard  string.c 
  Log:
  MFH
  
  
Index: php4/ext/standard/string.c
diff -u php4/ext/standard/string.c:1.333.2.18 php4/ext/standard/string.c:1.333.2.19
--- php4/ext/standard/string.c:1.333.2.18   Fri Mar  7 08:42:20 2003
+++ php4/ext/standard/string.c  Tue Apr  1 19:25:57 2003
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: string.c,v 1.333.2.18 2003/03/07 13:42:20 ddhill Exp $ */
+/* $Id: string.c,v 1.333.2.19 2003/04/02 00:25:57 iliaa Exp $ */
 
 /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
 
@@ -3531,6 +3531,10 @@

/* Initialize the result string */  
result_len = Z_STRLEN_PP(input_str) * Z_LVAL_PP(mult);
+   if (result_len < 1 || result_len > 2147483647) {
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, "You may not create 
strings longer then 2147483647 bytes");
+   RETURN_FALSE;
+   }
result = (char *)emalloc(result_len + 1);

/* Heavy optimization for situations where input string is 1 byte long */



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

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

2003-04-01 Thread Ilia Alshanetsky 
iliaa   Tue Apr  1 19:25:46 2003 EDT

  Modified files:  
/php4/ext/standard  string.c 
  Log:
  Fixed possible integer overflow in str_repeat().
  
  
Index: php4/ext/standard/string.c
diff -u php4/ext/standard/string.c:1.367 php4/ext/standard/string.c:1.368
--- php4/ext/standard/string.c:1.367Tue Apr  1 07:46:01 2003
+++ php4/ext/standard/string.c  Tue Apr  1 19:25:45 2003
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: string.c,v 1.367 2003/04/01 12:46:01 momo Exp $ */
+/* $Id: string.c,v 1.368 2003/04/02 00:25:45 iliaa Exp $ */
 
 /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
 
@@ -3787,6 +3787,10 @@

/* Initialize the result string */  
result_len = Z_STRLEN_PP(input_str) * Z_LVAL_PP(mult);
+   if (result_len < 1 || result_len > 2147483647) {
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, "You may not create 
strings longer then 2147483647 bytes");
+   RETURN_FALSE;
+   }
result = (char *)emalloc(result_len + 1);

/* Heavy optimization for situations where input string is 1 byte long */



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

[PHP-CVS] cvs: php4(PHP_4_3) /ext/pgsql pgsql.c php_pgsql.h

2003-04-01 Thread Jay Smith 
jay Tue Apr  1 19:00:10 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/pgsql pgsql.c php_pgsql.h 
  Log:
  @- Fixed bug #23009 (pg_select with timestamp). (Marcus, Jay)
  MFH
  
  
Index: php4/ext/pgsql/pgsql.c
diff -u php4/ext/pgsql/pgsql.c:1.244.2.14 php4/ext/pgsql/pgsql.c:1.244.2.15
--- php4/ext/pgsql/pgsql.c:1.244.2.14   Tue Apr  1 18:28:18 2003
+++ php4/ext/pgsql/pgsql.c  Tue Apr  1 19:00:09 2003
@@ -19,7 +19,7 @@
+--+
  */
  
-/* $Id: pgsql.c,v 1.244.2.14 2003/04/01 23:28:18 jay Exp $ */
+/* $Id: pgsql.c,v 1.244.2.15 2003/04/02 00:00:09 jay Exp $ */
 
 #include 
 
@@ -3203,8 +3203,10 @@
return PG_DATE;
if (!strcmp(type_name, "time"))
return PG_TIME;
-   if (!strcmp(type_name, "timestamp") || !strcmp(type_name, "time with time 
zone"))
+   if (!strcmp(type_name, "time with time zone") || !strcmp(type_name, "timetz"))
return PG_TIME_WITH_TIMEZONE;
+   if (!strcmp(type_name, "timestamp without time zone") || !strcmp(type_name, 
"timestamp"))
+   return PG_TIMESTAMP;
if (!strcmp(type_name, "timestamp with time zone") || !strcmp(type_name, 
"timestamptz"))
return PG_TIMESTAMP_WITH_TIMEZONE;
if (!strcmp(type_name, "interval"))
@@ -3657,6 +3659,7 @@
break;

case PG_TIME_WITH_TIMEZONE:
+   case PG_TIMESTAMP:
case PG_TIMESTAMP_WITH_TIMEZONE:
switch(Z_TYPE_PP(val)) {
case IS_STRING:
Index: php4/ext/pgsql/php_pgsql.h
diff -u php4/ext/pgsql/php_pgsql.h:1.56.2.1 php4/ext/pgsql/php_pgsql.h:1.56.2.2
--- php4/ext/pgsql/php_pgsql.h:1.56.2.1 Tue Dec 31 11:35:13 2002
+++ php4/ext/pgsql/php_pgsql.h  Tue Apr  1 19:00:09 2003
@@ -17,7 +17,7 @@
+--+
  */
  
-/* $Id: php_pgsql.h,v 1.56.2.1 2002/12/31 16:35:13 sebastian Exp $ */
+/* $Id: php_pgsql.h,v 1.56.2.2 2003/04/02 00:00:09 jay Exp $ */
 
 #ifndef PHP_PGSQL_H
 #define PHP_PGSQL_H
@@ -196,6 +196,7 @@
PG_DATE,
PG_TIME,
PG_TIME_WITH_TIMEZONE,
+   PG_TIMESTAMP,
PG_TIMESTAMP_WITH_TIMEZONE,
PG_INTERVAL,
/* binary */



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

[PHP-CVS] cvs: php4 /ext/pgsql pgsql.c php_pgsql.h

2003-04-01 Thread Jay Smith 
jay Tue Apr  1 18:56:16 2003 EDT

  Modified files:  
/php4/ext/pgsql pgsql.c php_pgsql.h 
  Log:
  Fix 'timestamp without timezone', too.
  
  
Index: php4/ext/pgsql/pgsql.c
diff -u php4/ext/pgsql/pgsql.c:1.268 php4/ext/pgsql/pgsql.c:1.269
--- php4/ext/pgsql/pgsql.c:1.268Tue Apr  1 18:34:11 2003
+++ php4/ext/pgsql/pgsql.c  Tue Apr  1 18:56:16 2003
@@ -19,7 +19,7 @@
+--+
  */
  
-/* $Id: pgsql.c,v 1.268 2003/04/01 23:34:11 helly Exp $ */
+/* $Id: pgsql.c,v 1.269 2003/04/01 23:56:16 jay Exp $ */
 
 #include 
 
@@ -3205,6 +3205,8 @@
return PG_TIME;
if (!strcmp(type_name, "time with time zone") || !strcmp(type_name, "timetz"))
return PG_TIME_WITH_TIMEZONE;
+   if (!strcmp(type_name, "timestamp without time zone") || !strcmp(type_name, 
"timestamp"))
+   return PG_TIMESTAMP;
if (!strcmp(type_name, "timestamp with time zone") || !strcmp(type_name, 
"timestamptz"))
return PG_TIMESTAMP_WITH_TIMEZONE;
if (!strcmp(type_name, "interval"))
@@ -3657,6 +3659,7 @@
break;

case PG_TIME_WITH_TIMEZONE:
+   case PG_TIMESTAMP:
case PG_TIMESTAMP_WITH_TIMEZONE:
switch(Z_TYPE_PP(val)) {
case IS_STRING:
Index: php4/ext/pgsql/php_pgsql.h
diff -u php4/ext/pgsql/php_pgsql.h:1.59 php4/ext/pgsql/php_pgsql.h:1.60
--- php4/ext/pgsql/php_pgsql.h:1.59 Mon Jan  6 05:28:34 2003
+++ php4/ext/pgsql/php_pgsql.h  Tue Apr  1 18:56:16 2003
@@ -17,7 +17,7 @@
+--+
  */
  
-/* $Id: php_pgsql.h,v 1.59 2003/01/06 10:28:34 hyanantha Exp $ */
+/* $Id: php_pgsql.h,v 1.60 2003/04/01 23:56:16 jay Exp $ */
 
 #ifndef PHP_PGSQL_H
 #define PHP_PGSQL_H
@@ -196,6 +196,7 @@
PG_DATE,
PG_TIME,
PG_TIME_WITH_TIMEZONE,
+   PG_TIMESTAMP,
PG_TIMESTAMP_WITH_TIMEZONE,
PG_INTERVAL,
/* binary */



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

[PHP-CVS] cvs: php4 /ext/pgsql pgsql.c

2003-04-01 Thread Marcus Boerger 
helly   Tue Apr  1 18:34:12 2003 EDT

  Modified files:  
/php4/ext/pgsql pgsql.c 
  Log:
  Fix 'time with timezone', too
  
Index: php4/ext/pgsql/pgsql.c
diff -u php4/ext/pgsql/pgsql.c:1.267 php4/ext/pgsql/pgsql.c:1.268
--- php4/ext/pgsql/pgsql.c:1.267Tue Apr  1 18:26:10 2003
+++ php4/ext/pgsql/pgsql.c  Tue Apr  1 18:34:11 2003
@@ -19,7 +19,7 @@
+--+
  */
  
-/* $Id: pgsql.c,v 1.267 2003/04/01 23:26:10 jay Exp $ */
+/* $Id: pgsql.c,v 1.268 2003/04/01 23:34:11 helly Exp $ */
 
 #include 
 
@@ -3203,7 +3203,7 @@
return PG_DATE;
if (!strcmp(type_name, "time"))
return PG_TIME;
-   if (!strcmp(type_name, "timestamp") || !strcmp(type_name, "time with time 
zone"))
+   if (!strcmp(type_name, "time with time zone") || !strcmp(type_name, "timetz"))
return PG_TIME_WITH_TIMEZONE;
if (!strcmp(type_name, "timestamp with time zone") || !strcmp(type_name, 
"timestamptz"))
return PG_TIMESTAMP_WITH_TIMEZONE;



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

[PHP-CVS] cvs: php4(PHP_4_3) /ext/pgsql pgsql.c

2003-04-01 Thread Jay Smith 
jay Tue Apr  1 18:28:19 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/pgsql pgsql.c 
  Log:
  MFH
  
  
Index: php4/ext/pgsql/pgsql.c
diff -u php4/ext/pgsql/pgsql.c:1.244.2.13 php4/ext/pgsql/pgsql.c:1.244.2.14
--- php4/ext/pgsql/pgsql.c:1.244.2.13   Mon Mar 10 18:13:03 2003
+++ php4/ext/pgsql/pgsql.c  Tue Apr  1 18:28:18 2003
@@ -19,7 +19,7 @@
+--+
  */
  
-/* $Id: pgsql.c,v 1.244.2.13 2003/03/10 23:13:03 sniper Exp $ */
+/* $Id: pgsql.c,v 1.244.2.14 2003/04/01 23:28:18 jay Exp $ */
 
 #include 
 
@@ -3205,7 +3205,7 @@
return PG_TIME;
if (!strcmp(type_name, "timestamp") || !strcmp(type_name, "time with time 
zone"))
return PG_TIME_WITH_TIMEZONE;
-   if (!strcmp(type_name, "timestamp with time zone"))
+   if (!strcmp(type_name, "timestamp with time zone") || !strcmp(type_name, 
"timestamptz"))
return PG_TIMESTAMP_WITH_TIMEZONE;
if (!strcmp(type_name, "interval"))
return PG_INTERVAL;
@@ -3665,7 +3665,7 @@
}
else {
/* FIXME: better regex must be 
used */
-   if 
(php_pgsql_convert_match(Z_STRVAL_PP(val), "^([0-9]{4}[/-][0-9]{1,2}[/-][0-9]{1,2})([ 
\\t]+(([0-9]{1,2}:[0-9]{1,2}){1}(:[0-9]{1,2}){0,1})){0,1}$", 1 TSRMLS_CC) == FAILURE) {
+   if 
(php_pgsql_convert_match(Z_STRVAL_PP(val), "^([0-9]{4}[/-][0-9]{1,2}[/-][0-9]{1,2})([ 
\\t]+(([0-9]{1,2}:[0-9]{1,2}){1}(:[0-9]{1,2}){0,1}(\\.[0-9]+){0,1}([ 
\\t]*([+-][0-9]{1,2}(:[0-9]{1,2}){0,1}|[a-zA-Z]{1,5})){0,1})){0,1}$", 1 TSRMLS_CC) == 
FAILURE) {
err = 1;
}
else {



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

[PHP-CVS] cvs: php4 /ext/pgsql pgsql.c

2003-04-01 Thread Jay Smith 
jay Tue Apr  1 18:26:11 2003 EDT

  Modified files:  
/php4/ext/pgsql pgsql.c 
  Log:
  Fixed bug #23009 (pg_select with timestamp) 
  
  
Index: php4/ext/pgsql/pgsql.c
diff -u php4/ext/pgsql/pgsql.c:1.266 php4/ext/pgsql/pgsql.c:1.267
--- php4/ext/pgsql/pgsql.c:1.266Mon Mar 10 15:30:32 2003
+++ php4/ext/pgsql/pgsql.c  Tue Apr  1 18:26:10 2003
@@ -19,7 +19,7 @@
+--+
  */
  
-/* $Id: pgsql.c,v 1.266 2003/03/10 20:30:32 ddhill Exp $ */
+/* $Id: pgsql.c,v 1.267 2003/04/01 23:26:10 jay Exp $ */
 
 #include 
 
@@ -3205,7 +3205,7 @@
return PG_TIME;
if (!strcmp(type_name, "timestamp") || !strcmp(type_name, "time with time 
zone"))
return PG_TIME_WITH_TIMEZONE;
-   if (!strcmp(type_name, "timestamp with time zone"))
+   if (!strcmp(type_name, "timestamp with time zone") || !strcmp(type_name, 
"timestamptz"))
return PG_TIMESTAMP_WITH_TIMEZONE;
if (!strcmp(type_name, "interval"))
return PG_INTERVAL;
@@ -3665,7 +3665,7 @@
}
else {
/* FIXME: better regex must be 
used */
-   if 
(php_pgsql_convert_match(Z_STRVAL_PP(val), "^([0-9]{4}[/-][0-9]{1,2}[/-][0-9]{1,2})([ 
\\t]+(([0-9]{1,2}:[0-9]{1,2}){1}(:[0-9]{1,2}){0,1})){0,1}$", 1 TSRMLS_CC) == FAILURE) {
+   if 
(php_pgsql_convert_match(Z_STRVAL_PP(val), "^([0-9]{4}[/-][0-9]{1,2}[/-][0-9]{1,2})([ 
\\t]+(([0-9]{1,2}:[0-9]{1,2}){1}(:[0-9]{1,2}){0,1}(\\.[0-9]+){0,1}([ 
\\t]*([+-][0-9]{1,2}(:[0-9]{1,2}){0,1}|[a-zA-Z]{1,5})){0,1})){0,1}$", 1 TSRMLS_CC) == 
FAILURE) {
err = 1;
}
else {



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

[PHP-CVS] cvs: CVSROOT / cvswrappers

2003-04-01 Thread James Cox 
imajes  Tue Apr  1 16:55:41 2003 EDT

  Modified files:  
/CVSROOTcvswrappers 
  Log:
  fixing for Colin
  
  
Index: CVSROOT/cvswrappers
diff -u CVSROOT/cvswrappers:1.9 CVSROOT/cvswrappers:1.10
--- CVSROOT/cvswrappers:1.9 Sat Jan 18 15:06:19 2003
+++ CVSROOT/cvswrappers Tue Apr  1 16:55:41 2003
@@ -1,5 +1,5 @@
 #
-#ident "@(#)cvs/examples:$Name:  $:$Id: cvswrappers,v 1.9 2003/01/18 20:06:19 goba 
Exp $"
+#ident "@(#)cvs/examples:$Name:  $:$Id: cvswrappers,v 1.10 2003/04/01 21:55:41 imajes 
Exp $"
 #
 # This file describes wrappers and other binary files to CVS.
 #
@@ -53,3 +53,6 @@
 *.tif  -k 'b' -m 'COPY'
 *.eps  -k 'b' -m 'COPY'
 *.tgz  -k 'b' -m 'COPY'
+*.ai   -k 'b' -m 'COPY'
+*.tif  -k 'b' -m 'COPY'
+



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

[PHP-CVS] cvs: php4 /ext/standard array.c

2003-04-01 Thread Rasmus Lerdorf 
rasmus  Tue Apr  1 16:47:21 2003 EDT

  Modified files:  
/php4/ext/standard  array.c 
  Log:
  MFB
  
  
Index: php4/ext/standard/array.c
diff -u php4/ext/standard/array.c:1.223 php4/ext/standard/array.c:1.224
--- php4/ext/standard/array.c:1.223 Thu Mar 27 13:57:53 2003
+++ php4/ext/standard/array.c   Tue Apr  1 16:47:21 2003
@@ -21,7 +21,7 @@
+--+
 */
 
-/* $Id: array.c,v 1.223 2003/03/27 18:57:53 iliaa Exp $ */
+/* $Id: array.c,v 1.224 2003/04/01 21:47:21 rasmus Exp $ */
 
 #include "php.h"
 #include "php_ini.h"
@@ -2465,6 +2465,10 @@
 
/* Populate the pads array */
num_pads = pad_size_abs - input_size;
+   if(num_pads > 1048576) {
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, "You may only pad up to 
1048576 elements at a time");
+   RETURN_FALSE;
+   }
pads = (zval ***)emalloc(num_pads * sizeof(zval **));
for (i = 0; i < num_pads; i++) {
pads[i] = pad_value;



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

[PHP-CVS] cvs: php4(PHP_4_3) / TODO_SEGFAULTS /ext/standard array.c

2003-04-01 Thread Rasmus Lerdorf 
rasmus  Tue Apr  1 16:44:47 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4   TODO_SEGFAULTS 
/php4/ext/standard  array.c 
  Log:
  Arbitrarily limit array_pad() to only do 1 million elements at a time.
  Probably still too high, but it solves the segfault for now.
  
  
Index: php4/TODO_SEGFAULTS
diff -u php4/TODO_SEGFAULTS:1.1.2.7 php4/TODO_SEGFAULTS:1.1.2.8
--- php4/TODO_SEGFAULTS:1.1.2.7 Tue Apr  1 14:10:35 2003
+++ php4/TODO_SEGFAULTS Tue Apr  1 16:44:47 2003
@@ -8,11 +8,10 @@
 socket_iovec_alloc (Rasmus)
exif_imagetype,exif_thumbnail (Rasmus)
 dbase_open (Rasmus)
-
+   array_pad (Rasmus)
 
 Open:
 
-array_pad
 bcsub (1)
 mb_ereg (2)
 mb_ereg_match (2)
Index: php4/ext/standard/array.c
diff -u php4/ext/standard/array.c:1.199.2.14 php4/ext/standard/array.c:1.199.2.15
--- php4/ext/standard/array.c:1.199.2.14Thu Feb  6 10:28:28 2003
+++ php4/ext/standard/array.c   Tue Apr  1 16:44:47 2003
@@ -21,7 +21,7 @@
+--+
 */
 
-/* $Id: array.c,v 1.199.2.14 2003/02/06 15:28:28 sniper Exp $ */
+/* $Id: array.c,v 1.199.2.15 2003/04/01 21:44:47 rasmus Exp $ */
 
 #include "php.h"
 #include "php_ini.h"
@@ -2339,6 +2339,10 @@

/* Populate the pads array */
num_pads = pad_size_abs - input_size;
+   if(num_pads > 1048576) {
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, "You may only pad up to 
1048576 elements at a time");
+   RETURN_FALSE;
+   }
pads = (zval ***)emalloc(num_pads * sizeof(zval **));
for (i = 0; i < num_pads; i++)
pads[i] = pad_value;



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

[PHP-CVS] cvs: php4 /ext/standard/tests/filters bug22538.phpt

2003-04-01 Thread Moriyoshi Koizumi 
moriyoshi   Tue Apr  1 14:47:33 2003 EDT

  Modified files:  
/php4/ext/standard/tests/filtersbug22538.phpt 
  Log:
  Fixed bogus test
  
  
Index: php4/ext/standard/tests/filters/bug22538.phpt
diff -u php4/ext/standard/tests/filters/bug22538.phpt:1.1 
php4/ext/standard/tests/filters/bug22538.phpt:1.2
--- php4/ext/standard/tests/filters/bug22538.phpt:1.1   Tue Apr  1 14:10:04 2003
+++ php4/ext/standard/tests/filters/bug22538.phpt   Tue Apr  1 14:47:33 2003
@@ -2,15 +2,43 @@
 Bug #22538 (filtered stream doesn't update file pointer)
 --FILE--
  0) {
+   fwrite($fp, $str);
+}
+$cnt = $size - ($str_len + $cnt);
+fclose($fp);
+$fin = fopen($path1, "r");
+$fout = fopen($path2, "w");
+stream_filter_append($fout, "string.rot13");
+my_stream_copy_to_stream($fin, $fout);
+fclose($fout);
 fclose($fin);
+var_dump($cnt);
+var_dump(filesize($path2));
+var_dump(md5_file($path1));
+var_dump(md5_file($path2));
+unlink($path1);
+unlink($path2);
 ?>
 --EXPECT--
-
+int(65529)
+int(65529)
+string(32) "e10e3d1ae81b084b822e8592d019b57a"
+string(32) "931f0fbf8a72312e3bab9965b1d1081c"



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

[PHP-CVS] cvs: php4(PHP_4_3) /main output.c

2003-04-01 Thread Sascha Schumann 
sas Tue Apr  1 14:15:47 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/main  output.c 
  Log:
  s/0/FAILURE/
  
Index: php4/main/output.c
diff -u php4/main/output.c:1.142.2.6 php4/main/output.c:1.142.2.7
--- php4/main/output.c:1.142.2.6Tue Apr  1 14:13:40 2003
+++ php4/main/output.c  Tue Apr  1 14:15:47 2003
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: output.c,v 1.142.2.6 2003/04/01 19:13:40 sas Exp $ */
+/* $Id: output.c,v 1.142.2.7 2003/04/01 19:15:47 sas Exp $ */
 
 #include "php.h"
 #include "ext/standard/head.h"
@@ -453,7 +453,7 @@
  */
 static int php_ob_init(uint initial_size, uint block_size, zval *output_handler, uint 
chunk_size, zend_bool erase TSRMLS_DC)
 {
-   int result = 0, len;
+   int result = FAILURE, len;
char *handler_name, *next_handler_name;
HashPosition pos;
zval **tmp;



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

[PHP-CVS] cvs: php4(PHP_4) /main output.c

2003-04-01 Thread Sascha Schumann 
sas Tue Apr  1 14:15:15 2003 EDT

  Modified files:  (Branch: PHP_4)
/php4/main  output.c 
  Log:
  MFH uninit'ed read
  
Index: php4/main/output.c
diff -u php4/main/output.c:1.142.2.3 php4/main/output.c:1.142.2.3.2.1
--- php4/main/output.c:1.142.2.3Tue Dec 31 11:26:12 2002
+++ php4/main/output.c  Tue Apr  1 14:15:15 2003
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: output.c,v 1.142.2.3 2002/12/31 16:26:12 sebastian Exp $ */
+/* $Id: output.c,v 1.142.2.3.2.1 2003/04/01 19:15:15 sas Exp $ */
 
 #include "php.h"
 #include "ext/standard/head.h"
@@ -453,7 +453,7 @@
  */
 static int php_ob_init(uint initial_size, uint block_size, zval *output_handler, uint 
chunk_size, zend_bool erase TSRMLS_DC)
 {
-   int result, len;
+   int result = FAILURE, len;
char *handler_name, *next_handler_name;
HashPosition pos;
zval **tmp;



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

[PHP-CVS] cvs: php4 /main output.c

2003-04-01 Thread Sascha Schumann 
sas Tue Apr  1 14:14:47 2003 EDT

  Modified files:  
/php4/main  output.c 
  Log:
  Fix an uninitialized read, default to FAILURE
  
  
Index: php4/main/output.c
diff -u php4/main/output.c:1.150 php4/main/output.c:1.151
--- php4/main/output.c:1.150Tue Mar 25 03:07:12 2003
+++ php4/main/output.c  Tue Apr  1 14:14:47 2003
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: output.c,v 1.150 2003/03/25 08:07:12 sebastian Exp $ */
+/* $Id: output.c,v 1.151 2003/04/01 19:14:47 sas Exp $ */
 
 #include "php.h"
 #include "ext/standard/head.h"
@@ -453,7 +453,7 @@
  */
 static int php_ob_init(uint initial_size, uint block_size, zval *output_handler, uint 
chunk_size, zend_bool erase TSRMLS_DC)
 {
-   int result, len;
+   int result = FAILURE, len;
char *handler_name, *next_handler_name;
HashPosition pos;
zval **tmp;



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

[PHP-CVS] cvs: php4(PHP_4_3) /main output.c

2003-04-01 Thread Sascha Schumann 
sas Tue Apr  1 14:13:41 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/main  output.c 
  Log:
  Fix an uninitialised read for ob_start(array())
  
  
Index: php4/main/output.c
diff -u php4/main/output.c:1.142.2.5 php4/main/output.c:1.142.2.6
--- php4/main/output.c:1.142.2.5Fri Mar  7 08:42:22 2003
+++ php4/main/output.c  Tue Apr  1 14:13:40 2003
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: output.c,v 1.142.2.5 2003/03/07 13:42:22 ddhill Exp $ */
+/* $Id: output.c,v 1.142.2.6 2003/04/01 19:13:40 sas Exp $ */
 
 #include "php.h"
 #include "ext/standard/head.h"
@@ -453,7 +453,7 @@
  */
 static int php_ob_init(uint initial_size, uint block_size, zval *output_handler, uint 
chunk_size, zend_bool erase TSRMLS_DC)
 {
-   int result, len;
+   int result = 0, len;
char *handler_name, *next_handler_name;
HashPosition pos;
zval **tmp;



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

[PHP-CVS] cvs: php4 /ext/dbase dbf_head.c

2003-04-01 Thread Rasmus Lerdorf 
rasmus  Tue Apr  1 14:12:32 2003 EDT

  Modified files:  
/php4/ext/dbase dbf_head.c 
  Log:
  MFB
  
  
Index: php4/ext/dbase/dbf_head.c
diff -u php4/ext/dbase/dbf_head.c:1.11 php4/ext/dbase/dbf_head.c:1.12
--- php4/ext/dbase/dbf_head.c:1.11  Thu Dec 12 22:09:52 2002
+++ php4/ext/dbase/dbf_head.c   Tue Apr  1 14:12:32 2003
@@ -247,9 +247,10 @@
 
cp = dp;
if ((fd = VCWD_OPEN(cp, o_flags|O_BINARY)) < 0) {
-   cp = (char *)malloc(256);
-   strcpy(cp, dp); strcat(cp, ".dbf");
+   cp = (char *)malloc(MAXPATHLEN);  /* So where does this get free()'d?  
-RL */
+   strncpy(cp, dp, MAXPATHLEN-5); strcat(cp, ".dbf");
if ((fd = VCWD_OPEN(cp, o_flags)) < 0) {
+   free(cp);
perror("open");
return NULL;
}



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

[PHP-CVS] cvs: php4(PHP_4_3) / TODO_SEGFAULTS /ext/dbase dbf_head.c

2003-04-01 Thread Rasmus Lerdorf 
rasmus  Tue Apr  1 14:10:35 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4   TODO_SEGFAULTS 
/php4/ext/dbase dbf_head.c 
  Log:
  Argh!!!  I guess nobody has ever looked at this code.  
  
  
Index: php4/TODO_SEGFAULTS
diff -u php4/TODO_SEGFAULTS:1.1.2.6 php4/TODO_SEGFAULTS:1.1.2.7
--- php4/TODO_SEGFAULTS:1.1.2.6 Tue Apr  1 13:47:01 2003
+++ php4/TODO_SEGFAULTS Tue Apr  1 14:10:35 2003
@@ -7,13 +7,13 @@
 i18n_convert/mb_convert_encoding (Moriyoshi Koizumi)
 socket_iovec_alloc (Rasmus)
exif_imagetype,exif_thumbnail (Rasmus)
+dbase_open (Rasmus)
 
 
 Open:
 
 array_pad
 bcsub (1)
-dbase_open
 mb_ereg (2)
 mb_ereg_match (2)
 mb_eregi (2)
Index: php4/ext/dbase/dbf_head.c
diff -u php4/ext/dbase/dbf_head.c:1.10.8.1 php4/ext/dbase/dbf_head.c:1.10.8.2
--- php4/ext/dbase/dbf_head.c:1.10.8.1  Fri Dec 13 11:54:49 2002
+++ php4/ext/dbase/dbf_head.c   Tue Apr  1 14:10:35 2003
@@ -247,9 +247,10 @@
 
cp = dp;
if ((fd = VCWD_OPEN(cp, o_flags|O_BINARY)) < 0) {
-   cp = (char *)malloc(256);
-   strcpy(cp, dp); strcat(cp, ".dbf");
+   cp = (char *)malloc(MAXPATHLEN);  /* So where does this get free()'d?  
-RL */
+   strncpy(cp, dp, MAXPATHLEN-5); strcat(cp, ".dbf");
if ((fd = VCWD_OPEN(cp, o_flags)) < 0) {
+   free(cp);
perror("open");
return NULL;
}



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

[PHP-CVS] cvs: php4 /ext/standard/tests/filters bug22538.phpt

2003-04-01 Thread Moriyoshi Koizumi 
moriyoshi   Tue Apr  1 14:10:04 2003 EDT

  Added files: 
/php4/ext/standard/tests/filtersbug22538.phpt 
  Log:
  Added a test case for bug #22538
  
  

Index: php4/ext/standard/tests/filters/bug22538.phpt
+++ php4/ext/standard/tests/filters/bug22538.phpt
--TEST--
Bug #22538 (filtered stream doesn't update file pointer)
--FILE--

--EXPECT--




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

[PHP-CVS] cvs: php4 /ext/mbstring php_mbregex.c

2003-04-01 Thread Moriyoshi Koizumi 
moriyoshi   Tue Apr  1 13:56:59 2003 EDT

  Modified files:  
/php4/ext/mbstring  php_mbregex.c 
  Log:
  oops
  
  
Index: php4/ext/mbstring/php_mbregex.c
diff -u php4/ext/mbstring/php_mbregex.c:1.35 php4/ext/mbstring/php_mbregex.c:1.36
--- php4/ext/mbstring/php_mbregex.c:1.35Tue Apr  1 13:56:26 2003
+++ php4/ext/mbstring/php_mbregex.c Tue Apr  1 13:56:59 2003
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_mbregex.c,v 1.35 2003/04/01 18:56:26 moriyoshi Exp $ */
+/* $Id: php_mbregex.c,v 1.36 2003/04/01 18:56:59 moriyoshi Exp $ */
 
 
 #ifdef HAVE_CONFIG_H
@@ -234,7 +234,7 @@
const char *err_str = NULL;
mb_regex_t *rc = NULL;
 
-   if(1 || zend_hash_find(&MBSTRG(ht_rc), (char *)pattern, patlen+1, (void **) 
&rc) == FAILURE ||
+   if(zend_hash_find(&MBSTRG(ht_rc), (char *)pattern, patlen+1, (void **) &rc) == 
FAILURE ||
rc->options != options || rc->mbctype != mbctype) {
memset(pre, 0, sizeof(*pre));
pre->fastmap = (char*)emalloc((1 << MBRE_BYTEWIDTH)*sizeof(char));



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

[PHP-CVS] cvs: php4 /ext/mbstring php_mbregex.c

2003-04-01 Thread Moriyoshi Koizumi 
moriyoshi   Tue Apr  1 13:56:26 2003 EDT

  Modified files:  
/php4/ext/mbstring  php_mbregex.c 
  Log:
  Reverted the last patch; the problem is elsewhere..
  
  
Index: php4/ext/mbstring/php_mbregex.c
diff -u php4/ext/mbstring/php_mbregex.c:1.34 php4/ext/mbstring/php_mbregex.c:1.35
--- php4/ext/mbstring/php_mbregex.c:1.34Tue Apr  1 13:44:00 2003
+++ php4/ext/mbstring/php_mbregex.c Tue Apr  1 13:56:26 2003
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_mbregex.c,v 1.34 2003/04/01 18:44:00 moriyoshi Exp $ */
+/* $Id: php_mbregex.c,v 1.35 2003/04/01 18:56:26 moriyoshi Exp $ */
 
 
 #ifdef HAVE_CONFIG_H
@@ -96,6 +96,7 @@
 {
MBSTRG(default_mbctype) = MBCTYPE_EUC;
MBSTRG(current_mbctype) = MBCTYPE_EUC;
+   zend_hash_init(&(MBSTRG(ht_rc)), 0, NULL, (void (*)(void *)) 
php_mb_regex_free_cache, 1);
MBSTRG(search_str) = (zval**)0;
MBSTRG(search_str_val) = (zval*)0;
MBSTRG(search_re) = (mb_regex_t*)0;
@@ -107,6 +108,7 @@
 /* {{{ _php_mb_regex_globals_dtor */
 void _php_mb_regex_globals_dtor(zend_mbstring_globals *pglobals TSRMLS_DC) 
 {
+   zend_hash_destroy(&MBSTRG(ht_rc));
 }
 /* }}} */
 
@@ -136,7 +138,6 @@
 PHP_RINIT_FUNCTION(mb_regex)
 {
MBSTRG(regex_default_options) = MBRE_OPTION_POSIXLINE;
-   zend_hash_init(&(MBSTRG(ht_rc)), 0, NULL, (void (*)(void *)) 
php_mb_regex_free_cache, 0);
 
return SUCCESS;
 }
@@ -166,7 +167,7 @@
efree(MBSTRG(search_regs));
MBSTRG(search_regs) = (struct mbre_registers*)0;
}
-   zend_hash_destroy(&MBSTRG(ht_rc));
+   zend_hash_clean(&MBSTRG(ht_rc));
 
return SUCCESS;
 }
@@ -233,7 +234,7 @@
const char *err_str = NULL;
mb_regex_t *rc = NULL;
 
-   if(zend_hash_find(&MBSTRG(ht_rc), (char *)pattern, patlen+1, (void **) &rc) == 
FAILURE ||
+   if(1 || zend_hash_find(&MBSTRG(ht_rc), (char *)pattern, patlen+1, (void **) 
&rc) == FAILURE ||
rc->options != options || rc->mbctype != mbctype) {
memset(pre, 0, sizeof(*pre));
pre->fastmap = (char*)emalloc((1 << MBRE_BYTEWIDTH)*sizeof(char));



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

[PHP-CVS] cvs: php4 /ext/exif exif.c

2003-04-01 Thread Rasmus Lerdorf 
rasmus  Tue Apr  1 13:50:31 2003 EDT

  Modified files:  
/php4/ext/exif  exif.c 
  Log:
  MFB
  
  
Index: php4/ext/exif/exif.c
diff -u php4/ext/exif/exif.c:1.140 php4/ext/exif/exif.c:1.141
--- php4/ext/exif/exif.c:1.140  Sat Jan 18 14:06:29 2003
+++ php4/ext/exif/exif.cTue Apr  1 13:50:31 2003
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: exif.c,v 1.140 2003/01/18 19:06:29 helly Exp $ */
+/* $Id: exif.c,v 1.141 2003/04/01 18:50:31 rasmus Exp $ */
 
 /*  ToDos
  *
@@ -95,7 +95,7 @@
 };
 /* }}} */
 
-#define EXIF_VERSION "1.4 $Id: exif.c,v 1.140 2003/01/18 19:06:29 helly Exp $"
+#define EXIF_VERSION "1.4 $Id: exif.c,v 1.141 2003/04/01 18:50:31 rasmus Exp $"
 
 /* {{{ PHP_MINFO_FUNCTION
  */
@@ -3920,17 +3920,9 @@
}
 
convert_to_string_ex(p_name);
-   if (arg_c >= 3) {
-   zval_dtor(*p_width);
-   zval_dtor(*p_height);
-   }
-   if (arg_c >= 4) {
-   zval_dtor(*p_imagetype);
-   }
 
ret = exif_read_file(&ImageInfo, Z_STRVAL_PP(p_name), 1, 0 TSRMLS_CC);
if (ret==FALSE) {
-   exif_discard_imageinfo(&ImageInfo);
RETURN_FALSE;
}
 
@@ -3951,10 +3943,13 @@
if (!ImageInfo.Thumbnail.width || !ImageInfo.Thumbnail.height) {
exif_scan_thumbnail(&ImageInfo TSRMLS_CC);
}
+   zval_dtor(*p_width);
+   zval_dtor(*p_height);
ZVAL_LONG(*p_width,  ImageInfo.Thumbnail.width);
ZVAL_LONG(*p_height, ImageInfo.Thumbnail.height);
}
if (arg_c >= 4) {
+   zval_dtor(*p_imagetype);
ZVAL_LONG(*p_imagetype, ImageInfo.Thumbnail.filetype);
}
 
@@ -3984,6 +3979,7 @@
if (zend_get_parameters_ex(1, &arg1) == FAILURE)
WRONG_PARAM_COUNT;
 
+   convert_to_string_ex(arg1);
stream = php_stream_open_wrapper(Z_STRVAL_PP(arg1), "rb", 
IGNORE_PATH|ENFORCE_SAFE_MODE|REPORT_ERRORS, NULL);
 
if (stream == NULL) {



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

[PHP-CVS] cvs: php4(PHP_4_3) / TODO_SEGFAULTS /ext/exif exif.c

2003-04-01 Thread Rasmus Lerdorf 
rasmus  Tue Apr  1 13:47:01 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4   TODO_SEGFAULTS 
/php4/ext/exif  exif.c 
  Log:
  Fix exif crashes
  
  
Index: php4/TODO_SEGFAULTS
diff -u php4/TODO_SEGFAULTS:1.1.2.5 php4/TODO_SEGFAULTS:1.1.2.6
--- php4/TODO_SEGFAULTS:1.1.2.5 Tue Apr  1 13:26:14 2003
+++ php4/TODO_SEGFAULTS Tue Apr  1 13:47:01 2003
@@ -6,7 +6,7 @@
 
 i18n_convert/mb_convert_encoding (Moriyoshi Koizumi)
 socket_iovec_alloc (Rasmus)
-
+   exif_imagetype,exif_thumbnail (Rasmus)
 
 
 Open:
@@ -14,8 +14,6 @@
 array_pad
 bcsub (1)
 dbase_open
-exif_imagetype
-exif_thumbnail
 mb_ereg (2)
 mb_ereg_match (2)
 mb_eregi (2)
Index: php4/ext/exif/exif.c
diff -u php4/ext/exif/exif.c:1.118.2.13 php4/ext/exif/exif.c:1.118.2.14
--- php4/ext/exif/exif.c:1.118.2.13 Tue Dec 31 11:34:27 2002
+++ php4/ext/exif/exif.cTue Apr  1 13:47:01 2003
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: exif.c,v 1.118.2.13 2002/12/31 16:34:27 sebastian Exp $ */
+/* $Id: exif.c,v 1.118.2.14 2003/04/01 18:47:01 rasmus Exp $ */
 
 /*  ToDos
  *
@@ -95,7 +95,7 @@
 };
 /* }}} */
 
-#define EXIF_VERSION "1.4 $Id: exif.c,v 1.118.2.13 2002/12/31 16:34:27 sebastian Exp 
$"
+#define EXIF_VERSION "1.4 $Id: exif.c,v 1.118.2.14 2003/04/01 18:47:01 rasmus Exp $"
 
 /* {{{ PHP_MINFO_FUNCTION
  */
@@ -4012,17 +4012,9 @@
}
 
convert_to_string_ex(p_name);
-   if (arg_c >= 3) {
-   zval_dtor(*p_width);
-   zval_dtor(*p_height);
-   }
-   if (arg_c >= 4) {
-   zval_dtor(*p_imagetype);
-   }
 
ret = exif_read_file(&ImageInfo, Z_STRVAL_PP(p_name), 1, 0 TSRMLS_CC);
if (ret==FALSE) {
-   exif_discard_imageinfo(&ImageInfo);
RETURN_FALSE;
}
 
@@ -4043,10 +4035,13 @@
if (!ImageInfo.Thumbnail.width || !ImageInfo.Thumbnail.height) {
exif_scan_thumbnail(&ImageInfo TSRMLS_CC);
}
+   zval_dtor(*p_width);
+   zval_dtor(*p_height);
ZVAL_LONG(*p_width,  ImageInfo.Thumbnail.width);
ZVAL_LONG(*p_height, ImageInfo.Thumbnail.height);
}
if (arg_c >= 4) {
+   zval_dtor(*p_imagetype);
ZVAL_LONG(*p_imagetype, ImageInfo.Thumbnail.filetype);
}
 
@@ -4076,6 +4071,7 @@
if (zend_get_parameters_ex(1, &arg1) == FAILURE)
WRONG_PARAM_COUNT;
 
+   convert_to_string_ex(arg1);
stream = php_stream_open_wrapper(Z_STRVAL_PP(arg1), "rb", 
IGNORE_PATH|ENFORCE_SAFE_MODE|REPORT_ERRORS, NULL);
 
if (stream == NULL) {



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

[PHP-CVS] cvs: php4 /ext/mbstring php_mbregex.c

2003-04-01 Thread Moriyoshi Koizumi 
moriyoshi   Tue Apr  1 13:44:00 2003 EDT

  Modified files:  
/php4/ext/mbstring  php_mbregex.c 
  Log:
  Fixed crash that occurs due to an abused persistent hashtable.
  # thanks Sascha again.
  
  
  
Index: php4/ext/mbstring/php_mbregex.c
diff -u php4/ext/mbstring/php_mbregex.c:1.33 php4/ext/mbstring/php_mbregex.c:1.34
--- php4/ext/mbstring/php_mbregex.c:1.33Tue Mar  4 12:10:29 2003
+++ php4/ext/mbstring/php_mbregex.c Tue Apr  1 13:44:00 2003
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_mbregex.c,v 1.33 2003/03/04 17:10:29 moriyoshi Exp $ */
+/* $Id: php_mbregex.c,v 1.34 2003/04/01 18:44:00 moriyoshi Exp $ */
 
 
 #ifdef HAVE_CONFIG_H
@@ -96,7 +96,6 @@
 {
MBSTRG(default_mbctype) = MBCTYPE_EUC;
MBSTRG(current_mbctype) = MBCTYPE_EUC;
-   zend_hash_init(&(MBSTRG(ht_rc)), 0, NULL, (void (*)(void *)) 
php_mb_regex_free_cache, 1);
MBSTRG(search_str) = (zval**)0;
MBSTRG(search_str_val) = (zval*)0;
MBSTRG(search_re) = (mb_regex_t*)0;
@@ -108,7 +107,6 @@
 /* {{{ _php_mb_regex_globals_dtor */
 void _php_mb_regex_globals_dtor(zend_mbstring_globals *pglobals TSRMLS_DC) 
 {
-   zend_hash_destroy(&MBSTRG(ht_rc));
 }
 /* }}} */
 
@@ -138,6 +136,7 @@
 PHP_RINIT_FUNCTION(mb_regex)
 {
MBSTRG(regex_default_options) = MBRE_OPTION_POSIXLINE;
+   zend_hash_init(&(MBSTRG(ht_rc)), 0, NULL, (void (*)(void *)) 
php_mb_regex_free_cache, 0);
 
return SUCCESS;
 }
@@ -167,7 +166,7 @@
efree(MBSTRG(search_regs));
MBSTRG(search_regs) = (struct mbre_registers*)0;
}
-   zend_hash_clean(&MBSTRG(ht_rc));
+   zend_hash_destroy(&MBSTRG(ht_rc));
 
return SUCCESS;
 }



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

[PHP-CVS] cvs: php4(PHP_4_3) / TODO_SEGFAULTS

2003-04-01 Thread Rasmus Lerdorf 
rasmus  Tue Apr  1 13:26:14 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4   TODO_SEGFAULTS 
  Log:
  Update (not fixed in HEAD because the API for this function needs to
  change in PHP5.  It is moronic the way it is now)
  
  
Index: php4/TODO_SEGFAULTS
diff -u php4/TODO_SEGFAULTS:1.1.2.4 php4/TODO_SEGFAULTS:1.1.2.5
--- php4/TODO_SEGFAULTS:1.1.2.4 Tue Apr  1 08:02:46 2003
+++ php4/TODO_SEGFAULTS Tue Apr  1 13:26:14 2003
@@ -5,6 +5,7 @@
 Fixed:
 
 i18n_convert/mb_convert_encoding (Moriyoshi Koizumi)
+socket_iovec_alloc (Rasmus)
 
 
 
@@ -21,7 +22,6 @@
 mb_split
 ob_start (3)
 setlocale
-socket_iovec_alloc
 unregister_tick_function
 xml_parser_create
 



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

[PHP-CVS] cvs: php4(PHP_4_3) /ext/sockets sockets.c

2003-04-01 Thread Rasmus Lerdorf 
rasmus  Tue Apr  1 13:12:24 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/sockets   sockets.c 
  Log:
  Ok, really fix socket_iovec_alloc() this time
  
  
Index: php4/ext/sockets/sockets.c
diff -u php4/ext/sockets/sockets.c:1.125.2.8 php4/ext/sockets/sockets.c:1.125.2.9
--- php4/ext/sockets/sockets.c:1.125.2.8Tue Mar 25 14:26:18 2003
+++ php4/ext/sockets/sockets.c  Tue Apr  1 13:12:24 2003
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: sockets.c,v 1.125.2.8 2003/03/25 19:26:18 rasmus Exp $ */
+/* $Id: sockets.c,v 1.125.2.9 2003/04/01 18:12:24 rasmus Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1113,19 +1113,23 @@
convert_to_long_ex(args[0]);
num_vectors = Z_LVAL_PP(args[0]);
 
-   if((argc-1) < num_vectors) {
+   if(num_vectors < 0 || (argc-1) < num_vectors) {
efree(args);
WRONG_PARAM_COUNT;
}
+
vector_array = emalloc(sizeof(struct iovec)*(num_vectors+1));
 
for (i = 0, j = 1; i < num_vectors; i++, j++) {
convert_to_long_ex(args[j]);
-   
-   if(Z_LVAL_PP(args[j])>0) {
-   vector_array[i].iov_base= 
(char*)emalloc(Z_LVAL_PP(args[j]));
-   vector_array[i].iov_len = Z_LVAL_PP(args[j]);
+   if(Z_LVAL_PP(args[j])<=0 || Z_LVAL_PP(args[j])>1048576) {
+   php_error(E_WARNING, "%s() vector %d is invalid", 
get_active_function_name(TSRMLS_C), j);
+   efree(args);
+   efree(vector_array);
+   RETURN_FALSE;
}
+   vector_array[i].iov_base= (char*)emalloc(Z_LVAL_PP(args[j]));
+   vector_array[i].iov_len = Z_LVAL_PP(args[j]);
}

efree(args);



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

[PHP-CVS] cvs: php4 / NEWS

2003-04-01 Thread Jani Taskinen 
sniper  Tue Apr  1 11:02:31 2003 EDT

  Modified files:  
/php4   NEWS 
  Log:
  crap removal
  
Index: php4/NEWS
diff -u php4/NEWS:1.1386 php4/NEWS:1.1387
--- php4/NEWS:1.1386Mon Mar 31 20:30:50 2003
+++ php4/NEWS   Tue Apr  1 11:02:31 2003
@@ -1,7 +1,6 @@
 PHPNEWS
 |||
 ? ? ??? 200?, Version 5.0.0
-- now addslashes() do it also on cybase magic mode(moshe).
 - Moved extensions to PECL (http://pear.php.net/): (James, Tal)
   . ext/fribidi
 - Fixed bug #22386 (Using browscap causes segfault). (Jay)



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

[PHP-CVS] cvs: php4(PHP_4_3) / NEWS

2003-04-01 Thread Jani Taskinen 
sniper  Tue Apr  1 10:38:40 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4   NEWS 
  Log:
  BFN
  
Index: php4/NEWS
diff -u php4/NEWS:1.1247.2.156 php4/NEWS:1.1247.2.157
--- php4/NEWS:1.1247.2.156  Mon Mar 31 18:29:30 2003
+++ php4/NEWS   Tue Apr  1 10:38:40 2003
@@ -34,6 +34,7 @@
 - Fixed several 64-bit problems. (Dave)
 - Fixed several errors in hwapi extension. Objects weren't handled properly. (Uwe)
 - Fixed bug #22989 (sendmail not found by configure). ([EMAIL PROTECTED])
+- Fixed bug #22987 (missing perror() check in configure). (Jani)
 - Fixed bug #22965 (Crash in gd lib's ImageFillToBorder()). (Ilia)
 - Fixed bug #22844 (Changing bool value via -d or ini_set(), On would be Off). (Ilia)
 - Fixed bug #22775 (Fatal errors exit with status 0 with CGI/CLI). (Jani)



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

[PHP-CVS] cvs: php4(PHP_4_3) / configure.in

2003-04-01 Thread Jani Taskinen 
sniper  Tue Apr  1 10:36:21 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4   configure.in 
  Log:
  MFH: Fixed bug #22987 (missing perror() check in configure)
  
Index: php4/configure.in
diff -u php4/configure.in:1.396.2.44 php4/configure.in:1.396.2.45
--- php4/configure.in:1.396.2.44Mon Mar 31 09:01:55 2003
+++ php4/configure.in   Tue Apr  1 10:36:21 2003
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.396.2.44 2003/03/31 14:01:55 ddhill Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.396.2.45 2003/04/01 15:36:21 sniper Exp $ -*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -479,6 +479,7 @@
 mkstemp \
 mmap \
 nl_langinfo \
+perror \
 poll \
 putenv \
 realpath \



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

[PHP-CVS] cvs: php4 / configure.in

2003-04-01 Thread Jani Taskinen 
sniper  Tue Apr  1 10:35:58 2003 EDT

  Modified files:  
/php4   configure.in 
  Log:
  Fixed bug #22987 (missing perror() check in configure)
  
Index: php4/configure.in
diff -u php4/configure.in:1.436 php4/configure.in:1.437
--- php4/configure.in:1.436 Sat Mar 29 10:54:19 2003
+++ php4/configure.in   Tue Apr  1 10:35:57 2003
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.436 2003/03/29 15:54:19 moriyoshi Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.437 2003/04/01 15:35:57 sniper Exp $ -*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -481,6 +481,7 @@
 mkstemp \
 mmap \
 nl_langinfo \
+perror \
 poll \
 putenv \
 realpath \



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

[PHP-CVS] cvs: php4(PHP_4_3) / TODO_SEGFAULTS

2003-04-01 Thread Sascha Schumann 
sas Tue Apr  1 08:02:46 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4   TODO_SEGFAULTS 
  Log:
  more insight re. ob_start bug
  
  
Index: php4/TODO_SEGFAULTS
diff -u php4/TODO_SEGFAULTS:1.1.2.3 php4/TODO_SEGFAULTS:1.1.2.4
--- php4/TODO_SEGFAULTS:1.1.2.3 Tue Apr  1 07:54:48 2003
+++ php4/TODO_SEGFAULTS Tue Apr  1 08:02:46 2003
@@ -40,10 +40,13 @@
 
format was zero.  The zval appeared to be fubar'ed.
 
-The current do_crash script does not cause a segfault.  An older
-version does however:
+When one comments out the (unused) line
 
-   http://schumann.cx/do_crash_ob_start.txt>
+$maxa = array_fill(100,1000,&$maxn);
+
+in the current test script, the segfault can be reproduced (it probably
+influences the heap layout, so that ob_start does not scribble over 
+important memory).
 
 
 Methodology



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

[PHP-CVS] cvs: php4(PHP_4_3) / TODO_SEGFAULTS

2003-04-01 Thread Sascha Schumann 
sas Tue Apr  1 07:54:48 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4   TODO_SEGFAULTS 
  Log:
  The ob_start issue is reproducible.
  
  
Index: php4/TODO_SEGFAULTS
diff -u php4/TODO_SEGFAULTS:1.1.2.2 php4/TODO_SEGFAULTS:1.1.2.3
--- php4/TODO_SEGFAULTS:1.1.2.2 Tue Apr  1 07:43:45 2003
+++ php4/TODO_SEGFAULTS Tue Apr  1 07:54:48 2003
@@ -36,24 +36,23 @@
 (3) calling ob_start in weird ways caused a segfault in 
 php_formatted_print(). In this line:

-   format = Z_STRVAL_PP(args[0]);
+   format = Z_STRVAL_PP(args[0]);
 
format was zero.  The zval appeared to be fubar'ed.
 
-I am not able to reproduce this particular issue at the moment.  I
-was not able to create a simple test case for this initially, so
-the lack of reproducibility likely relates to modifications in the 
-now-extended test script.
+The current do_crash script does not cause a segfault.  An older
+version does however:
 
+   http://schumann.cx/do_crash_ob_start.txt>
 
 
 Methodology
 
 1. Use a plain PHP_4_3 tree
 2. Use the config.nice from ammendment 1.
-3. Download the test script
+3. Download the test script from:
 
-   http://schumann.cx/do_crash.txt>
+http://schumann.cx/do_crash.txt>
 
 4a. Use the scripts funcparse.awk/genfunclist.sh from phpdoc/scripts
 for creating a plain text function list.  Feed that list to



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

[PHP-CVS] cvs: php4 /ext/standard/tests/strings bug22904.phpt

2003-04-01 Thread Moshe Doron 
momoTue Apr  1 07:54:36 2003 EDT

  Modified files:  
/php4/ext/standard/tests/stringsbug22904.phpt 
  Log:
  oops
  
Index: php4/ext/standard/tests/strings/bug22904.phpt
diff -u php4/ext/standard/tests/strings/bug22904.phpt:1.2 
php4/ext/standard/tests/strings/bug22904.phpt:1.3
--- php4/ext/standard/tests/strings/bug22904.phpt:1.2   Tue Apr  1 07:53:44 2003
+++ php4/ext/standard/tests/strings/bug22904.phpt   Tue Apr  1 07:54:35 2003
@@ -1,8 +1,9 @@
 --TEST--
 Bug #22904 (magic mode failed for cybase with '\0')
 --FILE--
-
 --EXPECT--
-not active yet
\ No newline at end of file
+not active yet



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

[PHP-CVS] cvs: php4 /ext/standard/tests/strings bug22904.phpt

2003-04-01 Thread Moshe Doron 
momoTue Apr  1 07:53:44 2003 EDT

  Modified files:  
/php4/ext/standard/tests/stringsbug22904.phpt 
  Log:
  revert due the last string.c revert
  
Index: php4/ext/standard/tests/strings/bug22904.phpt
diff -u php4/ext/standard/tests/strings/bug22904.phpt:1.1 
php4/ext/standard/tests/strings/bug22904.phpt:1.2
--- php4/ext/standard/tests/strings/bug22904.phpt:1.1   Mon Mar 31 14:01:43 2003
+++ php4/ext/standard/tests/strings/bug22904.phpt   Tue Apr  1 07:53:44 2003
@@ -2,23 +2,28 @@
 Bug #22904 (magic mode failed for cybase with '\0')
 --FILE--
 
---EXPECT--
+/*
 g\g"\0g'
 g\\g"\\0g''
 g\g"\0g'
 g\g"\0g'
 g\\g\"\\0g\'
 g\g"\0g'
+*/
+}
+?>
+--EXPECT--
+not active yet
\ No newline at end of file



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

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

2003-04-01 Thread Moshe Doron 
momoTue Apr  1 07:46:02 2003 EDT

  Modified files:  
/php4/ext/standard  string.c 
  Log:
  revert last commit for now
  
Index: php4/ext/standard/string.c
diff -u php4/ext/standard/string.c:1.366 php4/ext/standard/string.c:1.367
--- php4/ext/standard/string.c:1.366Mon Mar 31 13:56:41 2003
+++ php4/ext/standard/string.c  Tue Apr  1 07:46:01 2003
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: string.c,v 1.366 2003/03/31 18:56:41 momo Exp $ */
+/* $Id: string.c,v 1.367 2003/04/01 12:46:01 momo Exp $ */
 
 /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
 
@@ -2331,14 +2331,9 @@
l--;
}
*s++ = *t++;
-   } else if (*t == '\\' && l > 0) {
-   if(t[1] == '0') {
-   *s++='\0';
-   t++;
-   } else {
-   *s++=*(++t);
-   }
-   t++;
+   } else if (*t == '\\' && t[1] == '0' && l > 0) {
+   *s++='\0';
+   t+=2;
if (len != NULL) {
(*len)--;
}
@@ -2632,10 +2627,6 @@
case '\'':
*target++ = '\'';
*target++ = '\'';
-   break;
-   case '\\':
-   *target++ = '\\';
-   *target++ = '\\';
break;
default:
*target++ = *source;



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

[PHP-CVS] cvs: php4(PHP_4_3) / TODO_SEGFAULTS

2003-04-01 Thread Sascha Schumann 
sas Tue Apr  1 07:43:45 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4   TODO_SEGFAULTS 
  Log:
  editing
  
Index: php4/TODO_SEGFAULTS
diff -u php4/TODO_SEGFAULTS:1.1.2.1 php4/TODO_SEGFAULTS:1.1.2.2
--- php4/TODO_SEGFAULTS:1.1.2.1 Tue Apr  1 07:38:35 2003
+++ php4/TODO_SEGFAULTS Tue Apr  1 07:43:45 2003
@@ -28,7 +28,7 @@
 Notes:
 
 (1) appears, when bcadd, bcmod, bcmul, bcscale, bcsqrt have been tested
-prior to it.  does not segfault otherwise.
+prior to it.  does not segfault when tested alone.
 
 (2) sometimes, mb_ereg passes the test, although a subsequent mbereg
 will cause a segfault. Probably something in-between screws up the engine.
@@ -38,10 +38,12 @@

format = Z_STRVAL_PP(args[0]);
 
+   format was zero.  The zval appeared to be fubar'ed.
+
 I am not able to reproduce this particular issue at the moment.  I
 was not able to create a simple test case for this initially, so
-the lack of reproducibility likely relates to changes in the 
-changed/now-extended test script.
+the lack of reproducibility likely relates to modifications in the 
+now-extended test script.
 
 
 



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

[PHP-CVS] cvs: php4(PHP_4_3) / TODO_SEGFAULTS

2003-04-01 Thread Sascha Schumann 
sas Tue Apr  1 07:38:35 2003 EDT

  Added files: (Branch: PHP_4_3)
/php4   TODO_SEGFAULTS 
  Log:
  Overview of open issues and how to reproduce
  
  



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

[PHP-CVS] cvs: php4(PHP_4_3) /ext/mbstring mbstring.c

2003-04-01 Thread Moriyoshi Koizumi 
moriyoshi   Tue Apr  1 06:50:31 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/mbstring  mbstring.c 
  Log:
  MFH(r-1.170): fixed crash in mb_convert_encoding() that occurs when a void
  array is passed as the third parameter.
  # thanks Sascha
  
  
Index: php4/ext/mbstring/mbstring.c
diff -u php4/ext/mbstring/mbstring.c:1.142.2.10 php4/ext/mbstring/mbstring.c:1.142.2.11
--- php4/ext/mbstring/mbstring.c:1.142.2.10 Wed Mar  5 01:16:54 2003
+++ php4/ext/mbstring/mbstring.cTue Apr  1 06:50:31 2003
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: mbstring.c,v 1.142.2.10 2003/03/05 06:16:54 moriyoshi Exp $ */
+/* $Id: mbstring.c,v 1.142.2.11 2003/04/01 11:50:31 moriyoshi Exp $ */
 
 /*
  * PHP4 Multibyte String module "mbstring"
@@ -2594,7 +2594,7 @@
zend_hash_move_forward(target_hash);
i--;
}
-   if ( !strlen(_from_encodings)) {
+   if (_from_encodings != NULL && !strlen(_from_encodings)) {
efree(_from_encodings);
_from_encodings = NULL;
}



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

[PHP-CVS] cvs: php4 /ext/mbstring mbstring.c

2003-04-01 Thread Moriyoshi Koizumi 
moriyoshi   Tue Apr  1 06:49:30 2003 EDT

  Modified files:  
/php4/ext/mbstring  mbstring.c 
  Log:
  Fixed crash in mb_convert_encoding() that occurs when a void array is
  passed as the third parameter
  
  
Index: php4/ext/mbstring/mbstring.c
diff -u php4/ext/mbstring/mbstring.c:1.169 php4/ext/mbstring/mbstring.c:1.170
--- php4/ext/mbstring/mbstring.c:1.169  Thu Mar 27 22:38:13 2003
+++ php4/ext/mbstring/mbstring.cTue Apr  1 06:49:30 2003
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: mbstring.c,v 1.169 2003/03/28 03:38:13 moriyoshi Exp $ */
+/* $Id: mbstring.c,v 1.170 2003/04/01 11:49:30 moriyoshi Exp $ */
 
 /*
  * PHP4 Multibyte String module "mbstring"
@@ -1969,7 +1969,7 @@
zend_hash_move_forward(target_hash);
i--;
}
-   if ( !strlen(_from_encodings)) {
+   if (_from_encodings != NULL && !strlen(_from_encodings)) {
efree(_from_encodings);
_from_encodings = NULL;
}



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

Re: [PHP-CVS] cvs: php4 / acinclude.m4

2003-04-01 Thread Jani Taskinen 
On Tue, 1 Apr 2003, Sascha Schumann wrote:

>> Jani added this in order to fix a bug iirc.
>
>..without understanding the problem.

   Oh, thou great one, why don't you enlighten us then? :)
  
   --Jani
   


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

[PHP-CVS] cvs: php4(PHP_4) /ext/standard info.c

2003-04-01 Thread Thies C. Arntzen 
thies   Tue Apr  1 06:05:51 2003 EDT

  Modified files:  (Branch: PHP_4)
/php4/ext/standard  info.c 
  Log:
  
  
Index: php4/ext/standard/info.c
diff -u php4/ext/standard/info.c:1.218.2.2 php4/ext/standard/info.c:1.218.2.2.2.1
--- php4/ext/standard/info.c:1.218.2.2  Tue Dec 31 11:35:29 2002
+++ php4/ext/standard/info.cTue Apr  1 06:05:50 2003
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: info.c,v 1.218.2.2 2002/12/31 16:35:29 sebastian Exp $ */
+/* $Id: info.c,v 1.218.2.2.2.1 2003/04/01 11:05:50 thies Exp $ */
 
 #include "php.h"
 #include "php_ini.h"
@@ -372,7 +372,7 @@
PUTS(SG(request_info).request_uri);
}
if ((ta->tm_mon==3) && (ta->tm_mday==1)) {
-   PUTS("?="PHP_EGG_LOGO_GUID"\" alt=\"Thies!\" />");
+   PUTS("?="PHP_EGG_LOGO_GUID"\" alt=\"Dog!\" />");
} else {
PUTS("?="PHP_LOGO_GUID"\" alt=\"PHP Logo\" />");
}



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

[PHP-CVS] cvs: php4 /ext/standard info.c

2003-04-01 Thread Thies C. Arntzen 
thies   Tue Apr  1 06:04:38 2003 EDT

  Modified files:  
/php4/ext/standard  info.c 
  Log:
  
  
Index: php4/ext/standard/info.c
diff -u php4/ext/standard/info.c:1.230 php4/ext/standard/info.c:1.231
--- php4/ext/standard/info.c:1.230  Tue Mar 25 03:07:12 2003
+++ php4/ext/standard/info.cTue Apr  1 06:04:38 2003
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: info.c,v 1.230 2003/03/25 08:07:12 sebastian Exp $ */
+/* $Id: info.c,v 1.231 2003/04/01 11:04:38 thies Exp $ */
 
 #include "php.h"
 #include "php_ini.h"
@@ -413,7 +413,7 @@
PUTS(SG(request_info).request_uri);
}
if ((ta->tm_mon==3) && (ta->tm_mday==1)) {
-   PUTS("?="PHP_EGG_LOGO_GUID"\" alt=\"Thies!\" />");
+   PUTS("?="PHP_EGG_LOGO_GUID"\" alt=\"Dog!\" />");
} else {
PUTS("?="PHP_LOGO_GUID"\" alt=\"PHP Logo\" />");
}



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

[PHP-CVS] cvs: php4 /ext/ircg ircg.c

2003-04-01 Thread Sascha Schumann 
sas Tue Apr  1 05:56:46 2003 EDT

  Modified files:  
/php4/ext/ircg  ircg.c 
  Log:
  Fix segfault, logic and lock issue in ircg_is_conn_alive
  
  
Index: php4/ext/ircg/ircg.c
diff -u php4/ext/ircg/ircg.c:1.167 php4/ext/ircg/ircg.c:1.168
--- php4/ext/ircg/ircg.c:1.167  Tue Apr  1 03:00:42 2003
+++ php4/ext/ircg/ircg.cTue Apr  1 05:56:46 2003
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: ircg.c,v 1.167 2003/04/01 08:00:42 sas Exp $ */
+/* $Id: ircg.c,v 1.168 2003/04/01 10:56:46 sas Exp $ */
 
 /* {{{ includes */
 
@@ -1500,10 +1500,10 @@
 
convert_to_long_ex(p1);
 
-   if ((conn = lookup_irconn(Z_LVAL_PP(p1
-   RETURN_TRUE;
+   if (!(conn = lookup_irconn(Z_LVAL_PP(p1
+   RETURN_FALSE;
put_irconn(conn);
-   RETURN_FALSE;
+   RETURN_TRUE;
 }
 /* }}} */
 



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

[PHP-CVS] cvs: php4(PHP_4) /ext/dba config.m4

2003-04-01 Thread Sascha Schumann 
sas Tue Apr  1 05:18:01 2003 EDT

  Modified files:  (Branch: PHP_4)
/php4/ext/dba   config.m4 
  Log:
  fix VPATH builds
  
Index: php4/ext/dba/config.m4
diff -u php4/ext/dba/config.m4:1.29.2.3 php4/ext/dba/config.m4:1.29.2.3.2.1
--- php4/ext/dba/config.m4:1.29.2.3 Mon Dec 30 14:13:44 2002
+++ php4/ext/dba/config.m4  Tue Apr  1 05:18:01 2003
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.29.2.3 2002/12/30 19:13:44 helly Exp $
+dnl $Id: config.m4,v 1.29.2.3.2.1 2003/04/01 10:18:01 sas Exp $
 dnl
 
 dnl Suppose we need FlatFile if no support or only CDB is used.
@@ -390,6 +390,8 @@
   AC_MSG_RESULT(yes)
   AC_DEFINE(HAVE_DBA, 1, [ ])
   PHP_NEW_EXTENSION(dba, dba.c dba_cdb.c dba_db2.c dba_dbm.c dba_gdbm.c dba_ndbm.c 
dba_db3.c dba_db4.c $cdb_sources $flat_sources, $ext_shared)
+  PHP_ADD_BUILD_DIR($ext_builddir/libcdb)
+  PHP_ADD_BUILD_DIR($ext_builddir/libflatfile)
   PHP_SUBST(DBA_SHARED_LIBADD)
 else
   AC_MSG_RESULT(no)



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

[PHP-CVS] cvs: php4(PHP_4_3) /ext/dba config.m4

2003-04-01 Thread Sascha Schumann 
sas Tue Apr  1 05:16:50 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/dba   config.m4 
  Log:
  fix VPATH builds
  
Index: php4/ext/dba/config.m4
diff -u php4/ext/dba/config.m4:1.29.2.13 php4/ext/dba/config.m4:1.29.2.14
--- php4/ext/dba/config.m4:1.29.2.13Sun Feb  9 14:58:18 2003
+++ php4/ext/dba/config.m4  Tue Apr  1 05:16:50 2003
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.29.2.13 2003/02/09 19:58:18 sniper Exp $
+dnl $Id: config.m4,v 1.29.2.14 2003/04/01 10:16:50 sas Exp $
 dnl
 
 dnl Suppose we need FlatFile if no support or only CDB is used.
@@ -407,6 +407,8 @@
   AC_MSG_RESULT(yes)
   AC_DEFINE(HAVE_DBA, 1, [ ])
   PHP_NEW_EXTENSION(dba, dba.c dba_cdb.c dba_db2.c dba_dbm.c dba_gdbm.c dba_ndbm.c 
dba_db3.c dba_db4.c dba_flatfile.c $cdb_sources $flat_sources, $ext_shared)
+  PHP_ADD_BUILD_DIR($ext_builddir/libcdb)
+  PHP_ADD_BUILD_DIR($ext_builddir/libflatfile)
   PHP_SUBST(DBA_SHARED_LIBADD)
 else
   AC_MSG_RESULT(no)



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

[PHP-CVS] cvs: php4 /ext/dba config.m4

2003-04-01 Thread Sascha Schumann 
sas Tue Apr  1 05:16:12 2003 EDT

  Modified files:  
/php4/ext/dba   config.m4 
  Log:
  fix VPATH builds
  
Index: php4/ext/dba/config.m4
diff -u php4/ext/dba/config.m4:1.45 php4/ext/dba/config.m4:1.46
--- php4/ext/dba/config.m4:1.45 Sat Feb 22 12:20:05 2003
+++ php4/ext/dba/config.m4  Tue Apr  1 05:16:12 2003
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.45 2003/02/22 17:20:05 helly Exp $
+dnl $Id: config.m4,v 1.46 2003/04/01 10:16:12 sas Exp $
 dnl
 
 dnl Suppose we need FlatFile if no support or only CDB is used.
@@ -426,6 +426,8 @@
   AC_MSG_RESULT(yes)
   AC_DEFINE(HAVE_DBA, 1, [ ])
   PHP_NEW_EXTENSION(dba, dba.c dba_cdb.c dba_db2.c dba_dbm.c dba_gdbm.c dba_ndbm.c 
dba_db3.c dba_db4.c dba_flatfile.c dba_inifile.c $cdb_sources $flat_sources 
$ini_sources, $ext_shared)
+  PHP_ADD_BUILD_DIR($ext_builddir/libcdb)
+  PHP_ADD_BUILD_DIR($ext_builddir/libflatfile)
   PHP_SUBST(DBA_SHARED_LIBADD)
 else
   AC_MSG_RESULT(no)



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

[PHP-CVS] cvs: php4(PHP_4_3) /ext/standard basic_functions.c

2003-04-01 Thread Sascha Schumann 
sas Tue Apr  1 05:03:19 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/standard  basic_functions.c 
  Log:
  MFH register_shutdown_function fix
  
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.543.2.9 
php4/ext/standard/basic_functions.c:1.543.2.10
--- php4/ext/standard/basic_functions.c:1.543.2.9   Thu Mar  6 15:58:16 2003
+++ php4/ext/standard/basic_functions.c Tue Apr  1 05:03:19 2003
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: basic_functions.c,v 1.543.2.9 2003/03/06 20:58:16 sesser Exp $ */
+/* $Id: basic_functions.c,v 1.543.2.10 2003/04/01 10:03:19 sas Exp $ */
 
 #include "php.h"
 #include "php_streams.h"
@@ -2112,6 +2112,7 @@
if (zend_get_parameters_array(ht, shutdown_function_entry.arg_count, 
shutdown_function_entry.arguments) == FAILURE) {
RETURN_FALSE;
}
+   convert_to_string(shutdown_function_entry.arguments[0]);
if (!BG(user_shutdown_function_names)) {
ALLOC_HASHTABLE(BG(user_shutdown_function_names));
zend_hash_init(BG(user_shutdown_function_names), 0, NULL, (void 
(*)(void *)) user_shutdown_function_dtor, 0);



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

[PHP-CVS] cvs: php4(PHP_4) /ext/standard basic_functions.c

2003-04-01 Thread Sascha Schumann 
sas Tue Apr  1 05:02:52 2003 EDT

  Modified files:  (Branch: PHP_4)
/php4/ext/standard  basic_functions.c 
  Log:
  MFH register_shutdown_function fix
  
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.543.2.5 
php4/ext/standard/basic_functions.c:1.543.2.5.2.1
--- php4/ext/standard/basic_functions.c:1.543.2.5   Tue Dec 31 11:35:25 2002
+++ php4/ext/standard/basic_functions.c Tue Apr  1 05:02:52 2003
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: basic_functions.c,v 1.543.2.5 2002/12/31 16:35:25 sebastian Exp $ */
+/* $Id: basic_functions.c,v 1.543.2.5.2.1 2003/04/01 10:02:52 sas Exp $ */
 
 #include "php.h"
 #include "php_streams.h"
@@ -2117,6 +2117,7 @@
if (zend_get_parameters_array(ht, shutdown_function_entry.arg_count, 
shutdown_function_entry.arguments) == FAILURE) {
RETURN_FALSE;
}
+   convert_to_string(shutdown_function_entry.arguments[0]);
if (!BG(user_shutdown_function_names)) {
ALLOC_HASHTABLE(BG(user_shutdown_function_names));
zend_hash_init(BG(user_shutdown_function_names), 0, NULL, (void 
(*)(void *)) user_shutdown_function_dtor, 0);



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

[PHP-CVS] cvs: php4 /ext/standard basic_functions.c

2003-04-01 Thread Sascha Schumann 
sas Tue Apr  1 05:02:29 2003 EDT

  Modified files:  
/php4/ext/standard  basic_functions.c 
  Log:
  Fix segfault in register_shutdown_function
  
  
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.599 
php4/ext/standard/basic_functions.c:1.600
--- php4/ext/standard/basic_functions.c:1.599   Tue Apr  1 00:30:32 2003
+++ php4/ext/standard/basic_functions.c Tue Apr  1 05:02:29 2003
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: basic_functions.c,v 1.599 2003/04/01 05:30:32 sebastian Exp $ */
+/* $Id: basic_functions.c,v 1.600 2003/04/01 10:02:29 sas Exp $ */
 
 #include "php.h"
 #include "php_streams.h"
@@ -2171,6 +2171,7 @@
if (zend_get_parameters_array(ht, shutdown_function_entry.arg_count, 
shutdown_function_entry.arguments) == FAILURE) {
RETURN_FALSE;
}
+   convert_to_string(shutdown_function_entry.arguments[0]);
if (!BG(user_shutdown_function_names)) {
ALLOC_HASHTABLE(BG(user_shutdown_function_names));
zend_hash_init(BG(user_shutdown_function_names), 0, NULL, (void 
(*)(void *)) user_shutdown_function_dtor, 0);



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

Re: [PHP-CVS] cvs: php4 / acinclude.m4

2003-04-01 Thread Sascha Schumann 
> Jani added this in order to fix a bug iirc.

..without understanding the problem.

- Sascha

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

Re: [PHP-CVS] cvs: php4 / acinclude.m4

2003-04-01 Thread Derick Rethans 
On Tue, 1 Apr 2003, Sascha Schumann wrote:

> sas   Tue Apr  1 03:05:01 2003 EDT
> 
>   Modified files:  
> /php4 acinclude.m4 
>   Log:
>   Don't need shtool

Jani added this in order to fix a bug iirc.

Derick

> Index: php4/acinclude.m4
> diff -u php4/acinclude.m4:1.235 php4/acinclude.m4:1.236
> --- php4/acinclude.m4:1.235   Mon Mar 31 18:21:41 2003
> +++ php4/acinclude.m4 Tue Apr  1 03:05:01 2003
> @@ -1,4 +1,4 @@
> -dnl $Id: acinclude.m4,v 1.235 2003/03/31 23:21:41 sniper Exp $
> +dnl $Id: acinclude.m4,v 1.236 2003/04/01 08:05:01 sas Exp $
>  dnl
>  dnl This file contains local autoconf functions.
>  
> @@ -28,7 +28,7 @@
>  dnl PHP_INIT_BUILD_SYSTEM
>  dnl
>  AC_DEFUN([PHP_INIT_BUILD_SYSTEM],[
> -test -d include || $php_shtool mkdir include
> +test -d include || mkdir include
>  > Makefile.objects
>  > Makefile.fragments
>  dnl We need to play tricks here to avoid matching the grep line itself
> 
> 
> 
> 

-- 
"my other box is your windows PC"
-
 Derick Rethans http://derickrethans.nl/ 
 PHP Magazine - PHP Magazine for Professionals   http://php-mag.net/
-

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

[PHP-CVS] cvs: php4(PHP_4_3) / acinclude.m4

2003-04-01 Thread Sascha Schumann 
sas Tue Apr  1 03:05:39 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4   acinclude.m4 
  Log:
  No need for shtool
  
  
Index: php4/acinclude.m4
diff -u php4/acinclude.m4:1.218.2.13 php4/acinclude.m4:1.218.2.14
--- php4/acinclude.m4:1.218.2.13Mon Mar 31 18:21:56 2003
+++ php4/acinclude.m4   Tue Apr  1 03:05:39 2003
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.218.2.13 2003/03/31 23:21:56 sniper Exp $
+dnl $Id: acinclude.m4,v 1.218.2.14 2003/04/01 08:05:39 sas Exp $
 dnl
 dnl This file contains local autoconf functions.
 
@@ -28,7 +28,7 @@
 dnl PHP_INIT_BUILD_SYSTEM
 dnl
 AC_DEFUN([PHP_INIT_BUILD_SYSTEM],[
-test -d include || $php_shtool mkdir include
+test -d include || mkdir include
 > Makefile.objects
 > Makefile.fragments
 dnl We need to play tricks here to avoid matching the egrep line itself



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

[PHP-CVS] cvs: php4 / acinclude.m4

2003-04-01 Thread Sascha Schumann 
sas Tue Apr  1 03:05:01 2003 EDT

  Modified files:  
/php4   acinclude.m4 
  Log:
  Don't need shtool
  
  
Index: php4/acinclude.m4
diff -u php4/acinclude.m4:1.235 php4/acinclude.m4:1.236
--- php4/acinclude.m4:1.235 Mon Mar 31 18:21:41 2003
+++ php4/acinclude.m4   Tue Apr  1 03:05:01 2003
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.235 2003/03/31 23:21:41 sniper Exp $
+dnl $Id: acinclude.m4,v 1.236 2003/04/01 08:05:01 sas Exp $
 dnl
 dnl This file contains local autoconf functions.
 
@@ -28,7 +28,7 @@
 dnl PHP_INIT_BUILD_SYSTEM
 dnl
 AC_DEFUN([PHP_INIT_BUILD_SYSTEM],[
-test -d include || $php_shtool mkdir include
+test -d include || mkdir include
 > Makefile.objects
 > Makefile.fragments
 dnl We need to play tricks here to avoid matching the grep line itself



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