[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS

[Marcus Boerger]

helly   Thu Oct 18 05:32:50 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  - BFN
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.976&r2=1.2027.2.547.2.977&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.976 php-src/NEWS:1.2027.2.547.2.977
--- php-src/NEWS:1.2027.2.547.2.976 Wed Oct 17 12:08:45 2007
+++ php-src/NEWSThu Oct 18 05:32:50 2007
@@ -51,7 +51,11 @@
 - Fixed bug #42767 (highlight_string() truncates trailing comment). (Ilia)
 - Fixed bug #42739 (mkdir() doesn't like a trailing slash when safe_mode is 
   enabled). (Ilia)
+- Fixed bug #42703 (Exception raised in an iterator::current() causes segfault
+  in FilterIterator) (Marcus)
 - Fixed bug #42699 (PHP_SELF duplicates path). (Dmitry)
+- Fixed bug #42654 (RecursiveIteratorIterator modifies only part of leaves)
+  (Marcus)
 - Fixed bug #42643 (CLI segfaults if using ATTR_PERSISTENT). (Ilia)
 - Fixed bug #42637 (SoapFault : Only http and https are allowed). (Bill Moran)
 - Fixed bug #42629 (Dynamically loaded PHP extensions need symbols exported

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

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/spl spl_array.c spl_iterators.c /ext/spl/tests bug41692.phpt bug42654.phpt

[Marcus Boerger]

helly   Thu Oct 18 05:26:55 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/splspl_array.c spl_iterators.c 
/php-src/ext/spl/tests  bug41692.phpt bug42654.phpt 
  Log:
  - MF53 Fix for #41692, #42703
  # Now in correct branch with fixed checkout and so on
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_array.c?r1=1.71.2.17.2.13&r2=1.71.2.17.2.14&diff_format=u
Index: php-src/ext/spl/spl_array.c
diff -u php-src/ext/spl/spl_array.c:1.71.2.17.2.13 
php-src/ext/spl/spl_array.c:1.71.2.17.2.14
--- php-src/ext/spl/spl_array.c:1.71.2.17.2.13  Fri Jul 20 10:53:56 2007
+++ php-src/ext/spl/spl_array.c Thu Oct 18 05:26:55 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: spl_array.c,v 1.71.2.17.2.13 2007/07/20 10:53:56 tony2001 Exp $ */
+/* $Id: spl_array.c,v 1.71.2.17.2.14 2007/10/18 05:26:55 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -1365,7 +1365,7 @@
Create a sub iterator for the current element (same class as $this) */
 SPL_METHOD(Array, getChildren)
 {
-   zval *object = getThis(), **entry;
+   zval *object = getThis(), **entry, *flags;
spl_array_object *intern = 
(spl_array_object*)zend_object_store_get_object(object TSRMLS_CC);
HashTable *aht = spl_array_get_hash_table(intern, 0 TSRMLS_CC);
 
@@ -1387,7 +1387,10 @@
RETURN_ZVAL(*entry, 0, 0);
}
 
-   spl_instantiate_arg_ex1(Z_OBJCE_P(getThis()), &return_value, 0, *entry 
TSRMLS_CC);
+  MAKE_STD_ZVAL(flags);
+  ZVAL_LONG(flags, SPL_ARRAY_USE_OTHER);
+   spl_instantiate_arg_ex2(intern->std.ce, &return_value, 0, *entry, flags 
TSRMLS_CC);
+   zval_ptr_dtor(&flags);
 }
 /* }}} */
 
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_iterators.c?r1=1.73.2.30.2.28&r2=1.73.2.30.2.29&diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.73.2.30.2.28 
php-src/ext/spl/spl_iterators.c:1.73.2.30.2.29
--- php-src/ext/spl/spl_iterators.c:1.73.2.30.2.28  Fri May 11 00:15:25 2007
+++ php-src/ext/spl/spl_iterators.c Thu Oct 18 05:26:55 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: spl_iterators.c,v 1.73.2.30.2.28 2007/05/11 00:15:25 helly Exp $ */
+/* $Id: spl_iterators.c,v 1.73.2.30.2.29 2007/10/18 05:26:55 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -1124,15 +1124,17 @@
spl_dual_it_free(intern TSRMLS_CC);
if (!check_more || spl_dual_it_valid(intern TSRMLS_CC) == SUCCESS) {

intern->inner.iterator->funcs->get_current_data(intern->inner.iterator, &data 
TSRMLS_CC);
-   intern->current.data = *data;
-   intern->current.data->refcount++;
+   if (data && *data) {
+ intern->current.data = *data;
+ intern->current.data->refcount++;
+   }
if (intern->inner.iterator->funcs->get_current_key) {
intern->current.key_type = 
intern->inner.iterator->funcs->get_current_key(intern->inner.iterator, 
&intern->current.str_key, &intern->current.str_key_len, 
&intern->current.int_key TSRMLS_CC);
} else {
intern->current.key_type = HASH_KEY_IS_LONG;
intern->current.int_key = intern->current.pos;
}
-   return SUCCESS;
+   return EG(exception) ? FAILURE : SUCCESS;
}
return FAILURE;
 }
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/bug41692.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/ext/spl/tests/bug41692.phpt
diff -u php-src/ext/spl/tests/bug41692.phpt:1.1.2.3 
php-src/ext/spl/tests/bug41692.phpt:1.1.2.4
--- php-src/ext/spl/tests/bug41692.phpt:1.1.2.3 Thu Oct 18 04:51:53 2007
+++ php-src/ext/spl/tests/bug41692.phpt Thu Oct 18 05:26:55 2007
@@ -21,44 +21,20 @@
 echo "Done\n";
 ?>
 --EXPECTF--
-object(Bar)#%d (2) {
-  ["foo":"Bar":private]=>
-  array(3) {
-[0]=>
-int(1)
-[1]=>
-int(2)
-[2]=>
-int(3)
-  }
-  ["storage":"ArrayObject":private]=>
-  array(3) {
-[0]=>
-int(1)
-[1]=>
-int(2)
-[2]=>
-int(3)
-  }
+object(Bar)#%d (3) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(2)
+  [2]=>
+  int(3)
 }
-object(Bar)#%d (2) {
-  ["foo":"Bar":private]=>
-  array(3) {
-[0]=>
-int(1)
-[1]=>
-int(2)
-[2]=>
-int(3)
-  }
-  ["storage":"ArrayObject":private]=>
-  array(3) {
-[0]=>
-int(1)
-[1]=>
-int(2)
-[2]=>
-int(3)
-  }
+object(Bar)#%d (3) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(2)
+  [2]=>
+  int(3)
 }
 Done
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/bug42654.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/ext/spl/tests/bug42654.phpt
diff -u php-src/ext/spl/tests/bug42654.phpt:1.1.4.2 
php-src/ext/spl/tests/bug42654.phpt:1.1.4.3
--- php-src/ext/spl/tests/bug42654.phpt:1.1.4.2 Thu Oct 18 04:4

[PHP-CVS] cvs: php-src /ext/spl spl_array.c

[Marcus Boerger]

helly   Thu Oct 18 05:19:13 2007 UTC

  Modified files:  
/php-src/ext/splspl_array.c 
  Log:
  - Missing piece
  
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_array.c?r1=1.131&r2=1.132&diff_format=u
Index: php-src/ext/spl/spl_array.c
diff -u php-src/ext/spl/spl_array.c:1.131 php-src/ext/spl/spl_array.c:1.132
--- php-src/ext/spl/spl_array.c:1.131   Thu Oct 18 04:49:54 2007
+++ php-src/ext/spl/spl_array.c Thu Oct 18 05:19:13 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: spl_array.c,v 1.131 2007/10/18 04:49:54 helly Exp $ */
+/* $Id: spl_array.c,v 1.132 2007/10/18 05:19:13 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -1418,7 +1418,7 @@
 
   MAKE_STD_ZVAL(flags);
   ZVAL_LONG(flags, SPL_ARRAY_USE_OTHER);
-   spl_instantiate_arg_ex1(intern->std.ce, &return_value, 0, *entry 
TSRMLS_CC);
+   spl_instantiate_arg_ex2(intern->std.ce, &return_value, 0, *entry, flags 
TSRMLS_CC);
zval_ptr_dtor(&flags);
 }
 /* }}} */

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

[PHP-CVS] cvs: php-src /ext/spl/tests bug42654.phpt bug42703.phpt

[Marcus Boerger]

helly   Thu Oct 18 05:09:49 2007 UTC

  Modified files:  
/php-src/ext/spl/tests  bug42654.phpt bug42703.phpt 
  Log:
  - Commit new tests to correct brnach (funny broken checkout)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/bug42654.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/spl/tests/bug42654.phpt
diff -u /dev/null php-src/ext/spl/tests/bug42654.phpt:1.2
--- /dev/null   Thu Oct 18 05:09:49 2007
+++ php-src/ext/spl/tests/bug42654.phpt Thu Oct 18 05:09:49 2007
@@ -0,0 +1,158 @@
+--TEST--
+Bug #42654 (RecursiveIteratorIterator modifies only part of leaves)
+--FILE--
+ 'val1',
+  array(2 => 'val2',
+array(3 => 'val3'),
+   ),
+  4 => 'val4'
+ );
+
+$iterator = new RecursiveIteratorIterator(new
+RecursiveArrayIterator($data));
+foreach($iterator as $foo) {
+$key = $iterator->key();
+echo "update $key\n";
+var_dump($iterator->getInnerIterator());
+$iterator->offsetSet($key, 'alter');
+var_dump($iterator->getInnerIterator());
+}
+$copy = $iterator->getArrayCopy();
+var_dump($copy);
+?>
+--EXPECTF--
+update 1
+object(RecursiveArrayIterator)#%d (1) {
+  ["storage":"ArrayIterator":private]=>
+  array(3) {
+[1]=>
+string(4) "val1"
+[2]=>
+array(2) {
+  [2]=>
+  string(4) "val2"
+  [3]=>
+  array(1) {
+[3]=>
+string(4) "val3"
+  }
+}
+[4]=>
+string(4) "val4"
+  }
+}
+object(RecursiveArrayIterator)#%d (1) {
+  ["storage":"ArrayIterator":private]=>
+  array(3) {
+[1]=>
+string(5) "alter"
+[2]=>
+array(2) {
+  [2]=>
+  string(4) "val2"
+  [3]=>
+  array(1) {
+[3]=>
+string(4) "val3"
+  }
+}
+[4]=>
+string(4) "val4"
+  }
+}
+update 2
+object(RecursiveArrayIterator)#%d (1) {
+  ["storage":"ArrayIterator":private]=>
+  array(2) {
+[2]=>
+string(4) "val2"
+[3]=>
+array(1) {
+  [3]=>
+  string(4) "val3"
+}
+  }
+}
+object(RecursiveArrayIterator)#%d (1) {
+  ["storage":"ArrayIterator":private]=>
+  array(2) {
+[2]=>
+string(5) "alter"
+[3]=>
+array(1) {
+  [3]=>
+  string(4) "val3"
+}
+  }
+}
+update 3
+object(RecursiveArrayIterator)#%d (1) {
+  ["storage":"ArrayIterator":private]=>
+  array(1) {
+[3]=>
+string(4) "val3"
+  }
+}
+object(RecursiveArrayIterator)#%d (1) {
+  ["storage":"ArrayIterator":private]=>
+  array(1) {
+[3]=>
+string(5) "alter"
+  }
+}
+update 4
+object(RecursiveArrayIterator)#%d (1) {
+  ["storage":"ArrayIterator":private]=>
+  array(3) {
+[1]=>
+string(5) "alter"
+[2]=>
+array(2) {
+  [2]=>
+  string(4) "val2"
+  [3]=>
+  array(1) {
+[3]=>
+string(4) "val3"
+  }
+}
+[4]=>
+string(4) "val4"
+  }
+}
+object(RecursiveArrayIterator)#%d (1) {
+  ["storage":"ArrayIterator":private]=>
+  array(3) {
+[1]=>
+string(5) "alter"
+[2]=>
+array(2) {
+  [2]=>
+  string(4) "val2"
+  [3]=>
+  array(1) {
+[3]=>
+string(4) "val3"
+  }
+}
+[4]=>
+string(5) "alter"
+  }
+}
+array(3) {
+  [1]=>
+  string(5) "alter"
+  [2]=>
+  array(2) {
+[2]=>
+string(4) "val2"
+[3]=>
+array(1) {
+  [3]=>
+  string(4) "val3"
+}
+  }
+  [4]=>
+  string(5) "alter"
+}
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/bug42703.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/spl/tests/bug42703.phpt
diff -u /dev/null php-src/ext/spl/tests/bug42703.phpt:1.2
--- /dev/null   Thu Oct 18 05:09:49 2007
+++ php-src/ext/spl/tests/bug42703.phpt Thu Oct 18 05:09:49 2007
@@ -0,0 +1,41 @@
+--TEST--
+Bug #42703 (Exception raised in an iterator::current() causes segfault in 
FilterIterator)
+--FILE--
+ $value) {
+   echo $key, $value;
+  }
+}
+catch (Exception $e) {
+   var_dump($e->getMessage());
+}
+
+var_dump($itit->current());
+var_dump($itit->key());
+?>
+--EXPECTF--
+string(3) "boo"
+NULL
+NULL

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

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/spl/tests bug41692.phpt

[Marcus Boerger]

helly   Thu Oct 18 04:51:53 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/spl/tests  bug41692.phpt 
  Log:
  - Fix test expectation
  
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/bug41692.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/spl/tests/bug41692.phpt
diff -u php-src/ext/spl/tests/bug41692.phpt:1.1.2.2 
php-src/ext/spl/tests/bug41692.phpt:1.1.2.3
--- php-src/ext/spl/tests/bug41692.phpt:1.1.2.2 Wed Jun 27 12:30:28 2007
+++ php-src/ext/spl/tests/bug41692.phpt Thu Oct 18 04:51:53 2007
@@ -21,20 +21,44 @@
 echo "Done\n";
 ?>
 --EXPECTF--
-object(Bar)#%d (3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
+object(Bar)#%d (2) {
+  ["foo":"Bar":private]=>
+  array(3) {
+[0]=>
+int(1)
+[1]=>
+int(2)
+[2]=>
+int(3)
+  }
+  ["storage":"ArrayObject":private]=>
+  array(3) {
+[0]=>
+int(1)
+[1]=>
+int(2)
+[2]=>
+int(3)
+  }
 }
-object(Bar)#%d (3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
+object(Bar)#%d (2) {
+  ["foo":"Bar":private]=>
+  array(3) {
+[0]=>
+int(1)
+[1]=>
+int(2)
+[2]=>
+int(3)
+  }
+  ["storage":"ArrayObject":private]=>
+  array(3) {
+[0]=>
+int(1)
+[1]=>
+int(2)
+[2]=>
+int(3)
+  }
 }
 Done

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

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/spl spl_array.c spl_iterators.c /ext/spl/tests bug42654.phpt bug42703.phpt

[Marcus Boerger]

helly   Thu Oct 18 04:49:55 2007 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/spl/tests  bug42654.phpt bug42703.phpt 

  Modified files:  
/php-src/ext/splspl_array.c spl_iterators.c 
  Log:
  - MFB #42654, #42704
  
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_array.c?r1=1.130&r2=1.131&diff_format=u
Index: php-src/ext/spl/spl_array.c
diff -u php-src/ext/spl/spl_array.c:1.130 php-src/ext/spl/spl_array.c:1.131
--- php-src/ext/spl/spl_array.c:1.130   Sun Oct  7 05:15:05 2007
+++ php-src/ext/spl/spl_array.c Thu Oct 18 04:49:54 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: spl_array.c,v 1.130 2007/10/07 05:15:05 davidw Exp $ */
+/* $Id: spl_array.c,v 1.131 2007/10/18 04:49:54 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -1394,7 +1394,7 @@
Create a sub iterator for the current element (same class as $this) */
 SPL_METHOD(Array, getChildren)
 {
-   zval *object = getThis(), **entry;
+   zval *object = getThis(), **entry, *flags;
spl_array_object *intern = 
(spl_array_object*)zend_object_store_get_object(object TSRMLS_CC);
HashTable *aht = spl_array_get_hash_table(intern, 0 TSRMLS_CC);
 
@@ -1416,7 +1416,10 @@
RETURN_ZVAL(*entry, 0, 0);
}
 
+  MAKE_STD_ZVAL(flags);
+  ZVAL_LONG(flags, SPL_ARRAY_USE_OTHER);
spl_instantiate_arg_ex1(intern->std.ce, &return_value, 0, *entry 
TSRMLS_CC);
+   zval_ptr_dtor(&flags);
 }
 /* }}} */
 
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_iterators.c?r1=1.165&r2=1.166&diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.165 
php-src/ext/spl/spl_iterators.c:1.166
--- php-src/ext/spl/spl_iterators.c:1.165   Sun Oct  7 05:15:05 2007
+++ php-src/ext/spl/spl_iterators.c Thu Oct 18 04:49:54 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: spl_iterators.c,v 1.165 2007/10/07 05:15:05 davidw Exp $ */
+/* $Id: spl_iterators.c,v 1.166 2007/10/18 04:49:54 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -1135,15 +1135,17 @@
spl_dual_it_free(intern TSRMLS_CC);
if (!check_more || spl_dual_it_valid(intern TSRMLS_CC) == SUCCESS) {

intern->inner.iterator->funcs->get_current_data(intern->inner.iterator, &data 
TSRMLS_CC);
-   intern->current.data = *data;
-   Z_ADDREF_P(intern->current.data);
+   if (data && *data) {
+ intern->current.data = *data;
+ Z_ADDREF_P(intern->current.data);
+   }
if (intern->inner.iterator->funcs->get_current_key) {
intern->current.key_type = 
intern->inner.iterator->funcs->get_current_key(intern->inner.iterator, 
&intern->current.str_key, &intern->current.str_key_len, 
&intern->current.int_key TSRMLS_CC);
} else {
intern->current.key_type = HASH_KEY_IS_LONG;
intern->current.int_key = intern->current.pos;
}
-   return SUCCESS;
+   return EG(exception) ? FAILURE : SUCCESS;
}
return FAILURE;
 }

http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/bug42654.phpt?view=markup&rev=1.1
Index: php-src/ext/spl/tests/bug42654.phpt
+++ php-src/ext/spl/tests/bug42654.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/bug42703.phpt?view=markup&rev=1.1
Index: php-src/ext/spl/tests/bug42703.phpt
+++ php-src/ext/spl/tests/bug42703.phpt

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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/spl spl_iterators.c /ext/spl/tests bug42703.phpt

[Marcus Boerger]

helly   Thu Oct 18 04:41:39 2007 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/spl/tests  bug42703.phpt 

  Modified files:  
/php-src/ext/splspl_iterators.c 
  Log:
  - Fix #42703
  
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_iterators.c?r1=1.73.2.30.2.28.2.2&r2=1.73.2.30.2.28.2.3&diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.73.2.30.2.28.2.2 
php-src/ext/spl/spl_iterators.c:1.73.2.30.2.28.2.3
--- php-src/ext/spl/spl_iterators.c:1.73.2.30.2.28.2.2  Sun Oct  7 05:22:06 2007
+++ php-src/ext/spl/spl_iterators.c Thu Oct 18 04:41:39 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: spl_iterators.c,v 1.73.2.30.2.28.2.2 2007/10/07 05:22:06 davidw Exp $ 
*/
+/* $Id: spl_iterators.c,v 1.73.2.30.2.28.2.3 2007/10/18 04:41:39 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -1124,15 +1124,17 @@
spl_dual_it_free(intern TSRMLS_CC);
if (!check_more || spl_dual_it_valid(intern TSRMLS_CC) == SUCCESS) {

intern->inner.iterator->funcs->get_current_data(intern->inner.iterator, &data 
TSRMLS_CC);
-   intern->current.data = *data;
-   Z_ADDREF_P(intern->current.data);
+   if (data && *data) {
+   intern->current.data = *data;
+   Z_ADDREF_P(intern->current.data);
+   }
if (intern->inner.iterator->funcs->get_current_key) {
intern->current.key_type = 
intern->inner.iterator->funcs->get_current_key(intern->inner.iterator, 
&intern->current.str_key, &intern->current.str_key_len, 
&intern->current.int_key TSRMLS_CC);
} else {
intern->current.key_type = HASH_KEY_IS_LONG;
intern->current.int_key = intern->current.pos;
}
-   return SUCCESS;
+   return EG(exception) ? FAILURE : SUCCESS;
}
return FAILURE;
 }

http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/bug42703.phpt?view=markup&rev=1.1
Index: php-src/ext/spl/tests/bug42703.phpt
+++ php-src/ext/spl/tests/bug42703.phpt

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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/spl spl_array.c /ext/spl/tests bug42654.phpt

[Marcus Boerger]

helly   Thu Oct 18 03:55:43 2007 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/spl/tests  bug42654.phpt 

  Modified files:  
/php-src/ext/splspl_array.c 
  Log:
  - Fix #42654 (maybe also a bunch of others)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_array.c?r1=1.71.2.17.2.13.2.2&r2=1.71.2.17.2.13.2.3&diff_format=u
Index: php-src/ext/spl/spl_array.c
diff -u php-src/ext/spl/spl_array.c:1.71.2.17.2.13.2.2 
php-src/ext/spl/spl_array.c:1.71.2.17.2.13.2.3
--- php-src/ext/spl/spl_array.c:1.71.2.17.2.13.2.2  Sun Oct  7 05:22:06 2007
+++ php-src/ext/spl/spl_array.c Thu Oct 18 03:55:42 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: spl_array.c,v 1.71.2.17.2.13.2.2 2007/10/07 05:22:06 davidw Exp $ */
+/* $Id: spl_array.c,v 1.71.2.17.2.13.2.3 2007/10/18 03:55:42 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -1365,7 +1365,7 @@
Create a sub iterator for the current element (same class as $this) */
 SPL_METHOD(Array, getChildren)
 {
-   zval *object = getThis(), **entry;
+   zval *object = getThis(), **entry, *flags;
spl_array_object *intern = 
(spl_array_object*)zend_object_store_get_object(object TSRMLS_CC);
HashTable *aht = spl_array_get_hash_table(intern, 0 TSRMLS_CC);
 
@@ -1387,7 +1387,10 @@
RETURN_ZVAL(*entry, 0, 0);
}
 
-   spl_instantiate_arg_ex1(Z_OBJCE_P(getThis()), &return_value, 0, *entry 
TSRMLS_CC);
+  MAKE_STD_ZVAL(flags);
+  ZVAL_LONG(flags, SPL_ARRAY_USE_OTHER);
+   spl_instantiate_arg_ex2(Z_OBJCE_P(getThis()), &return_value, 0, *entry, 
flags TSRMLS_CC);
+   zval_ptr_dtor(&flags);
 }
 /* }}} */
 

http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/bug42654.phpt?view=markup&rev=1.1
Index: php-src/ext/spl/tests/bug42654.phpt
+++ php-src/ext/spl/tests/bug42654.phpt

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

[PHP-CVS] cvs: CVSROOT / avail

[Derick Rethans]

derick  Wed Oct 17 19:15:32 2007 UTC

  Modified files:  
/CVSROOTavail 
  Log:
  - Give Lukas php-src access
  
  
http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1312&r2=1.1313&diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1312 CVSROOT/avail:1.1313
--- CVSROOT/avail:1.1312Tue Oct 16 21:02:36 2007
+++ CVSROOT/avail   Wed Oct 17 19:15:31 2007
@@ -17,7 +17,7 @@
 # The PHP Developers have full access to the full source trees for
 # PHP, as well as the documentation.
 
-avail|auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johannes,dbs,skoduru,nrathna,jesus,gopalv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2!
 
man,dsp,davidw,ab5602,nicholsr|phpfi,php3,php-src,pecl,non-pecl,spl,phpdoc,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa_IR,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-ca,phpdoc-no
+avail|auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johannes,dbs,skoduru,nrathna,jesus,gopalv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2!
 
man,dsp,davidw,ab5602,nicholsr,lsmith|phpfi,php3,php-src,pecl,non-pecl,spl,phpdoc,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa_IR,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-ca,phpdoc-no
 
 # fastcgi implementation for IIS
 avail|shane,wez,edink|fastcgi-isapi

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

[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS

[Johannes Schl�ter]

johannesWed Oct 17 17:22:53 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcNEWS 
  Log:
  - There's no need to mention these bugs, they all belong to "Added namespaces"
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.30&r2=1.2027.2.547.2.965.2.31&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.30 
php-src/NEWS:1.2027.2.547.2.965.2.31
--- php-src/NEWS:1.2027.2.547.2.965.2.30Wed Oct 17 12:09:02 2007
+++ php-src/NEWSWed Oct 17 17:22:52 2007
@@ -42,13 +42,6 @@
 
 - Fixed possible crash in ext/soap because of uninitialized value (Zdash Urf)
 
-- Fixed bug #42919 (Unserializing of namespaced class object fails). (Dmitry)
-- Fixed bug #42859 (import always conflicts with internal classes).
-  ([EMAIL PROTECTED], Dmitry)
-- Fixed bug #42820 (defined() on constant with namespace prefixes tries to load
-  class). (Dmitry)
-- Fixed bug #42798 (__autoload() not triggered for classes used in method
-  signature). (Dmitry)
 - Fixed bug #42737 (preg_split('//u') triggers a E_NOTICE with newlines). 
(Nuno)
 - Fixed bug #42657 (ini_get() returns incorrect value when default is NULL).
   (Jani)

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

[PHP-CVS] cvs: php-src /ext/soap php_encoding.c /ext/soap/tests classmap004.phpt

[Dmitry Stogov]

dmitry  Wed Oct 17 12:09:14 2007 UTC

  Modified files:  
/php-src/ext/soap   php_encoding.c 
/php-src/ext/soap/tests classmap004.phpt 
  Log:
  Fixed possible crash because of uninitialized value (Zdash Urf)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_encoding.c?r1=1.164&r2=1.165&diff_format=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.164 
php-src/ext/soap/php_encoding.c:1.165
--- php-src/ext/soap/php_encoding.c:1.164   Sun Oct  7 05:15:05 2007
+++ php-src/ext/soap/php_encoding.c Wed Oct 17 12:09:14 2007
@@ -17,7 +17,7 @@
   |  Dmitry Stogov <[EMAIL PROTECTED]> |
   +--+
 */
-/* $Id: php_encoding.c,v 1.164 2007/10/07 05:15:05 davidw Exp $ */
+/* $Id: php_encoding.c,v 1.165 2007/10/17 12:09:14 dmitry Exp $ */
 
 #include 
 
@@ -1135,6 +1135,7 @@
zval *data;
zend_class_entry *old_scope;
 
+   INIT_PZVAL(&member);
ZVAL_STRING(&member, name, 0);
old_scope = EG(scope);
EG(scope) = Z_OBJCE_P(object);
@@ -1169,6 +1170,7 @@
zval member;
zend_class_entry *old_scope;
 
+   INIT_PZVAL(&member);
ZVAL_STRING(&member, name, 0);
old_scope = EG(scope);
EG(scope) = Z_OBJCE_P(object);
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/classmap004.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/soap/tests/classmap004.phpt
diff -u /dev/null php-src/ext/soap/tests/classmap004.phpt:1.2
--- /dev/null   Wed Oct 17 12:09:14 2007
+++ php-src/ext/soap/tests/classmap004.phpt Wed Oct 17 12:09:14 2007
@@ -0,0 +1,66 @@
+--TEST--
+SOAP Classmap 4: encoding of objects with __get()
+--SKIPIF--
+
+--FILE--
+x = $a;
+  }
+  function __get($name) {
+return @$this->a[$name];
+  }
+  function __set($name, $val) {
+$this->a[$name] = $val;
+  }
+  function __unset($name) {
+unset($this->a[$name]);
+  }
+}
+
+class B extends A {
+  function __construct($a){
+parent::__construct($a);
+$this->y = $a + 1;
+  }
+}
+
+function f(){
+  return new B(5);
+}
+
+class LocalSoapClient extends SoapClient {
+
+  function __construct($wsdl, $options) {
+parent::__construct($wsdl, $options);
+$this->server = new SoapServer($wsdl, $options);
+$this->server->addFunction("f");
+  }
+
+  function __doRequest($request, $location, $action, $version) {
+ob_start();
+$this->server->handle($request);
+$response = ob_get_contents();
+ob_end_clean();
+return $response;
+  }
+}
+
+$client = new LocalSoapClient(dirname(__FILE__)."/classmap003.wsdl",
+array('classmap'=>array('A'=>'A','B'=>'B')));
+print_r($client->f());
+?>
+--EXPECT--
+B Object
+(
+[a] => Array
+(
+[x] => 5
+[y] => 6
+)
+
+)

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

[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/soap php_encoding.c /ext/soap/tests classmap004.phpt

[Dmitry Stogov]

dmitry  Wed Oct 17 12:09:03 2007 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/soap/tests classmap004.phpt 

  Modified files:  
/php-srcNEWS 
/php-src/ext/soap   php_encoding.c 
  Log:
  Fixed possible crash because of uninitialized value (Zdash Urf)
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.29&r2=1.2027.2.547.2.965.2.30&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.29 
php-src/NEWS:1.2027.2.547.2.965.2.30
--- php-src/NEWS:1.2027.2.547.2.965.2.29Wed Oct 17 11:18:34 2007
+++ php-src/NEWSWed Oct 17 12:09:02 2007
@@ -40,6 +40,8 @@
 - Improved and cleaned CGI code. FastCGI is now always enabled and can not be
   disabled. See sapi/cgi/CHANGES for more details. (Dmitry)
 
+- Fixed possible crash in ext/soap because of uninitialized value (Zdash Urf)
+
 - Fixed bug #42919 (Unserializing of namespaced class object fails). (Dmitry)
 - Fixed bug #42859 (import always conflicts with internal classes).
   ([EMAIL PROTECTED], Dmitry)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_encoding.c?r1=1.103.2.21.2.37.2.2&r2=1.103.2.21.2.37.2.3&diff_format=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.103.2.21.2.37.2.2 
php-src/ext/soap/php_encoding.c:1.103.2.21.2.37.2.3
--- php-src/ext/soap/php_encoding.c:1.103.2.21.2.37.2.2 Sun Oct  7 05:22:06 2007
+++ php-src/ext/soap/php_encoding.c Wed Oct 17 12:09:02 2007
@@ -17,7 +17,7 @@
   |  Dmitry Stogov <[EMAIL PROTECTED]> |
   +--+
 */
-/* $Id: php_encoding.c,v 1.103.2.21.2.37.2.2 2007/10/07 05:22:06 davidw Exp $ 
*/
+/* $Id: php_encoding.c,v 1.103.2.21.2.37.2.3 2007/10/17 12:09:02 dmitry Exp $ 
*/
 
 #include 
 
@@ -1208,9 +1208,10 @@
zval *data;
zend_class_entry *old_scope;
 
+   INIT_PZVAL(&member);
ZVAL_STRING(&member, name, 0);
old_scope = EG(scope);
- EG(scope) = Z_OBJCE_P(object);
+   EG(scope) = Z_OBJCE_P(object);
data = Z_OBJ_HT_P(object)->read_property(object, &member, 
BP_VAR_IS TSRMLS_CC);
if (data == EG(uninitialized_zval_ptr)) {
/* Hack for bug #32455 */
@@ -1241,9 +1242,10 @@
zval member;
zend_class_entry *old_scope;
 
+   INIT_PZVAL(&member);
ZVAL_STRING(&member, name, 0);
old_scope = EG(scope);
- EG(scope) = Z_OBJCE_P(object);
+   EG(scope) = Z_OBJCE_P(object);
Z_OBJ_HT_P(object)->unset_property(object, &member TSRMLS_CC);
EG(scope) = old_scope;
} else if (Z_TYPE_P(object) == IS_ARRAY) {

http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/classmap004.phpt?view=markup&rev=1.1
Index: php-src/ext/soap/tests/classmap004.phpt
+++ php-src/ext/soap/tests/classmap004.phpt

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

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/soap php_encoding.c /ext/soap/tests classmap004.phpt

[Dmitry Stogov]

dmitry  Wed Oct 17 12:08:46 2007 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/soap/tests classmap004.phpt 

  Modified files:  
/php-srcNEWS 
/php-src/ext/soap   php_encoding.c 
  Log:
  Fixed possible crash because of uninitialized value (Zdash Urf)
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.975&r2=1.2027.2.547.2.976&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.975 php-src/NEWS:1.2027.2.547.2.976
--- php-src/NEWS:1.2027.2.547.2.975 Wed Oct 17 11:17:46 2007
+++ php-src/NEWSWed Oct 17 12:08:45 2007
@@ -9,6 +9,7 @@
   array_uintersect_assoc(), array_diff_key(), array_diff_assoc() and
   array_udiff_assoc(). (Dmitry)
 
+- Fixed possible crash in ext/soap because of uninitialized value. (Zdash Urf)
 - Fixed regression in glob() when enforcing safe_mode/open_basedir checks on
   paths containing '*'. (Ilia)
 - Fixed "mail.force_extra_parameters" php.ini directive not to be modifiable
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_encoding.c?r1=1.103.2.21.2.37&r2=1.103.2.21.2.38&diff_format=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.103.2.21.2.37 
php-src/ext/soap/php_encoding.c:1.103.2.21.2.38
--- php-src/ext/soap/php_encoding.c:1.103.2.21.2.37 Wed Sep  5 10:18:22 2007
+++ php-src/ext/soap/php_encoding.c Wed Oct 17 12:08:45 2007
@@ -17,7 +17,7 @@
   |  Dmitry Stogov <[EMAIL PROTECTED]> |
   +--+
 */
-/* $Id: php_encoding.c,v 1.103.2.21.2.37 2007/09/05 10:18:22 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.103.2.21.2.38 2007/10/17 12:08:45 dmitry Exp $ */
 
 #include 
 
@@ -1208,9 +1208,10 @@
zval *data;
zend_class_entry *old_scope;
 
+   INIT_PZVAL(&member);
ZVAL_STRING(&member, name, 0);
old_scope = EG(scope);
- EG(scope) = Z_OBJCE_P(object);
+   EG(scope) = Z_OBJCE_P(object);
data = Z_OBJ_HT_P(object)->read_property(object, &member, 
BP_VAR_IS TSRMLS_CC);
if (data == EG(uninitialized_zval_ptr)) {
/* Hack for bug #32455 */
@@ -1241,9 +1242,10 @@
zval member;
zend_class_entry *old_scope;
 
+   INIT_PZVAL(&member);
ZVAL_STRING(&member, name, 0);
old_scope = EG(scope);
- EG(scope) = Z_OBJCE_P(object);
+   EG(scope) = Z_OBJCE_P(object);
Z_OBJ_HT_P(object)->unset_property(object, &member TSRMLS_CC);
EG(scope) = old_scope;
} else if (Z_TYPE_P(object) == IS_ARRAY) {

http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/classmap004.phpt?view=markup&rev=1.1
Index: php-src/ext/soap/tests/classmap004.phpt
+++ php-src/ext/soap/tests/classmap004.phpt

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

[PHP-CVS] cvs: php-src /ext/soap php_http.c

[Dmitry Stogov]

dmitry  Wed Oct 17 11:18:49 2007 UTC

  Modified files:  
/php-src/ext/soap   php_http.c 
  Log:
  Fixed bug #42637 (SoapFault : Only http and https are allowed). (Bill Moran)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_http.c?r1=1.109&r2=1.110&diff_format=u
Index: php-src/ext/soap/php_http.c
diff -u php-src/ext/soap/php_http.c:1.109 php-src/ext/soap/php_http.c:1.110
--- php-src/ext/soap/php_http.c:1.109   Tue Jul 24 09:28:12 2007
+++ php-src/ext/soap/php_http.c Wed Oct 17 11:18:49 2007
@@ -17,7 +17,7 @@
   |  Dmitry Stogov <[EMAIL PROTECTED]> |
   +--+
 */
-/* $Id: php_http.c,v 1.109 2007/07/24 09:28:12 dmitry Exp $ */
+/* $Id: php_http.c,v 1.110 2007/10/17 11:18:49 dmitry Exp $ */
 
 #include "php_soap.h"
 #include "ext/standard/base64.h"
@@ -925,7 +925,7 @@
efree(http_body);
efree(loc);
if (new_url->scheme == NULL && new_url->path != 
NULL) {
-   new_url->scheme = NULL;
+   new_url->scheme = phpurl->scheme ? 
estrdup(phpurl->scheme) : NULL;
new_url->host = phpurl->host ? 
estrdup(phpurl->host) : NULL;
new_url->port = phpurl->port;
if (new_url->path && new_url->path[0] 
!= '/') {

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

[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/soap php_http.c

[Dmitry Stogov]

dmitry  Wed Oct 17 11:18:34 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcNEWS 
/php-src/ext/soap   php_http.c 
  Log:
  Fixed bug #42637 (SoapFault : Only http and https are allowed). (Bill Moran)
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.28&r2=1.2027.2.547.2.965.2.29&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.28 
php-src/NEWS:1.2027.2.547.2.965.2.29
--- php-src/NEWS:1.2027.2.547.2.965.2.28Wed Oct 17 10:36:33 2007
+++ php-src/NEWSWed Oct 17 11:18:34 2007
@@ -50,6 +50,7 @@
 - Fixed bug #42737 (preg_split('//u') triggers a E_NOTICE with newlines). 
(Nuno)
 - Fixed bug #42657 (ini_get() returns incorrect value when default is NULL).
   (Jani)
+- Fixed bug #42637 (SoapFault : Only http and https are allowed). (Bill Moran)
 - Fixed bug #42069 (parse_ini_file() allows using some non-alpha numeric
   characters). (Jani)
 - Fixed bug #37911 (preg_replace_callback() ignores named groups). (Nuno)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_http.c?r1=1.77.2.11.2.12.2.1&r2=1.77.2.11.2.12.2.2&diff_format=u
Index: php-src/ext/soap/php_http.c
diff -u php-src/ext/soap/php_http.c:1.77.2.11.2.12.2.1 
php-src/ext/soap/php_http.c:1.77.2.11.2.12.2.2
--- php-src/ext/soap/php_http.c:1.77.2.11.2.12.2.1  Sun Oct  7 05:22:06 2007
+++ php-src/ext/soap/php_http.c Wed Oct 17 11:18:34 2007
@@ -17,7 +17,7 @@
   |  Dmitry Stogov <[EMAIL PROTECTED]> |
   +--+
 */
-/* $Id: php_http.c,v 1.77.2.11.2.12.2.1 2007/10/07 05:22:06 davidw Exp $ */
+/* $Id: php_http.c,v 1.77.2.11.2.12.2.2 2007/10/17 11:18:34 dmitry Exp $ */
 
 #include "php_soap.h"
 #include "ext/standard/base64.h"
@@ -918,7 +918,7 @@
efree(http_body);
efree(loc);
if (new_url->scheme == NULL && new_url->path != 
NULL) {
-   new_url->scheme = NULL;
+   new_url->scheme = phpurl->scheme ? 
estrdup(phpurl->scheme) : NULL;
new_url->host = phpurl->host ? 
estrdup(phpurl->host) : NULL;
new_url->port = phpurl->port;
if (new_url->path && new_url->path[0] 
!= '/') {

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

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/soap php_http.c

[Dmitry Stogov]

dmitry  Wed Oct 17 11:17:46 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
/php-src/ext/soap   php_http.c 
  Log:
  Fixed bug #42637 (SoapFault : Only http and https are allowed)
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.974&r2=1.2027.2.547.2.975&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.974 php-src/NEWS:1.2027.2.547.2.975
--- php-src/NEWS:1.2027.2.547.2.974 Thu Oct 11 20:56:22 2007
+++ php-src/NEWSWed Oct 17 11:17:46 2007
@@ -52,6 +52,7 @@
   enabled). (Ilia)
 - Fixed bug #42699 (PHP_SELF duplicates path). (Dmitry)
 - Fixed bug #42643 (CLI segfaults if using ATTR_PERSISTENT). (Ilia)
+- Fixed bug #42637 (SoapFault : Only http and https are allowed). (Bill Moran)
 - Fixed bug #42629 (Dynamically loaded PHP extensions need symbols exported
   on MacOSX). (jdolecek at NetBSD dot org)
 - Fixed bug #42627 (bz2 extension fails to build with -fno-common).
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_http.c?r1=1.77.2.11.2.12&r2=1.77.2.11.2.13&diff_format=u
Index: php-src/ext/soap/php_http.c
diff -u php-src/ext/soap/php_http.c:1.77.2.11.2.12 
php-src/ext/soap/php_http.c:1.77.2.11.2.13
--- php-src/ext/soap/php_http.c:1.77.2.11.2.12  Tue Jul 24 09:27:46 2007
+++ php-src/ext/soap/php_http.c Wed Oct 17 11:17:46 2007
@@ -17,7 +17,7 @@
   |  Dmitry Stogov <[EMAIL PROTECTED]> |
   +--+
 */
-/* $Id: php_http.c,v 1.77.2.11.2.12 2007/07/24 09:27:46 dmitry Exp $ */
+/* $Id: php_http.c,v 1.77.2.11.2.13 2007/10/17 11:17:46 dmitry Exp $ */
 
 #include "php_soap.h"
 #include "ext/standard/base64.h"
@@ -918,7 +918,7 @@
efree(http_body);
efree(loc);
if (new_url->scheme == NULL && new_url->path != 
NULL) {
-   new_url->scheme = NULL;
+   new_url->scheme = phpurl->scheme ? 
estrdup(phpurl->scheme) : NULL;
new_url->host = phpurl->host ? 
estrdup(phpurl->host) : NULL;
new_url->port = phpurl->port;
if (new_url->path && new_url->path[0] 
!= '/') {

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

[PHP-CVS] cvs: php-src /ext/standard var_unserializer.c var_unserializer.re /ext/standard/tests/serialize bug42919.phpt

[Dmitry Stogov]

dmitry  Wed Oct 17 10:36:45 2007 UTC

  Modified files:  
/php-src/ext/standard   var_unserializer.c var_unserializer.re 
/php-src/ext/standard/tests/serialize   bug42919.phpt 
  Log:
  Fixed bug #42919 (Unserializing of namespaced class object fails)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var_unserializer.c?r1=1.92&r2=1.93&diff_format=u
Index: php-src/ext/standard/var_unserializer.c
diff -u php-src/ext/standard/var_unserializer.c:1.92 
php-src/ext/standard/var_unserializer.c:1.93
--- php-src/ext/standard/var_unserializer.c:1.92Sun Oct  7 05:15:06 2007
+++ php-src/ext/standard/var_unserializer.c Wed Oct 17 10:36:45 2007
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: var_unserializer.c,v 1.92 2007/10/07 05:15:06 davidw Exp $ */
+/* $Id: var_unserializer.c,v 1.93 2007/10/17 10:36:45 dmitry Exp $ */
 
 #include "php.h"
 #include "ext/standard/php_var.h"
@@ -641,7 +641,7 @@
if (UG(unicode)) {
class_name.u = unserialize_ustr(&YYCURSOR, len);
} else {
-   len3 = strspn((char*)YYCURSOR, 
"0123456789_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\177\200\201\202\203\204\205\206\207\210\211\212\213\214\215\216\217\220\221\222\223\224\225\226\227\230\231\232\233\234\235\236\237\240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317\320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337\340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357\360\361\362\363\364\365\366\367\370\371\372\373\374\375\376\377");
+   len3 = strspn((char*)YYCURSOR, 
"0123456789_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\177\200\201\202\203\204\205\206\207\210\211\212\213\214\215\216\217\220\221\222\223\224\225\226\227\230\231\232\233\234\235\236\237\240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317\320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337\340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357\360\361\362\363\364\365\366\367\370\371\372\373\374\375\376\377:");
if (len3 != len) {
*p = YYCURSOR + len3 - len;
return 0;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var_unserializer.re?r1=1.71&r2=1.72&diff_format=u
Index: php-src/ext/standard/var_unserializer.re
diff -u php-src/ext/standard/var_unserializer.re:1.71 
php-src/ext/standard/var_unserializer.re:1.72
--- php-src/ext/standard/var_unserializer.re:1.71   Sun Oct  7 05:15:06 2007
+++ php-src/ext/standard/var_unserializer.reWed Oct 17 10:36:45 2007
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: var_unserializer.re,v 1.71 2007/10/07 05:15:06 davidw Exp $ */
+/* $Id: var_unserializer.re,v 1.72 2007/10/17 10:36:45 dmitry Exp $ */
 
 #include "php.h"
 #include "ext/standard/php_var.h"
@@ -701,7 +701,7 @@
if (UG(unicode)) {
class_name.u = unserialize_ustr(&YYCURSOR, len);
} else {
-   len3 = strspn((char*)YYCURSOR, 
"0123456789_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\177\200\201\202\203\204\205\206\207\210\211\212\213\214\215\216\217\220\221\222\223\224\225\226\227\230\231\232\233\234\235\236\237\240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317\320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337\340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357\360\361\362\363\364\365\366\367\370\371\372\373\374\375\376\377");
+   len3 = strspn((char*)YYCURSOR, 
"0123456789_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\177\200\201\202\203\204\205\206\207\210\211\212\213\214\215\216\217\220\221\222\223\224\225\226\227\230\231\232\233\234\235\236\237\240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317\320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337\340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357\360\361\362\363\364\365\366\367\370\371\372\373\374\375\376\377:");
if (len3 != len) {
*p = YYCURSOR + len3 - len;
return 0;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/bug42919.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/serialize/bug42919.phpt
diff -u /dev/null php-src/ext/standard/tests/serialize/bug42919.phpt:1.2
--- /dev/null   Wed Oct 17 10:36:45

[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/standard var_unserializer.c var_unserializer.re /ext/standard/tests/serialize bug42919.phpt

[Dmitry Stogov]

dmitry  Wed Oct 17 10:36:33 2007 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/serialize   bug42919.phpt 

  Modified files:  
/php-srcNEWS 
/php-src/ext/standard   var_unserializer.c var_unserializer.re 
  Log:
  Fixed bug #42919 (Unserializing of namespaced class object fails)
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.27&r2=1.2027.2.547.2.965.2.28&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.27 
php-src/NEWS:1.2027.2.547.2.965.2.28
--- php-src/NEWS:1.2027.2.547.2.965.2.27Wed Oct 17 10:01:21 2007
+++ php-src/NEWSWed Oct 17 10:36:33 2007
@@ -40,6 +40,7 @@
 - Improved and cleaned CGI code. FastCGI is now always enabled and can not be
   disabled. See sapi/cgi/CHANGES for more details. (Dmitry)
 
+- Fixed bug #42919 (Unserializing of namespaced class object fails). (Dmitry)
 - Fixed bug #42859 (import always conflicts with internal classes).
   ([EMAIL PROTECTED], Dmitry)
 - Fixed bug #42820 (defined() on constant with namespace prefixes tries to load
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var_unserializer.c?r1=1.70.2.4.2.7.2.2&r2=1.70.2.4.2.7.2.3&diff_format=u
Index: php-src/ext/standard/var_unserializer.c
diff -u php-src/ext/standard/var_unserializer.c:1.70.2.4.2.7.2.2 
php-src/ext/standard/var_unserializer.c:1.70.2.4.2.7.2.3
--- php-src/ext/standard/var_unserializer.c:1.70.2.4.2.7.2.2Sun Oct  7 
05:22:07 2007
+++ php-src/ext/standard/var_unserializer.c Wed Oct 17 10:36:33 2007
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: var_unserializer.c,v 1.70.2.4.2.7.2.2 2007/10/07 05:22:07 davidw Exp $ 
*/
+/* $Id: var_unserializer.c,v 1.70.2.4.2.7.2.3 2007/10/17 10:36:33 dmitry Exp $ 
*/
 
 #include "php.h"
 #include "ext/standard/php_var.h"
@@ -581,7 +581,7 @@
return 0;
}
 
-   len3 = strspn(class_name, 
"0123456789_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\177\200\201\202\203\204\205\206\207\210\211\212\213\214\215\216\217\220\221\222\223\224\225\226\227\230\231\232\233\234\235\236\237\240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317\320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337\340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357\360\361\362\363\364\365\366\367\370\371\372\373\374\375\376\377");
+   len3 = strspn(class_name, 
"0123456789_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\177\200\201\202\203\204\205\206\207\210\211\212\213\214\215\216\217\220\221\222\223\224\225\226\227\230\231\232\233\234\235\236\237\240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317\320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337\340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357\360\361\362\363\364\365\366\367\370\371\372\373\374\375\376\377:");
if (len3 != len)
{
*p = YYCURSOR + len3 - len;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var_unserializer.re?r1=1.52.2.2.2.6.2.2&r2=1.52.2.2.2.6.2.3&diff_format=u
Index: php-src/ext/standard/var_unserializer.re
diff -u php-src/ext/standard/var_unserializer.re:1.52.2.2.2.6.2.2 
php-src/ext/standard/var_unserializer.re:1.52.2.2.2.6.2.3
--- php-src/ext/standard/var_unserializer.re:1.52.2.2.2.6.2.2   Sun Oct  7 
05:22:07 2007
+++ php-src/ext/standard/var_unserializer.reWed Oct 17 10:36:33 2007
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: var_unserializer.re,v 1.52.2.2.2.6.2.2 2007/10/07 05:22:07 davidw Exp 
$ */
+/* $Id: var_unserializer.re,v 1.52.2.2.2.6.2.3 2007/10/17 10:36:33 dmitry Exp 
$ */
 
 #include "php.h"
 #include "ext/standard/php_var.h"
@@ -617,7 +617,7 @@
return 0;
}
 
-   len3 = strspn(class_name, 
"0123456789_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\177\200\201\202\203\204\205\206\207\210\211\212\213\214\215\216\217\220\221\222\223\224\225\226\227\230\231\232\233\234\235\236\237\240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317\320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337\340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357\360\361\362\363\364\365\366\367\370\371\372\373\374\375\376\377");
+   len3 = strspn(class_name, 
"0123456789_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\177\200\201\202\203\204\205\206\207\210\211\212\213\214\215\216\217\220\221\222\223\224\225\226\227\230\231\232\233\234\235\236\237\240\241\242\243\244\245\24

[PHP-CVS] cvs: php-src /ext/mysqli mysqli_api.c

[Antony Dovgal]

tony2001Wed Oct 17 08:22:01 2007 UTC

  Modified files:  
/php-src/ext/mysqli mysqli_api.c 
  Log:
  commit lost part of the patch
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.152&r2=1.153&diff_format=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.152 
php-src/ext/mysqli/mysqli_api.c:1.153
--- php-src/ext/mysqli/mysqli_api.c:1.152   Wed Oct 17 08:17:34 2007
+++ php-src/ext/mysqli/mysqli_api.c Wed Oct 17 08:22:01 2007
@@ -17,7 +17,7 @@
   |  Ulf Wendel <[EMAIL PROTECTED]>
 |
   +--+
 
-  $Id: mysqli_api.c,v 1.152 2007/10/17 08:17:34 tony2001 Exp $ 
+  $Id: mysqli_api.c,v 1.153 2007/10/17 08:22:01 tony2001 Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -1442,7 +1442,8 @@
} else {
zval_dtor(mysql->li_read);
}
-   ZVAL_ZVAL(mysql->li_read, callback_name, 0, 0);
+   p_callback_name = &callback_name;
+   ZVAL_ZVAL(mysql->li_read, p_callback_name, 0, 0);
 
RETURN_TRUE;
 }

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

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/mysqli mysqli.c mysqli_api.c

[Antony Dovgal]

tony2001Wed Oct 17 08:19:51 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/mysqli mysqli_api.c mysqli.c 
  Log:
  MFH
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.118.2.22.2.17&r2=1.118.2.22.2.18&diff_format=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.17 
php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.18
--- php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.17 Tue Oct 16 13:20:29 2007
+++ php-src/ext/mysqli/mysqli_api.c Wed Oct 17 08:19:50 2007
@@ -15,7 +15,7 @@
   | Author: Georg Richter <[EMAIL PROTECTED]>|
   +--+
 
-  $Id: mysqli_api.c,v 1.118.2.22.2.17 2007/10/16 13:20:29 tony2001 Exp $ 
+  $Id: mysqli_api.c,v 1.118.2.22.2.18 2007/10/17 08:19:50 tony2001 Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -1170,7 +1170,7 @@
MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link, "mysqli_link", 
MYSQLI_STATUS_VALID);
 
if (mysql->li_read) {
-   zval_dtor(mysql->li_read);
+   zval_ptr_dtor(&(mysql->li_read));
mysql->li_read = NULL;
}
 }
@@ -1198,11 +1198,14 @@
efree(callback_name);
RETURN_FALSE;   
}
-   efree(callback_name);
 
/* save callback function */
-   ALLOC_ZVAL(mysql->li_read); 
-   ZVAL_STRING(mysql->li_read, callback_func->value.str.val, 1);
+   if (!mysql->li_read) {
+   MAKE_STD_ZVAL(mysql->li_read);
+   } else {
+   zval_dtor(mysql->li_read);
+   }
+   ZVAL_STRING(mysql->li_read, callback_name, 0);
 
RETURN_TRUE;
 }
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.19&r2=1.72.2.16.2.20&diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.19 
php-src/ext/mysqli/mysqli.c:1.72.2.16.2.20
--- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.19  Tue Oct 16 13:20:29 2007
+++ php-src/ext/mysqli/mysqli.c Wed Oct 17 08:19:50 2007
@@ -15,7 +15,7 @@
   | Author: Georg Richter <[EMAIL PROTECTED]>|
   +--+
 
-  $Id: mysqli.c,v 1.72.2.16.2.19 2007/10/16 13:20:29 tony2001 Exp $ 
+  $Id: mysqli.c,v 1.72.2.16.2.20 2007/10/17 08:19:50 tony2001 Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -125,7 +125,7 @@
 /* {{{ php_clear_mysql */
 void php_clear_mysql(MY_MYSQL *mysql) {
if (mysql->li_read) {
-   zval_dtor(mysql->li_read);
+   zval_ptr_dtor(&(mysql->li_read));
mysql->li_read = NULL;
}
 }

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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli mysqli_api.c

[Antony Dovgal]

tony2001Wed Oct 17 08:19:07 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mysqli mysqli_api.c 
  Log:
  ..and correct macro
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.118.2.22.2.16.2.5&r2=1.118.2.22.2.16.2.6&diff_format=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.5 
php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.6
--- php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.5 Wed Oct 17 08:18:09 2007
+++ php-src/ext/mysqli/mysqli_api.c Wed Oct 17 08:19:07 2007
@@ -17,7 +17,7 @@
   |  Ulf Wendel <[EMAIL PROTECTED]>
 |
   +--+
 
-  $Id: mysqli_api.c,v 1.118.2.22.2.16.2.5 2007/10/17 08:18:09 tony2001 Exp $ 
+  $Id: mysqli_api.c,v 1.118.2.22.2.16.2.6 2007/10/17 08:19:07 tony2001 Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -1371,7 +1371,7 @@
} else {
zval_dtor(mysql->li_read);
}
-   ZVAL_STRINGL(mysql->li_read, callback_name, 0);
+   ZVAL_STRING(mysql->li_read, callback_name, 0);
 
RETURN_TRUE;
 }

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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli mysqli.c mysqli_api.c

[Antony Dovgal]

tony2001Wed Oct 17 08:18:09 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mysqli mysqli_api.c mysqli.c 
  Log:
  MFH: use correct dtro and variable for the callback
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.118.2.22.2.16.2.4&r2=1.118.2.22.2.16.2.5&diff_format=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.4 
php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.5
--- php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.4 Tue Oct 16 13:20:14 2007
+++ php-src/ext/mysqli/mysqli_api.c Wed Oct 17 08:18:09 2007
@@ -17,7 +17,7 @@
   |  Ulf Wendel <[EMAIL PROTECTED]>
 |
   +--+
 
-  $Id: mysqli_api.c,v 1.118.2.22.2.16.2.4 2007/10/16 13:20:14 tony2001 Exp $ 
+  $Id: mysqli_api.c,v 1.118.2.22.2.16.2.5 2007/10/17 08:18:09 tony2001 Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -1336,7 +1336,7 @@
MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link, "mysqli_link", 
MYSQLI_STATUS_VALID);
 
if (mysql->li_read) {
-   zval_dtor(mysql->li_read);
+   zval_ptr_dtor(&(mysql->li_read));
mysql->li_read = NULL;
}
 }
@@ -1364,7 +1364,6 @@
efree(callback_name);
RETURN_FALSE;
}
-   efree(callback_name);
 
/* save callback function */
if (!mysql->li_read) {
@@ -1372,7 +1371,7 @@
} else {
zval_dtor(mysql->li_read);
}
-   ZVAL_STRINGL(mysql->li_read, Z_STRVAL_P(callback_func), 
Z_STRLEN_P(callback_func), 1);
+   ZVAL_STRINGL(mysql->li_read, callback_name, 0);
 
RETURN_TRUE;
 }
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.17.2.5&r2=1.72.2.16.2.17.2.6&diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.5 
php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.6
--- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.5  Tue Oct 16 20:56:22 2007
+++ php-src/ext/mysqli/mysqli.c Wed Oct 17 08:18:09 2007
@@ -15,7 +15,7 @@
   | Author: Georg Richter <[EMAIL PROTECTED]>|
   +--+
 
-  $Id: mysqli.c,v 1.72.2.16.2.17.2.5 2007/10/16 20:56:22 andrey Exp $ 
+  $Id: mysqli.c,v 1.72.2.16.2.17.2.6 2007/10/17 08:18:09 tony2001 Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -202,7 +202,7 @@
mysql->hash_key = NULL;
}
if (mysql->li_read) {
-   zval_dtor(mysql->li_read);
+   zval_ptr_dtor(&(mysql->li_read));
mysql->li_read = NULL;
}
 }

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

[PHP-CVS] cvs: php-src /ext/mysqli mysqli.c mysqli_api.c

[Antony Dovgal]

tony2001Wed Oct 17 08:17:34 2007 UTC

  Modified files:  
/php-src/ext/mysqli mysqli_api.c mysqli.c 
  Log:
  use correct dtor and variable for the callback
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.151&r2=1.152&diff_format=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.151 
php-src/ext/mysqli/mysqli_api.c:1.152
--- php-src/ext/mysqli/mysqli_api.c:1.151   Sun Oct  7 05:15:04 2007
+++ php-src/ext/mysqli/mysqli_api.c Wed Oct 17 08:17:34 2007
@@ -17,7 +17,7 @@
   |  Ulf Wendel <[EMAIL PROTECTED]>
 |
   +--+
 
-  $Id: mysqli_api.c,v 1.151 2007/10/07 05:15:04 davidw Exp $ 
+  $Id: mysqli_api.c,v 1.152 2007/10/17 08:17:34 tony2001 Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -1403,7 +1403,7 @@
MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link, "mysqli_link", 
MYSQLI_STATUS_VALID);
 
if (mysql->li_read) {
-   zval_dtor(mysql->li_read);
+   zval_ptr_dtor(&(mysql->li_read));
mysql->li_read = NULL;
}
 }
@@ -1415,7 +1415,7 @@
 {
MY_MYSQL*mysql;
zval*mysql_link;
-   zvalcallback_name;
+   zvalcallback_name, *p_callback_name;
zval*callback_func;
 
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), 
"Oz", &mysql_link, mysqli_link_class_entry,
@@ -1435,7 +1435,6 @@
zval_dtor(&callback_name);
RETURN_FALSE;
}
-   zval_dtor(&callback_name);
 
/* save callback function */
if (!mysql->li_read) {
@@ -1443,7 +1442,7 @@
} else {
zval_dtor(mysql->li_read);
}
-   ZVAL_STRINGL(mysql->li_read, Z_STRVAL_P(callback_func), 
Z_STRLEN_P(callback_func), 1);
+   ZVAL_ZVAL(mysql->li_read, callback_name, 0, 0);
 
RETURN_TRUE;
 }
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.111&r2=1.112&diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.111 php-src/ext/mysqli/mysqli.c:1.112
--- php-src/ext/mysqli/mysqli.c:1.111   Tue Oct 16 13:18:55 2007
+++ php-src/ext/mysqli/mysqli.c Wed Oct 17 08:17:34 2007
@@ -17,7 +17,7 @@
   |  Ulf Wendel <[EMAIL PROTECTED]>
 |
   +--+
 
-  $Id: mysqli.c,v 1.111 2007/10/16 13:18:55 tony2001 Exp $ 
+  $Id: mysqli.c,v 1.112 2007/10/17 08:17:34 tony2001 Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -205,7 +205,7 @@
mysql->hash_key = NULL;
}
if (mysql->li_read) {
-   zval_dtor(mysql->li_read);
+   zval_ptr_dtor(&(mysql->li_read));
mysql->li_read = NULL;
}
 }

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