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

2004-07-05 Thread changelog
changelog   Mon Jul  5 20:33:27 2004 EDT

  Modified files:  
/php-srcChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/diff.php/php-src/ChangeLog?r1=1.1677r2=1.1678ty=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.1677 php-src/ChangeLog:1.1678
--- php-src/ChangeLog:1.1677Sun Jul  4 20:32:17 2004
+++ php-src/ChangeLog   Mon Jul  5 20:33:26 2004
@@ -1,3 +1,34 @@
+2004-07-05  Marcus Boerger  [EMAIL PROTECTED]
+
+* NEWS
+  ext/mysqli/mysqli.c:
+  - Bugfix: #29019 Database not closing
+
+2004-07-05  Andi Gutmans  [EMAIL PROTECTED]
+
+* ZendEngine2/zend_mm.h:
+  - Disable zend_mm for 5.0.0
+
+2004-07-05  Sascha Schumann  [EMAIL PROTECTED]
+
+* (PHP_4_3)
+  NEWS:
+  add
+
+* sapi/cgi/cgi_main.c:
+  - revert to proper behaviour
+
+* (PHP_4_3)
+  sapi/cgi/cgi_main.c:
+  - revert to proper behaviour. The environment variable PHP_FCGI_CHILDREN
+must be explicitly set to != 0 to make the fastcgi-enabled binary
+act as a standalone fcgi server.
+
+2004-07-05  Moriyoshi Koizumi  [EMAIL PROTECTED]
+
+* ext/standard/tests/serialize/bug28325.phpt:
+  - Add test for bug #28325.
+
 2004-07-04  Ilia Alshanetsky  [EMAIL PROTECTED]
 
 * ext/interbase/ibase_query.c:
@@ -5612,7 +5643,7 @@
 2004-03-18  Pierre-Alain Joye  [EMAIL PROTECTED]
 
 * ext/gd/tests/bug27582_2.phpt:
-  - Fix the test description and $Id: ChangeLog,v 1.1677 2004/07/05 00:32:17 
changelog Exp $
+  - Fix the test description and $Id: ChangeLog,v 1.1678 2004/07/06 00:33:26 
changelog Exp $
 
 2004-03-18  Derick Rethans  [EMAIL PROTECTED]
 


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

2004-07-05 Thread Derick Rethans
On Sat, 3 Jul 2004, Moriyoshi Koizumi wrote:

 moriyoshi Sat Jul  3 12:10:29 2004 EDT

   Modified files:
 /php-src/ext/standard var.c
   Log:
   - Bugfix #28325 (circular reference serialisation).

Can you please add a test case for this bug? The variable serializer is
pretty volatile stuff and having a testcase for each bug that is fixed
would be a very good idea.

regards,
Derick

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



[PHP-CVS] cvs: php-src /ext/standard/tests/serialize bug28325.phpt

2004-07-05 Thread Moriyoshi Koizumi
moriyoshi   Mon Jul  5 03:53:43 2004 EDT

  Added files: 
/php-src/ext/standard/tests/serialize   bug28325.phpt 
  Log:
  - Add test for bug #28325.
  
  

http://cvs.php.net/co.php/php-src/ext/standard/tests/serialize/bug28325.phpt?r=1.1p=1
Index: php-src/ext/standard/tests/serialize/bug28325.phpt
+++ php-src/ext/standard/tests/serialize/bug28325.phpt
--TEST--
Bug #28325 (Problem in serialisation of circular references)
--FILE--
?php
class a {
public $b;
}
class b {
public $c;
}
class c {
public $d;
}
$a = new a();
$a-b = new b();
$a-b-c = new c();
$a-b-c-d = $a;
var_dump(unserialize(serialize($a)));
?
--EXPECTF--
object(a)#%d (1) {
  [b]=
  object(b)#%d (1) {
[c]=
object(c)#%d (1) {
  [d]=
  object(a)#%d (1) {
[b]=
object(b)#%d (1) {
  [c]=
  object(c)#%d (1) {
[d]=
*RECURSION*
  }
}
  }
}
  }
}

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



[PHP-CVS] cvs: php-src(PHP_4_3) /sapi/cgi cgi_main.c

2004-07-05 Thread Sascha Schumann
sas Mon Jul  5 07:40:29 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/sapi/cgi   cgi_main.c 
  Log:
  - revert to proper behaviour. The environment variable PHP_FCGI_CHILDREN
must be explicitly set to != 0 to make the fastcgi-enabled binary
act as a standalone fcgi server.
  
  
http://cvs.php.net/diff.php/php-src/sapi/cgi/cgi_main.c?r1=1.190.2.60r2=1.190.2.61ty=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.190.2.60 php-src/sapi/cgi/cgi_main.c:1.190.2.61
--- php-src/sapi/cgi/cgi_main.c:1.190.2.60  Wed Mar 31 12:01:45 2004
+++ php-src/sapi/cgi/cgi_main.c Mon Jul  5 07:40:28 2004
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: cgi_main.c,v 1.190.2.60 2004/03/31 17:01:45 iliaa Exp $ */
+/* $Id: cgi_main.c,v 1.190.2.61 2004/07/05 11:40:28 sas Exp $ */
 
 #include php.h
 #include php_globals.h
@@ -98,7 +98,7 @@
 /**
  * Number of child processes that will get created to service requests
  */
-static int children = 8;
+static int children = 0;
 
 /**
  * Set to non-zero if we are the parent process

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



[PHP-CVS] cvs: php-src /sapi/cgi cgi_main.c

2004-07-05 Thread Sascha Schumann
sas Mon Jul  5 07:41:31 2004 EDT

  Modified files:  
/php-src/sapi/cgi   cgi_main.c 
  Log:
  - revert to proper behaviour
  
  
http://cvs.php.net/diff.php/php-src/sapi/cgi/cgi_main.c?r1=1.254r2=1.255ty=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.254 php-src/sapi/cgi/cgi_main.c:1.255
--- php-src/sapi/cgi/cgi_main.c:1.254   Thu May  6 11:41:59 2004
+++ php-src/sapi/cgi/cgi_main.c Mon Jul  5 07:41:31 2004
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: cgi_main.c,v 1.254 2004/05/06 15:41:59 stas Exp $ */
+/* $Id: cgi_main.c,v 1.255 2004/07/05 11:41:31 sas Exp $ */
 
 #include php.h
 #include php_globals.h
@@ -98,7 +98,7 @@
 /**
  * Number of child processes that will get created to service requests
  */
-static int children = 8;
+static int children = 0;
 
 /**
  * Set to non-zero if we are the parent process

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



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

2004-07-05 Thread Sascha Schumann
sas Mon Jul  5 07:44:19 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-srcNEWS 
  Log:
  add
  
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.694r2=1.1247.2.695ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.694 php-src/NEWS:1.1247.2.695
--- php-src/NEWS:1.1247.2.694   Sun Jul  4 12:53:01 2004
+++ php-src/NEWSMon Jul  5 07:44:19 2004
@@ -34,6 +34,7 @@
   (Elf, Ilia)
 - Fixed leap year checking with idate(). (Christian Schneider, Derick)
 - Fixed strip_tags() to correctly handle '\0' characters. (Stefan)
+- Fixed funny forking effect in FastCGI when PHP_FCGI_CHILDREN was not set.
 
 03 Jun 2004, Version 4.3.7
 - Upgraded bundled GD library to 2.0.23. (Ilia)

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



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

2004-07-05 Thread Marcus Boerger
helly   Mon Jul  5 15:36:11 2004 EDT

  Modified files:  
/php-src/ext/mysqli mysqli.c 
/php-srcNEWS 
  Log:
  - Bugfix: #29019 Database not closing
  
  
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli.c?r1=1.41r2=1.42ty=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.41 php-src/ext/mysqli/mysqli.c:1.42
--- php-src/ext/mysqli/mysqli.c:1.41Wed Jun 23 12:47:25 2004
+++ php-src/ext/mysqli/mysqli.c Mon Jul  5 15:36:10 2004
@@ -15,7 +15,7 @@
   | Author: Georg Richter [EMAIL PROTECTED]|
   +--+
 
-  $Id: mysqli.c,v 1.41 2004/06/23 16:47:25 georg Exp $ 
+  $Id: mysqli.c,v 1.42 2004/07/05 19:36:10 helly Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -132,7 +132,7 @@
FREE_HASHTABLE(intern-zo.properties);
 
/* link object */
-   if (intern-zo.ce == mysqli_link_class_entry) {
+   if (instanceof_function(intern-zo.ce, mysqli_link_class_entry TSRMLS_CC)) {
if (my_res  my_res-ptr) {
MY_MYSQL *mysql = (MY_MYSQL *)my_res-ptr;

http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1752r2=1.1753ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1752 php-src/NEWS:1.1753
--- php-src/NEWS:1.1752 Sat Jul  3 12:14:46 2004
+++ php-src/NEWSMon Jul  5 15:36:10 2004
@@ -3,6 +3,7 @@
 ?? Jul 2004, PHP 5.0.0
 - Updated PCRE to provide better error handling in certain cases. (Andrei)
 - Changed doc comments to require a single white space after '/**'. (Marcus)
+- Fixed bug #29019 (Database not closing). (Marcus)
 - Fixed bug #28895 (ReflectionClass::isAbstract always returns false). (Marcus)
 - Fixed bug #28868 (Internal filter registry not thread safe). (Sara)
 - Fixed bug #28851 (call_user_func_array has typo in error message). (Marcus)



-- 
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_sdl.c

2004-07-05 Thread Ilia Alshanetsky
iliaa   Mon Jul  5 17:31:35 2004 EDT

  Modified files:  
/php-src/ext/soap   php_sdl.c 
  Log:
  Eliminate alloca() calls where they can be affected by the users.
  
  
http://cvs.php.net/diff.php/php-src/ext/soap/php_sdl.c?r1=1.69r2=1.70ty=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.69 php-src/ext/soap/php_sdl.c:1.70
--- php-src/ext/soap/php_sdl.c:1.69 Wed May  5 06:31:26 2004
+++ php-src/ext/soap/php_sdl.c  Mon Jul  5 17:31:35 2004
@@ -17,7 +17,7 @@
   |  Dmitry Stogov [EMAIL PROTECTED] |
   +--+
 */
-/* $Id: php_sdl.c,v 1.69 2004/05/05 10:31:26 dmitry Exp $ */
+/* $Id: php_sdl.c,v 1.70 2004/07/05 21:31:35 iliaa Exp $ */
 
 #include php_soap.h
 #include libxml/uri.h
@@ -52,7 +52,7 @@
int ns_len = strlen(nsptr-href);
int type_len = strlen(cptype);
int len = ns_len + type_len + 1;
-   char *nscat = do_alloca(len + 1);
+   char *nscat = emalloc(len + 1);
 
memcpy(nscat, nsptr-href, ns_len);
nscat[ns_len] = ':';
@@ -63,7 +63,7 @@
if (enc == NULL) {
enc = get_encoder_ex(sdl, type, type_len);
}
-   free_alloca(nscat);
+   efree(nscat);
} else {
enc = get_encoder_ex(sdl, type, strlen(type));
}
@@ -88,7 +88,7 @@
int ns_len = strlen(nsptr-href);
int type_len = strlen(cptype);
int len = ns_len + type_len + 1;
-   char *nscat = do_alloca(len + 1);
+   char *nscat = emalloc(len + 1);
 
memcpy(nscat, nsptr-href, ns_len);
nscat[ns_len] = ':';
@@ -100,7 +100,7 @@
} else if (zend_hash_find(sdl-elements, (char*)type, type_len 
+ 1, (void **)sdl_type) == SUCCESS) {
ret = *sdl_type;
}
-   free_alloca(nscat);
+   efree(nscat);
} else {
if (zend_hash_find(sdl-elements, (char*)type, strlen(type) + 
1, (void **)sdl_type) == SUCCESS) {
ret = *sdl_type;
@@ -121,7 +121,7 @@
int type_len = strlen(type);
int len = ns_len + type_len + 1;
 
-   nscat = do_alloca(len + 1);
+   nscat = emalloc(len + 1);
memcpy(nscat, ns, ns_len);
nscat[ns_len] = ':';
memcpy(nscat+ns_len+1, type, type_len);
@@ -129,7 +129,7 @@
 
enc = get_encoder_ex(sdl, nscat, len);
 
-   free_alloca(nscat);
+   efree(nscat);
return enc;
 }
 
@@ -2190,7 +2190,7 @@
PHP_MD5Update(context, fn, strlen(fn));
PHP_MD5Final(digest, context);
make_digest(md5str, digest);
-   key = do_alloca(len+sizeof(/wsdl-)-1+sizeof(md5str));
+   key = emalloc(len+sizeof(/wsdl-)-1+sizeof(md5str));
memcpy(key,SOAP_GLOBAL(cache_dir),len);
memcpy(key+len,/wsdl-,sizeof(/wsdl-)-1);
memcpy(key+len+sizeof(/wsdl-)-1,md5str,sizeof(md5str));
@@ -2201,7 +2201,7 @@
add_sdl_to_cache(key, fn, t, sdl);
}
}
-   free_alloca(key);
+   efree(key);
}
} else {
sdl = load_wsdl(uri);

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