date:20070724

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

2007-07-24 Thread changelog

changelog   Wed Jul 25 01:31:24 2007 UTC

  Modified files:  
/ZendEngine2ChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1145r2=1.1146diff_format=u
Index: ZendEngine2/ChangeLog
diff -u ZendEngine2/ChangeLog:1.1145 ZendEngine2/ChangeLog:1.1146
--- ZendEngine2/ChangeLog:1.1145Tue Jul 24 01:31:34 2007
+++ ZendEngine2/ChangeLog   Wed Jul 25 01:31:24 2007
@@ -1,3 +1,57 @@
+2007-07-24  Dmitry Stogov  [EMAIL PROTECTED]
+
+* zend_vm_def.h
+  zend_vm_def.h
+  zend_vm_execute.h
+  zend_vm_execute.h
+  tests/bug40509.phpt
+  tests/bug40705.phpt:
+  Fixed bug #40705 (Iterating within function moves original array pointer)
+  Fixed bug #40509 (key() function changed behaviour if global array is 
used
+  within function)
+
+* tests/bug40509.phpt
+  tests/bug40509.phpt
+  tests/bug40705.phpt
+  tests/bug40705.phpt:
+  
+  file bug40509.phpt was initially added on branch PHP_5_2.
+
+* zend_hash.c
+  zend_hash.c
+  tests/bug37715.phpt
+  tests/bug41372.phpt:
+  Fixed bug #41372 (Internal pointer of source array resets during array
+  copying)
+  Fixed bug #37715 (array pointers resetting on copy)
+
+* tests/bug37715.phpt
+  tests/bug37715.phpt
+  tests/bug41372.phpt
+  tests/bug41372.phpt:
+  
+  file bug37715.phpt was initially added on branch PHP_5_2.
+
+* (BEFORE_REAL_IMPORT_OF_MYSQLND)
+  zend_builtin_functions.c
+  zend_builtin_functions.c
+  zend_object_handlers.c
+  zend_object_handlers.c
+  tests/bug27798.phpt
+  tests/bug27798.phpt
+  tests/bug40757.phpt
+  tests/bug41929.phpt:
+  Fixed bug #40757 (get_object_vars get nothing in child class)
+  Fixed bug #41929 (Foreach on object does not iterate over all visible
+  properties)
+
+* tests/bug40757.phpt
+  tests/bug40757.phpt
+  tests/bug41929.phpt
+  tests/bug41929.phpt:
+  
+  file bug40757.phpt was initially added on branch PHP_5_2.
+
 2007-07-23  Jani Taskinen  [EMAIL PROTECTED]
 
 * (PHP_5_2)
@@ -18456,7 +18510,7 @@
 2003-06-10  Jani Taskinen  [EMAIL PROTECTED]
 
 * zend_multiply.h:
-  - Missing $Id: ChangeLog,v 1.1145 2007/07/24 01:31:34 changelog Exp $ tag
+  - Missing $Id: ChangeLog,v 1.1146 2007/07/25 01:31:24 changelog Exp $ tag
 
 2003-06-10  James Cox  [EMAIL PROTECTED]
 
@@ -20180,7 +20234,7 @@
   zend_types.h
   zend_variables.c
   zend_variables.h:
-  - Added some missing CVS $Id: ChangeLog,v 1.1145 2007/07/24 01:31:34 
changelog Exp $ tags, headers and footers.
+  - Added some missing CVS $Id: ChangeLog,v 1.1146 2007/07/25 01:31:24 
changelog Exp $ tags, headers and footers.
 
 2003-01-30  Ilia Alshanetsky  [EMAIL PROTECTED]

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

2007-07-24 Thread Andrey Hristov

andrey  Tue Jul 24 09:22:16 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/mysqli mysqli_api.c 
  Log:
  Fix build with latest 5.1 sources where gptr is no more.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.118.2.22.2.13r2=1.118.2.22.2.14diff_format=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.13 
php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.14
--- php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.13 Thu Jun 28 09:07:40 2007
+++ php-src/ext/mysqli/mysqli_api.c Tue Jul 24 09:22:16 2007
@@ -15,7 +15,7 @@
   | Author: Georg Richter [EMAIL PROTECTED]|
   +--+
 
-  $Id: mysqli_api.c,v 1.118.2.22.2.13 2007/06/28 09:07:40 andrey Exp $ 
+  $Id: mysqli_api.c,v 1.118.2.22.2.14 2007/07/24 09:22:16 andrey Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -141,13 +141,13 @@
switch (types[ofs]) {
case 'd': /* Double */
bind[ofs].buffer_type = MYSQL_TYPE_DOUBLE;
-   bind[ofs].buffer = (gptr)Z_DVAL_PP(args[i]);
+   bind[ofs].buffer = (char*)Z_DVAL_PP(args[i]);
bind[ofs].is_null = stmt-param.is_null[ofs];
break;
 
case 'i': /* Integer */
bind[ofs].buffer_type = MYSQL_TYPE_LONG;
-   bind[ofs].buffer = (gptr)Z_LVAL_PP(args[i]);
+   bind[ofs].buffer = (char*)Z_LVAL_PP(args[i]);
bind[ofs].is_null = stmt-param.is_null[ofs];
break;
 
@@ -600,11 +600,11 @@
break;
case MYSQL_TYPE_DOUBLE:

convert_to_double_ex(stmt-param.vars[i]);
-   stmt-stmt-params[i].buffer = 
(gptr)Z_LVAL_PP(stmt-param.vars[i]);
+   stmt-stmt-params[i].buffer = 
(char*)Z_LVAL_PP(stmt-param.vars[i]);
break;
case MYSQL_TYPE_LONG:

convert_to_long_ex(stmt-param.vars[i]);
-   stmt-stmt-params[i].buffer = 
(gptr)Z_LVAL_PP(stmt-param.vars[i]);
+   stmt-stmt-params[i].buffer = 
(char*)Z_LVAL_PP(stmt-param.vars[i]);
break;
default:
break;

-- 
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

2007-07-24 Thread Jani Taskinen

janiTue Jul 24 09:26:34 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  - fix NEWS
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.847r2=1.2027.2.547.2.848diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.847 php-src/NEWS:1.2027.2.547.2.848
--- php-src/NEWS:1.2027.2.547.2.847 Tue Jul 24 09:07:33 2007
+++ php-src/NEWSTue Jul 24 09:26:34 2007
@@ -62,8 +62,8 @@
 - Fixed bug #42072 (No warning message for clearstatcache() with arguments).
   (Ilia)
 - Fixed bug #42071 (ini scanner allows using NULL as option name). (Jani)
-- Fixed bug #42027 is_file() / is_dir() matches file/dirnames with wildcard
-  char or trailing slash. (Dmitry)
+- Fixed bug #42027 (is_file() / is_dir() matches file/dirnames with wildcard
+  char or trailing slash in Windows). (Dmitry)
 - Fixed bug #42019 (configure option --with-adabas=DIR does not work). (Jani)
 - Fixed bug #42015 (ldap_rename(): server error DSA is unwilling to perform).
   (bob at mroczka dot com, Jani)

-- 
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

2007-07-24 Thread Dmitry Stogov

dmitry  Tue Jul 24 09:27:47 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
/php-src/ext/soap   php_http.c 
  Log:
  Fixed bug #41983 (Error Fetching http headers terminated by '\n')
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.848r2=1.2027.2.547.2.849diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.848 php-src/NEWS:1.2027.2.547.2.849
--- php-src/NEWS:1.2027.2.547.2.848 Tue Jul 24 09:26:34 2007
+++ php-src/NEWSTue Jul 24 09:27:46 2007
@@ -68,6 +68,7 @@
 - Fixed bug #42015 (ldap_rename(): server error DSA is unwilling to perform).
   (bob at mroczka dot com, Jani)
 - Fixed bug #41989 (move_uploaded_file()  relative path in ZTS mode). (Tony)
+- Fixed bug #41983 (Error Fetching http headers terminated by '\n'). (Dmitry)
 - Fixed bug #41964 (strtotime returns a timestamp for non-time string of
   pattern '(A|a) .+'). (Derick)
 - Fixed bug #41961 (Ensure search for hidden private methods does not stray
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_http.c?r1=1.77.2.11.2.11r2=1.77.2.11.2.12diff_format=u
Index: php-src/ext/soap/php_http.c
diff -u php-src/ext/soap/php_http.c:1.77.2.11.2.11 
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.11  Fri Jul 13 09:14:03 2007
+++ php-src/ext/soap/php_http.c Tue Jul 24 09:27:46 2007
@@ -17,7 +17,7 @@
   |  Dmitry Stogov [EMAIL PROTECTED] |
   +--+
 */
-/* $Id: php_http.c,v 1.77.2.11.2.11 2007/07/13 09:14:03 dmitry Exp $ */
+/* $Id: php_http.c,v 1.77.2.11.2.12 2007/07/24 09:27:46 dmitry Exp $ */
 
 #include php_soap.h
 #include ext/standard/base64.h
@@ -1153,17 +1153,19 @@
 
/* match */
tmp = pos + typelen;
-   eol = strstr(tmp, \r\n);
+   eol = strchr(tmp, '\n');
if (eol == NULL) {
eol = headers + headerslen;
+   } else if (eol  tmp  *(eol-1) == '\r') {
+   eol--;
}
return estrndup(tmp, eol - tmp);
}
 
/* find next line */
-   pos = strstr(pos, \r\n);
+   pos = strchr(pos, '\n');
if (pos) {
-   pos += 2;
+   pos++;
}
 
} while (pos);
@@ -1203,7 +1205,7 @@
}
 
if (header_chunked) {
-   char done, chunk_size[10];
+   char ch, done, chunk_size[10], headerbuf[8192];
 
done = FALSE;
 
@@ -1231,11 +1233,20 @@
len_size += len_read;
http_buf_size += len_read;
}
-   }
 
-   /* Eat up '\r' '\n' */
-   php_stream_getc(stream);
-   php_stream_getc(stream);
+   /* Eat up '\r' '\n' */
+   ch = php_stream_getc(stream);
+   if (ch == '\r') {
+   ch = php_stream_getc(stream);
+   }
+   if (ch != '\n') {
+   /* Somthing wrong in chunked 
encoding */
+   if (http_buf) {
+   efree(http_buf);
+   }
+   return FALSE;
+   }
+   }
} else {
/* Somthing wrong in chunked encoding */
if (http_buf) {
@@ -1248,6 +1259,19 @@
}
}
 
+   /* Ignore trailer headers */
+   while (1) {
+   if (!php_stream_gets(stream, headerbuf, 
sizeof(headerbuf))) {
+   break;
+   }
+
+   if ((headerbuf[0] == '\r'  headerbuf[1] == '\n') ||
+   (headerbuf[0] == '\n')) {
+   /* empty line marks end of headers */
+   break;
+   }
+   }
+
if (http_buf == NULL) {
http_buf = emalloc(1);
}
@@ -1294,7 +1318,8 @@
break;
}
 
-   if (strcmp(headerbuf, \r\n) == 0) {
+   if ((headerbuf[0] == '\r'  headerbuf[1] == '\n') ||
+   (headerbuf[0] ==

Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/strings str_pad.phpt

2007-07-24 Thread Jani Taskinen

What was wrong with it? (can't see diff, it's binary for some reason..)

--Jani

On Mon, 2007-07-23 at 22:14 +, Antony Dovgal wrote:
 tony2001  Mon Jul 23 22:14:47 2007 UTC
 
   Modified files:  (Branch: PHP_5_2)
 /php-src/ext/standard/tests/strings   str_pad.phpt 
   Log:
   fix test
   
   
 http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/str_pad.phpt?r1=1.1.2.5r2=1.1.2.6diff_format=u
 Index: php-src/ext/standard/tests/strings/str_pad.phpt
 

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

2007-07-24 Thread Andrey Hristov

andrey  Tue Jul 24 09:32:11 2007 UTC

  Modified files:  
/php-src/ext/mysqli mysqli_api.c 
  Log:
  MFB
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.147r2=1.148diff_format=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.147 
php-src/ext/mysqli/mysqli_api.c:1.148
--- php-src/ext/mysqli/mysqli_api.c:1.147   Mon Jun 18 21:59:05 2007
+++ php-src/ext/mysqli/mysqli_api.c Tue Jul 24 09:32:11 2007
@@ -15,7 +15,7 @@
   | Author: Georg Richter [EMAIL PROTECTED]|
   +--+
 
-  $Id: mysqli_api.c,v 1.147 2007/06/18 21:59:05 stas Exp $ 
+  $Id: mysqli_api.c,v 1.148 2007/07/24 09:32:11 andrey Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -145,13 +145,13 @@
switch (types[ofs]) {
case 'd': /* Double */
bind[ofs].buffer_type = MYSQL_TYPE_DOUBLE;
-   bind[ofs].buffer = (gptr)Z_DVAL_PP(args[i]);
+   bind[ofs].buffer = (char*)Z_DVAL_PP(args[i]);
bind[ofs].is_null = stmt-param.is_null[ofs];
break;
 
case 'i': /* Integer */
bind[ofs].buffer_type = MYSQL_TYPE_LONG;
-   bind[ofs].buffer = (gptr)Z_LVAL_PP(args[i]);
+   bind[ofs].buffer = (char*)Z_LVAL_PP(args[i]);
bind[ofs].is_null = stmt-param.is_null[ofs];
break;
 
@@ -620,11 +620,11 @@
break;
case MYSQL_TYPE_DOUBLE:

convert_to_double_ex(stmt-param.vars[i]);
-   stmt-stmt-params[i].buffer = 
(gptr)Z_LVAL_PP(stmt-param.vars[i]);
+   stmt-stmt-params[i].buffer = 
(char*)Z_LVAL_PP(stmt-param.vars[i]);
break;
case MYSQL_TYPE_LONG:

convert_to_long_ex(stmt-param.vars[i]);
-   stmt-stmt-params[i].buffer = 
(gptr)Z_LVAL_PP(stmt-param.vars[i]);
+   stmt-stmt-params[i].buffer = 
(char*)Z_LVAL_PP(stmt-param.vars[i]);
break;
default:
break;

-- 
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

2007-07-24 Thread Dmitry Stogov

dmitry  Tue Jul 24 09:28:12 2007 UTC

  Modified files:  
/php-src/ext/soap   php_http.c 
  Log:
  Fixed bug #41983 (Error Fetching http headers terminated by '\n')
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_http.c?r1=1.108r2=1.109diff_format=u
Index: php-src/ext/soap/php_http.c
diff -u php-src/ext/soap/php_http.c:1.108 php-src/ext/soap/php_http.c:1.109
--- php-src/ext/soap/php_http.c:1.108   Fri Jul 13 09:15:03 2007
+++ php-src/ext/soap/php_http.c Tue Jul 24 09:28:12 2007
@@ -17,7 +17,7 @@
   |  Dmitry Stogov [EMAIL PROTECTED] |
   +--+
 */
-/* $Id: php_http.c,v 1.108 2007/07/13 09:15:03 dmitry Exp $ */
+/* $Id: php_http.c,v 1.109 2007/07/24 09:28:12 dmitry Exp $ */
 
 #include php_soap.h
 #include ext/standard/base64.h
@@ -1155,17 +1155,19 @@
 
/* match */
tmp = pos + typelen;
-   eol = strstr(tmp, \r\n);
+   eol = strchr(tmp, '\n');
if (eol == NULL) {
eol = headers + headerslen;
+   } else if (eol  tmp  *(eol-1) == '\r') {
+   eol--;
}
return estrndup(tmp, eol - tmp);
}
 
/* find next line */
-   pos = strstr(pos, \r\n);
+   pos = strchr(pos, '\n');
if (pos) {
-   pos += 2;
+   pos++;
}
 
} while (pos);
@@ -1205,7 +1207,7 @@
}
 
if (header_chunked) {
-   char done, chunk_size[10];
+   char ch, done, chunk_size[10], headerbuf[8192];
 
done = FALSE;
 
@@ -1233,11 +1235,20 @@
len_size += len_read;
http_buf_size += len_read;
}
-   }
 
-   /* Eat up '\r' '\n' */
-   php_stream_getc(stream);
-   php_stream_getc(stream);
+   /* Eat up '\r' '\n' */
+   ch = php_stream_getc(stream);
+   if (ch == '\r') {
+   ch = php_stream_getc(stream);
+   }
+   if (ch != '\n') {
+   /* Somthing wrong in chunked 
encoding */
+   if (http_buf) {
+   efree(http_buf);
+   }
+   return FALSE;
+   }
+   }
} else {
/* Somthing wrong in chunked encoding */
if (http_buf) {
@@ -1250,6 +1261,19 @@
}
}
 
+   /* Ignore trailer headers */
+   while (1) {
+   if (!php_stream_gets(stream, ZSTR(headerbuf), 
sizeof(headerbuf))) {
+   break;
+   }
+
+   if ((headerbuf[0] == '\r'  headerbuf[1] == '\n') ||
+   (headerbuf[0] == '\n')) {
+   /* empty line marks end of headers */
+   break;
+   }
+   }
+
if (http_buf == NULL) {
http_buf = emalloc(1);
}
@@ -1296,7 +1320,8 @@
break;
}
 
-   if (strcmp(headerbuf, \r\n) == 0) {
+   if ((headerbuf[0] == '\r'  headerbuf[1] == '\n') ||
+   (headerbuf[0] == '\n')) {
/* empty line marks end of headers */
done = TRUE;
break;

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

Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/strings str_pad.phpt

2007-07-24 Thread Antony Dovgal


You forgot to change the paths in error messages to %s:

Wrong parameter count for str_pad() in 
/home/jani/src/php-5.2/ext/standard/tests/strings/str_pad.php on line 61

On 24.07.2007 13:16, Jani Taskinen wrote:

What was wrong with it? (can't see diff, it's binary for some reason..)

--Jani

On Mon, 2007-07-23 at 22:14 +, Antony Dovgal wrote:

tony2001Mon Jul 23 22:14:47 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard/tests/strings	str_pad.phpt 
  Log:

  fix test
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/str_pad.phpt?r1=1.1.2.5r2=1.1.2.6diff_format=u

Index: php-src/ext/standard/tests/strings/str_pad.phpt






--
Wbr, 
Antony Dovgal


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

[PHP-CVS] cvs: php-src /ext/sockets sockets.php

2007-07-24 Thread Jani Taskinen

janiTue Jul 24 11:15:08 2007 UTC

  Removed files:   
/php-src/ext/socketssockets.php 
  Log:
  - Removed useless file
  

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

[PHP-CVS] cvs: php-src /ext/sockets package.xml

2007-07-24 Thread Jani Taskinen

janiTue Jul 24 11:15:29 2007 UTC

  Modified files:  
/php-src/ext/socketspackage.xml 
  Log:
  - Removed useless file
  
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/package.xml?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/sockets/package.xml
diff -u php-src/ext/sockets/package.xml:1.2 php-src/ext/sockets/package.xml:1.3
--- php-src/ext/sockets/package.xml:1.2 Wed Mar 14 09:49:57 2007
+++ php-src/ext/sockets/package.xml Tue Jul 24 11:15:29 2007
@@ -44,7 +44,6 @@
   /notes
   filelist
file role=doc name=CREDITS/
-   file role=doc name=sockets.php/
file role=src name=config.m4/
file role=src name=config.w32/
file role=src name=php_sockets.h/

-- 
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/sockets package.xml sockets.php

2007-07-24 Thread Jani Taskinen

janiTue Jul 24 11:15:59 2007 UTC

  Removed files:   (Branch: PHP_5_2)
/php-src/ext/socketssockets.php 

  Modified files:  
/php-src/ext/socketspackage.xml 
  Log:
  MFH: removed useless file
  
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/package.xml?r1=1.1.6.1r2=1.1.6.2diff_format=u
Index: php-src/ext/sockets/package.xml
diff -u php-src/ext/sockets/package.xml:1.1.6.1 
php-src/ext/sockets/package.xml:1.1.6.2
--- php-src/ext/sockets/package.xml:1.1.6.1 Wed Mar 14 09:58:11 2007
+++ php-src/ext/sockets/package.xml Tue Jul 24 11:15:59 2007
@@ -44,7 +44,6 @@
   /notes
   filelist
file role=doc name=CREDITS/
-   file role=doc name=sockets.php/
file role=src name=config.m4/
file role=src name=config.w32/
file role=src name=php_sockets.h/

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

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

2007-07-24 Thread Jani Taskinen

janiTue Jul 24 11:33:47 2007 UTC

  Modified files:  
/php-src/ext/socketssockets.c 
  Log:
  - Added missing constants for MSG_EOR and MSG_EOF
  
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/sockets.c?r1=1.193r2=1.194diff_format=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.193 php-src/ext/sockets/sockets.c:1.194
--- php-src/ext/sockets/sockets.c:1.193 Sun Jul 22 23:00:14 2007
+++ php-src/ext/sockets/sockets.c   Tue Jul 24 11:33:47 2007
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: sockets.c,v 1.193 2007/07/22 23:00:14 jani Exp $ */
+/* $Id: sockets.c,v 1.194 2007/07/24 11:33:47 jani Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -68,6 +68,12 @@
 #endif
 #endif
 
+#ifndef MSG_EOF
+#ifdef MSG_FIN
+#define MSG_EOF MSG_FIN
+#endif
+#endif
+
 #ifndef SUN_LEN
 #define SUN_LEN(su) (sizeof(*(su)) - sizeof((su)-sun_path) + 
strlen((su)-sun_path))
 #endif
@@ -480,6 +486,12 @@
REGISTER_LONG_CONSTANT(MSG_WAITALL,   MSG_WAITALL,CONST_CS | 
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(MSG_PEEK,  MSG_PEEK,   
CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(MSG_DONTROUTE, MSG_DONTROUTE,  CONST_CS | 
CONST_PERSISTENT);
+#ifdef MSG_EOR
+   REGISTER_LONG_CONSTANT(MSG_EOR,   MSG_EOR,
CONST_CS | CONST_PERSISTENT);
+#endif
+#ifdef MSG_EOF
+   REGISTER_LONG_CONSTANT(MSG_EOF,   MSG_EOF,
CONST_CS | CONST_PERSISTENT);
+#endif
REGISTER_LONG_CONSTANT(SO_DEBUG,  SO_DEBUG,   
CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(SO_REUSEADDR,  SO_REUSEADDR,   CONST_CS | 
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(SO_KEEPALIVE,  SO_KEEPALIVE,   CONST_CS | 
CONST_PERSISTENT);

-- 
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/sockets sockets.c

2007-07-24 Thread Jani Taskinen

janiTue Jul 24 11:35:08 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
/php-src/ext/socketssockets.c 
  Log:
  MFH:- Added missing MSG_EOR and MSG_EOF constants
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.849r2=1.2027.2.547.2.850diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.849 php-src/NEWS:1.2027.2.547.2.850
--- php-src/NEWS:1.2027.2.547.2.849 Tue Jul 24 09:27:46 2007
+++ php-src/NEWSTue Jul 24 11:35:08 2007
@@ -30,6 +30,7 @@
 - Added missing error check inside bcpowmod(). (Ilia)
 - Added CURLOPT_PRIVATE  CURLINFO_PRIVATE constants. 
   (Andrey A. Belashkov, Tony)
+- Added missing MSG_EOR and MSG_EOF constants to sockets extension. (Jani)
 
 - Implemented FR #41884 (ReflectionClass::getDefaultProperties() does not 
handle 
   static attributes). (Tony)
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/sockets.c?r1=1.171.2.9.2.12r2=1.171.2.9.2.13diff_format=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.171.2.9.2.12 
php-src/ext/sockets/sockets.c:1.171.2.9.2.13
--- php-src/ext/sockets/sockets.c:1.171.2.9.2.12Sun Jul 22 23:01:20 2007
+++ php-src/ext/sockets/sockets.c   Tue Jul 24 11:35:08 2007
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: sockets.c,v 1.171.2.9.2.12 2007/07/22 23:01:20 jani Exp $ */
+/* $Id: sockets.c,v 1.171.2.9.2.13 2007/07/24 11:35:08 jani Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -68,6 +68,12 @@
 #endif
 #endif
 
+#ifndef MSG_EOF
+#ifdef MSG_FIN
+#define MSG_EOF MSG_FIN
+#endif
+#endif
+
 #ifndef SUN_LEN
 #define SUN_LEN(su) (sizeof(*(su)) - sizeof((su)-sun_path) + 
strlen((su)-sun_path))
 #endif
@@ -480,6 +486,12 @@
REGISTER_LONG_CONSTANT(MSG_WAITALL,   MSG_WAITALL,CONST_CS | 
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(MSG_PEEK,  MSG_PEEK,   
CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(MSG_DONTROUTE, MSG_DONTROUTE,  CONST_CS | 
CONST_PERSISTENT);
+#ifdef MSG_EOR
+   REGISTER_LONG_CONSTANT(MSG_EOR,   MSG_EOR,
CONST_CS | CONST_PERSISTENT);
+#endif
+#ifdef MSG_EOF
+   REGISTER_LONG_CONSTANT(MSG_EOF,   MSG_EOF,
CONST_CS | CONST_PERSISTENT);
+#endif
REGISTER_LONG_CONSTANT(SO_DEBUG,  SO_DEBUG,   
CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(SO_REUSEADDR,  SO_REUSEADDR,   CONST_CS | 
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(SO_KEEPALIVE,  SO_KEEPALIVE,   CONST_CS | 
CONST_PERSISTENT);

-- 
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/pdo/tests pdo_018.phpt /tests/classes visibility_005.phpt ZendEngine2 zend_builtin_functions.c zend_object_handlers.c ZendEngine2/tests bug27798.phpt bu

2007-07-24 Thread Dmitry Stogov

dmitry  Tue Jul 24 11:39:56 2007 UTC

  Added files: (Branch: PHP_5_2)
/ZendEngine2/tests  bug40757.phpt bug41929.phpt 

  Modified files:  
/php-srcNEWS 
/ZendEngine2zend_builtin_functions.c zend_object_handlers.c 
/ZendEngine2/tests  bug27798.phpt 
/php-src/ext/pdo/tests  pdo_018.phpt 
/php-src/tests/classes  visibility_005.phpt 
  Log:
  Fixed bug #40757 (get_object_vars get nothing in child class)
  Fixed bug #41929 (Foreach on object does not iterate over all visible 
properties)
  
  http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.850r2=1.2027.2.547.2.851diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.850 php-src/NEWS:1.2027.2.547.2.851
--- php-src/NEWS:1.2027.2.547.2.850 Tue Jul 24 11:35:08 2007
+++ php-src/NEWSTue Jul 24 11:39:55 2007
@@ -76,6 +76,8 @@
   from class hierarchy). (robin_fernandes at uk dot ibm dot com)
 - Fixed bug #41947 (SimpleXML incorrectly registers empty strings as 
   namespaces). (Rob)
+- Fixed bug #41929 (Foreach on object does not iterate over all visible
+  properties). (Dmitry)
 - Fixed bug #41919 (crash in string to array conversion).
   (judas dot iscariote at gmail dot com, Ilia)
 - Fixed bug #41908 (CFLAGS=-Os ./configure --enable-debug fails). 
@@ -160,6 +162,7 @@
   on Windows). (Scott, Andrey)
 - Fixed bug #41127 (Memory leak in ldap_{first|next}_attribute functions).
   (Jani)
+- Fixed bug #40757 (get_object_vars get nothing in child class). (Dmitry)
 - Fixed bug #40419 (Trailing slash in CGI request does not work). (Dmitry)
 - Fixed bug #39330 (apache2handler does not call shutdown actions before 
   apache child die). (isk at ecommerce dot com, Gopal, Tony)
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_builtin_functions.c?r1=1.277.2.12.2.18r2=1.277.2.12.2.19diff_format=u
Index: ZendEngine2/zend_builtin_functions.c
diff -u ZendEngine2/zend_builtin_functions.c:1.277.2.12.2.18 
ZendEngine2/zend_builtin_functions.c:1.277.2.12.2.19
--- ZendEngine2/zend_builtin_functions.c:1.277.2.12.2.18Sat Jun  9 
08:38:44 2007
+++ ZendEngine2/zend_builtin_functions.cTue Jul 24 11:39:55 2007
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: zend_builtin_functions.c,v 1.277.2.12.2.18 2007/06/09 08:38:44 
johannes Exp $ */
+/* $Id: zend_builtin_functions.c,v 1.277.2.12.2.19 2007/07/24 11:39:55 dmitry 
Exp $ */
 
 #include zend.h
 #include zend_API.h
@@ -789,7 +789,7 @@
char *key, *prop_name, *class_name;
uint key_len;
ulong num_index;
-   int instanceof;
+   zend_object *zobj;
 
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, obj) == FAILURE) 
{
ZEND_WRONG_PARAM_COUNT();
@@ -808,7 +808,7 @@
RETURN_FALSE;
}
 
-   instanceof = EG(This)  instanceof_function(Z_OBJCE_P(EG(This)), 
Z_OBJCE_PP(obj) TSRMLS_CC);
+   zobj = zend_objects_get_address(*obj TSRMLS_CC);
 
array_init(return_value);
 
@@ -816,17 +816,11 @@
 
while (zend_hash_get_current_data_ex(properties, (void **) value, 
pos) == SUCCESS) {
if (zend_hash_get_current_key_ex(properties, key, key_len, 
num_index, 0, pos) == HASH_KEY_IS_STRING) {
-   if (key[0]) {
+   if (zend_check_property_access(zobj, key, key_len-1 
TSRMLS_CC) == SUCCESS) {
+   zend_unmangle_property_name(key, key_len-1, 
class_name, prop_name);
/* Not separating references */
(*value)-refcount++;
-   add_assoc_zval_ex(return_value, key, key_len, 
*value);
-   } else if (instanceof) {
-   zend_unmangle_property_name(key, key_len-1, 
class_name, prop_name);
-   if (!memcmp(class_name, *, 2) || 
(Z_OBJCE_P(EG(This)) == Z_OBJCE_PP(obj)  !strcmp(Z_OBJCE_P(EG(This))-name, 
class_name))) {
-   /* Not separating references */
-   (*value)-refcount++;
-   add_assoc_zval_ex(return_value, 
prop_name, strlen(prop_name)+1, *value);
-   }
+   add_assoc_zval_ex(return_value, prop_name, 
strlen(prop_name)+1, *value);
}
}
zend_hash_move_forward_ex(properties, pos);
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_object_handlers.c?r1=1.135.2.6.2.21r2=1.135.2.6.2.22diff_format=u
Index: ZendEngine2/zend_object_handlers.c
diff -u ZendEngine2/zend_object_handlers.c:1.135.2.6.2.21 
ZendEngine2/zend_object_handlers.c:1.135.2.6.2.22
--- ZendEngine2/zend_object_handlers.c:1.135.2.6.2.21   Thu Jul 12 10:32:09 2007
+++ ZendEngine2/zend_object_handlers.c  Tue Jul 24 11:39:55 2007
@@ -17,7 +17,7 @@

[PHP-CVS] cvs: php-src /tests/classes visibility_005.phpt ZendEngine2 zend_builtin_functions.c zend_object_handlers.c ZendEngine2/tests bug27798.phpt bug40757.phpt bug41929.phpt

2007-07-24 Thread Dmitry Stogov

dmitry  Tue Jul 24 11:40:08 2007 UTC

  Modified files:  
/ZendEngine2zend_builtin_functions.c zend_object_handlers.c 
/ZendEngine2/tests  bug40757.phpt bug41929.phpt bug27798.phpt 
/php-src/tests/classes  visibility_005.phpt 
  Log:
  Fixed bug #40757 (get_object_vars get nothing in child class)
  Fixed bug #41929 (Foreach on object does not iterate over all visible 
properties)
  
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_builtin_functions.c?r1=1.342r2=1.343diff_format=u
Index: ZendEngine2/zend_builtin_functions.c
diff -u ZendEngine2/zend_builtin_functions.c:1.342 
ZendEngine2/zend_builtin_functions.c:1.343
--- ZendEngine2/zend_builtin_functions.c:1.342  Tue Jul 10 15:06:58 2007
+++ ZendEngine2/zend_builtin_functions.cTue Jul 24 11:40:07 2007
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: zend_builtin_functions.c,v 1.342 2007/07/10 15:06:58 tony2001 Exp $ */
+/* $Id: zend_builtin_functions.c,v 1.343 2007/07/24 11:40:07 dmitry Exp $ */
 
 #include zend.h
 #include zend_API.h
@@ -816,7 +816,7 @@
zstr key, prop_name, class_name;
uint key_len;
ulong num_index;
-   int instanceof;
+   zend_object *zobj;
 
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, obj) == FAILURE) 
{
ZEND_WRONG_PARAM_COUNT();
@@ -835,7 +835,7 @@
RETURN_FALSE;
}
 
-   instanceof = EG(This)  instanceof_function(Z_OBJCE_P(EG(This)), 
Z_OBJCE_PP(obj) TSRMLS_CC);
+   zobj = zend_objects_get_address(*obj TSRMLS_CC);
 
array_init(return_value);
 
@@ -843,19 +843,11 @@
 
while (zend_hash_get_current_data_ex(properties, (void **) value, 
pos) == SUCCESS) {
if (zend_hash_get_current_key_ex(properties, key, key_len, 
num_index, 0, pos) == (UG(unicode)?HASH_KEY_IS_UNICODE:HASH_KEY_IS_STRING)) {
-   
zend_u_unmangle_property_name(UG(unicode)?IS_UNICODE:IS_STRING, key, key_len-1, 
class_name, prop_name);
-   if (class_name.v == NULL) {
+   if (zend_check_property_access(zobj, ZEND_STR_TYPE, 
key, key_len-1 TSRMLS_CC) == SUCCESS) {
+   zend_u_unmangle_property_name(ZEND_STR_TYPE, 
key, key_len-1, class_name, prop_name);
/* Not separating references */
(*value)-refcount++;
-   add_u_assoc_zval_ex(return_value, 
UG(unicode)?IS_UNICODE:IS_STRING, key, key_len, *value);
-   } else if (instanceof) {
-   if (class_name.s[0] == '*' ||
-   (Z_OBJCE_P(EG(This)) == Z_OBJCE_PP(obj) 
-   
UG(unicode)?!u_strcmp(Z_OBJCE_P(EG(This))-name.u, 
class_name.u):!strcmp(Z_OBJCE_P(EG(This))-name.s, class_name.s))) {
-   /* Not separating references */
-   (*value)-refcount++;
-   add_u_assoc_zval(return_value, 
UG(unicode)?IS_UNICODE:IS_STRING, prop_name, *value);
-   }
+   add_u_assoc_zval(return_value, ZEND_STR_TYPE, 
prop_name, *value);
}
}
zend_hash_move_forward_ex(properties, pos);
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_object_handlers.c?r1=1.187r2=1.188diff_format=u
Index: ZendEngine2/zend_object_handlers.c
diff -u ZendEngine2/zend_object_handlers.c:1.187 
ZendEngine2/zend_object_handlers.c:1.188
--- ZendEngine2/zend_object_handlers.c:1.187Sat Jul 21 05:27:07 2007
+++ ZendEngine2/zend_object_handlers.c  Tue Jul 24 11:40:07 2007
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: zend_object_handlers.c,v 1.187 2007/07/21 05:27:07 pollita Exp $ */
+/* $Id: zend_object_handlers.c,v 1.188 2007/07/24 11:40:07 dmitry Exp $ */
 
 #include zend.h
 #include zend_globals.h
@@ -164,7 +164,7 @@
case ZEND_ACC_PROTECTED:
return zend_check_protected(property_info-ce, 
EG(scope));
case ZEND_ACC_PRIVATE:
-   if (ce==EG(scope)  EG(scope)) {
+   if ((ce==EG(scope) || property_info-ce == EG(scope)) 
 EG(scope)) {
return 1;
} else {
return 0;
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/bug40757.phpt?r1=1.1r2=1.2diff_format=u
Index: ZendEngine2/tests/bug40757.phpt
diff -u /dev/null ZendEngine2/tests/bug40757.phpt:1.2
--- /dev/null   Tue Jul 24 11:40:07 2007
+++ ZendEngine2/tests/bug40757.phpt Tue Jul 24 11:40:07 2007
@@ -0,0 +1,28 @@
+--TEST--
+Bug #40757 (get_object_vars() get nothing in child class)
+--FILE--
+?php
+class Base {
+  private $p1='sadf';
+
+  function getFields($obj){
+

[PHP-CVS] cvs: php-src /main main.c

2007-07-24 Thread Jani Taskinen

janiTue Jul 24 13:29:40 2007 UTC

  Modified files:  
/php-src/main   main.c 
  Log:
  fix folding
  
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.738r2=1.739diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.738 php-src/main/main.c:1.739
--- php-src/main/main.c:1.738   Sat Jul 21 01:41:55 2007
+++ php-src/main/main.c Tue Jul 24 13:29:39 2007
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: main.c,v 1.738 2007/07/21 01:41:55 jani Exp $ */
+/* $Id: main.c,v 1.739 2007/07/24 13:29:39 jani Exp $ */
 
 /* {{{ includes
  */
@@ -210,7 +210,10 @@
zend_set_timeout(EG(timeout_seconds));
return SUCCESS;
 }
+/* }}} */
 
+/* {{{ PHP_INI_MH
+ */
 static ZEND_INI_MH(OnUpdateOutputEncoding)
 {
if (new_value) {

-- 
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/dom/tests bug28721.phpt bug28817.phpt bug32615.phpt bug34276.phpt bug35342.phpt bug37277.phpt bug37456.phpt bug38850.phpt bug38949.phpt bug40836.phpt bug41257.phpt

2007-07-24 Thread Ilia Alshanetsky

iliaa   Tue Jul 24 14:07:43 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/dom/tests  bug28721.phpt bug28817.phpt bug32615.phpt 
bug34276.phpt bug35342.phpt bug37277.phpt 
bug37456.phpt bug38850.phpt bug38949.phpt 
bug40836.phpt bug41257.phpt bug41374.phpt 
  Log:
  
  Test name formatting fixes
  
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/bug28721.phpt?r1=1.2r2=1.2.4.1diff_format=u
Index: php-src/ext/dom/tests/bug28721.phpt
diff -u php-src/ext/dom/tests/bug28721.phpt:1.2 
php-src/ext/dom/tests/bug28721.phpt:1.2.4.1
--- php-src/ext/dom/tests/bug28721.phpt:1.2 Thu Dec  2 16:33:36 2004
+++ php-src/ext/dom/tests/bug28721.phpt Tue Jul 24 14:07:42 2007
@@ -1,5 +1,5 @@
 --TEST--
-Bug # 28721: (appendChild() and insertBefore() unset DOMText)
+Bug #28721: (appendChild() and insertBefore() unset DOMText)
 --SKIPIF--
 ?php require_once('skipif.inc'); ?
 --FILE--
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/bug28817.phpt?r1=1.1r2=1.1.6.1diff_format=u
Index: php-src/ext/dom/tests/bug28817.phpt
diff -u php-src/ext/dom/tests/bug28817.phpt:1.1 
php-src/ext/dom/tests/bug28817.phpt:1.1.6.1
--- php-src/ext/dom/tests/bug28817.phpt:1.1 Sat Dec  4 11:40:10 2004
+++ php-src/ext/dom/tests/bug28817.phpt Tue Jul 24 14:07:42 2007
@@ -1,5 +1,5 @@
 --TEST--
-Bug # 28817: (properties in extended class)
+Bug #28817: (properties in extended class)
 --SKIPIF--
 ?php require_once('skipif.inc'); ?
 --FILE--
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/bug32615.phpt?r1=1.2r2=1.2.4.1diff_format=u
Index: php-src/ext/dom/tests/bug32615.phpt
diff -u php-src/ext/dom/tests/bug32615.phpt:1.2 
php-src/ext/dom/tests/bug32615.phpt:1.2.4.1
--- php-src/ext/dom/tests/bug32615.phpt:1.2 Mon Apr 18 23:07:50 2005
+++ php-src/ext/dom/tests/bug32615.phpt Tue Jul 24 14:07:42 2007
@@ -1,5 +1,5 @@
 --TEST--
-Bug # 32615: (Replacing and inserting Fragments)
+Bug #32615: (Replacing and inserting Fragments)
 --SKIPIF--
 ?php require_once('skipif.inc'); ?
 --FILE--
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/bug34276.phpt?r1=1.1.2.2.2.1r2=1.1.2.2.2.2diff_format=u
Index: php-src/ext/dom/tests/bug34276.phpt
diff -u php-src/ext/dom/tests/bug34276.phpt:1.1.2.2.2.1 
php-src/ext/dom/tests/bug34276.phpt:1.1.2.2.2.2
--- php-src/ext/dom/tests/bug34276.phpt:1.1.2.2.2.1 Tue Jun 27 00:09:43 2006
+++ php-src/ext/dom/tests/bug34276.phpt Tue Jul 24 14:07:42 2007
@@ -1,5 +1,5 @@
 --TEST--
-Bug # 34276: setAttributeNS and default namespace
+Bug #34276: setAttributeNS and default namespace
 --SKIPIF--
 ?php require_once('skipif.inc'); ?
 --FILE--
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/bug35342.phpt?r1=1.1.2.2.2.1r2=1.1.2.2.2.2diff_format=u
Index: php-src/ext/dom/tests/bug35342.phpt
diff -u php-src/ext/dom/tests/bug35342.phpt:1.1.2.2.2.1 
php-src/ext/dom/tests/bug35342.phpt:1.1.2.2.2.2
--- php-src/ext/dom/tests/bug35342.phpt:1.1.2.2.2.1 Tue Jun 27 00:09:43 2006
+++ php-src/ext/dom/tests/bug35342.phpt Tue Jul 24 14:07:42 2007
@@ -1,5 +1,5 @@
 --TEST--
-Bug # 35342: isset(DOMNodeList-length) returns false
+Bug #35342: isset(DOMNodeList-length) returns false
 --SKIPIF--
 ?php require_once('skipif.inc'); ?
 --FILE--
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/bug37277.phpt?r1=1.1.2.2r2=1.1.2.2.2.1diff_format=u
Index: php-src/ext/dom/tests/bug37277.phpt
diff -u php-src/ext/dom/tests/bug37277.phpt:1.1.2.2 
php-src/ext/dom/tests/bug37277.phpt:1.1.2.2.2.1
--- php-src/ext/dom/tests/bug37277.phpt:1.1.2.2 Wed May  3 08:43:04 2006
+++ php-src/ext/dom/tests/bug37277.phpt Tue Jul 24 14:07:42 2007
@@ -1,5 +1,5 @@
 --TEST--
-Bug # 37277 (cloning Dom Documents or Nodes does not work)
+Bug #37277 (cloning Dom Documents or Nodes does not work)
 --SKIPIF--
 ?php require_once('skipif.inc'); ?
 --FILE--
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/bug37456.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/dom/tests/bug37456.phpt
diff -u php-src/ext/dom/tests/bug37456.phpt:1.1.2.2 
php-src/ext/dom/tests/bug37456.phpt:1.1.2.3
--- php-src/ext/dom/tests/bug37456.phpt:1.1.2.2 Wed May 17 16:36:21 2006
+++ php-src/ext/dom/tests/bug37456.phpt Tue Jul 24 14:07:42 2007
@@ -1,5 +1,5 @@
 --TEST--
-Bug # 37456 (DOMElement-setAttribute() loops forever)
+Bug #37456 (DOMElement-setAttribute() loops forever)
 --SKIPIF--
 ?php require_once('skipif.inc'); ?
 --FILE--
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/bug38850.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/dom/tests/bug38850.phpt
diff -u php-src/ext/dom/tests/bug38850.phpt:1.1.2.1 
php-src/ext/dom/tests/bug38850.phpt:1.1.2.2
--- php-src/ext/dom/tests/bug38850.phpt:1.1.2.1 Sat Sep 16 13:54:52 2006
+++ php-src/ext/dom/tests/bug38850.phpt Tue Jul 24 14:07:42 2007
@@ -1,5 +1,5 @@
 --TEST--
-Bug # 38850 (lookupNamespaceURI does not return default namespace)
+Bug #38850 (lookupNamespaceURI does not return default namespace)

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended /main main.c php_globals.h

2007-07-24 Thread Jani Taskinen

janiTue Jul 24 14:18:47 2007 UTC

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
/php-src/main   main.c php_globals.h 
  Log:
  - Changed display_errors php.ini option to accept stderr as value which
makes the error messages to be outputted to STDERR instead of STDOUT with
CGI and CLI SAPIs.
  
  
http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.266r2=1.267diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.266 php-src/php.ini-dist:1.267
--- php-src/php.ini-dist:1.266  Thu Jun 21 09:01:57 2007
+++ php-src/php.ini-distTue Jul 24 14:18:47 2007
@@ -256,6 +256,16 @@
 ; instead (see below).  Keeping display_errors enabled on a production web site
 ; may reveal security information to end users, such as file paths on your Web
 ; server, your database schema or other information.
+;
+; possible values for display_errors:
+;
+; Off- Do not display any errors
+; stderr - Display errors to STDERR (affects only CGI/CLI binaries!)
+;
+;display_errors = stderr
+;
+; stdout (On) - Display errors to STDOUT
+;
 display_errors = On
 
 ; Even when display_errors is on, errors that occur during PHP's startup
http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.216r2=1.217diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.216 php-src/php.ini-recommended:1.217
--- php-src/php.ini-recommended:1.216   Thu Jun 21 09:01:57 2007
+++ php-src/php.ini-recommended Tue Jul 24 14:18:47 2007
@@ -292,6 +292,18 @@
 ; instead (see below).  Keeping display_errors enabled on a production web site
 ; may reveal security information to end users, such as file paths on your Web
 ; server, your database schema or other information.
+;
+; possible values for display_errors:
+;
+; Off  - Do not display any errors 
+; stderr   - Display errors to STDERR (affects only CGI/CLI binaries!)   
+; On or stdout - Display errors to STDOUT (default)
+;  
+; To output errors to STDERR with CGI/CLI:  
+;display_errors = stderr
+;
+; Default
+;
 display_errors = Off
 
 ; Even when display_errors is on, errors that occur during PHP's startup
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.739r2=1.740diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.739 php-src/main/main.c:1.740
--- php-src/main/main.c:1.739   Tue Jul 24 13:29:39 2007
+++ php-src/main/main.c Tue Jul 24 14:18:47 2007
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: main.c,v 1.739 2007/07/24 13:29:39 jani Exp $ */
+/* $Id: main.c,v 1.740 2007/07/24 14:18:47 jani Exp $ */
 
 /* {{{ includes
  */
@@ -332,6 +332,89 @@
 }
 /* }}} */
 
+/* {{{ php_get_display_errors_mode() helper function
+ */
+static int php_get_display_errors_mode(char *value, int value_length)
+{
+   int mode;
+
+   if (value_length == 2  !strcasecmp(on, value)) {
+   mode = PHP_DISPLAY_ERRORS_STDOUT;
+   } else if (value_length == 3  !strcasecmp(yes, value)) {
+   mode = PHP_DISPLAY_ERRORS_STDOUT;
+   } else if (value_length == 4  !strcasecmp(true, value)) {
+   mode = PHP_DISPLAY_ERRORS_STDOUT;
+   } else if (value_length == 6  !strcasecmp(value, stderr)) {
+   mode = PHP_DISPLAY_ERRORS_STDERR;
+   } else if (value_length == 6  !strcasecmp(value, stdout)) {
+   mode = PHP_DISPLAY_ERRORS_STDOUT;
+   } else {
+   mode = atoi(value);
+   if (mode  mode != PHP_DISPLAY_ERRORS_STDOUT  mode != 
PHP_DISPLAY_ERRORS_STDERR) {
+   mode = PHP_DISPLAY_ERRORS_STDOUT;
+   }
+   }
+   return mode;
+}
+/* }}} */
+
+/* {{{ PHP_INI_MH
+ */
+static PHP_INI_MH(OnUpdateDisplayErrors)
+{
+   PG(display_errors) = (zend_bool) php_get_display_errors_mode(new_value, 
new_value_length);
+
+   return SUCCESS;
+}
+/* }}} */
+
+/* {{{ PHP_INI_DISP
+ */
+static PHP_INI_DISP(display_errors_mode)
+{
+   int mode, tmp_value_length, cgi_or_cli;
+   char *tmp_value;
+
+   if (type == ZEND_INI_DISPLAY_ORIG  ini_entry-modified) {
+   tmp_value = (ini_entry-orig_value ? ini_entry-orig_value : 
NULL );
+   tmp_value_length = ini_entry-orig_value_length;
+   } else if (ini_entry-value) {
+   tmp_value = ini_entry-value;
+   tmp_value_length = ini_entry-value_length;
+   } else {
+   tmp_value = NULL;
+   tmp_value_length = 0;
+   }
+
+   mode = php_get_display_errors_mode(tmp_value, tmp_value_length);
+
+   /* Display 'On' for other SAPIs instead of STDOUT or STDERR */
+   cgi_or_cli = (!strcmp(sapi_module.name, cli) || 
!strcmp(sapi_module.name, cgi));
+
+   switch (mode) {
+   case PHP_DISPLAY_ERRORS_STDERR:
+   if (cgi_or_cli ) {
+   PUTS(STDERR);
+   } else {

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /main/streams xp_socket.c

2007-07-24 Thread Dmitry Stogov

dmitry  Tue Jul 24 14:24:44 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
/php-src/main/streams   xp_socket.c 
  Log:
  Fixed bug #41984 (Hangs on large SoapClient requests)
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.852r2=1.2027.2.547.2.853diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.852 php-src/NEWS:1.2027.2.547.2.853
--- php-src/NEWS:1.2027.2.547.2.852 Tue Jul 24 14:21:36 2007
+++ php-src/NEWSTue Jul 24 14:24:44 2007
@@ -72,6 +72,7 @@
 - Fixed bug #42015 (ldap_rename(): server error DSA is unwilling to perform).
   (bob at mroczka dot com, Jani)
 - Fixed bug #41989 (move_uploaded_file()  relative path in ZTS mode). (Tony)
+- Fixed bug #41984 (Hangs on large SoapClient requests). (Dmitry)
 - Fixed bug #41983 (Error Fetching http headers terminated by '\n'). (Dmitry)
 - Fixed bug #41964 (strtotime returns a timestamp for non-time string of
   pattern '(A|a) .+'). (Derick)
http://cvs.php.net/viewvc.cgi/php-src/main/streams/xp_socket.c?r1=1.33.2.2.2.5r2=1.33.2.2.2.6diff_format=u
Index: php-src/main/streams/xp_socket.c
diff -u php-src/main/streams/xp_socket.c:1.33.2.2.2.5 
php-src/main/streams/xp_socket.c:1.33.2.2.2.6
--- php-src/main/streams/xp_socket.c:1.33.2.2.2.5   Tue Jul 17 13:28:44 2007
+++ php-src/main/streams/xp_socket.cTue Jul 24 14:24:44 2007
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: xp_socket.c,v 1.33.2.2.2.5 2007/07/17 13:28:44 jani Exp $ */
+/* $Id: xp_socket.c,v 1.33.2.2.2.6 2007/07/24 14:24:44 dmitry Exp $ */
 
 #include php.h
 #include ext/standard/file.h
@@ -31,6 +31,10 @@
 #include sys/un.h
 #endif
 
+#ifndef MSG_DONTWAIT
+# define MSG_DONTWAIT 0
+#endif
+
 php_stream_ops php_stream_generic_socket_ops;
 PHPAPI php_stream_ops php_stream_socket_ops;
 php_stream_ops php_stream_udp_socket_ops;
@@ -59,7 +63,7 @@
ptimeout = sock-timeout;
 
 retry:
-   didwrite = send(sock-socket, buf, count, 0);
+   didwrite = send(sock-socket, buf, count, (sock-is_blocked  
ptimeout) ? MSG_DONTWAIT : 0);
 
if (didwrite = 0) {
long err = php_socket_errno();
@@ -148,7 +152,7 @@
return 0;
}
 
-   nr_bytes = recv(sock-socket, buf, count, 0);
+   nr_bytes = recv(sock-socket, buf, count, (sock-is_blocked  
sock-timeout.tv_sec != -1) ? MSG_DONTWAIT : 0);
 
stream-eof = (nr_bytes == 0 || (nr_bytes == -1  php_socket_errno() 
!= EWOULDBLOCK));
 

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

[PHP-CVS] cvs: php-src /ext/mysqli config9.m4 /ext/mysqli/mysqlnd portability.h

2007-07-24 Thread Andrey Hristov

andrey  Tue Jul 24 19:20:28 2007 UTC

  Modified files:  
/php-src/ext/mysqli config9.m4 
/php-src/ext/mysqli/mysqlnd portability.h 
  Log:
  Don't use AC_CHECK_TYPES, as autoconf 2.13 is buggy, use an workaround.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/config9.m4?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/mysqli/config9.m4
diff -u php-src/ext/mysqli/config9.m4:1.1 php-src/ext/mysqli/config9.m4:1.2
--- php-src/ext/mysqli/config9.m4:1.1   Tue Jul 24 16:13:25 2007
+++ php-src/ext/mysqli/config9.m4   Tue Jul 24 19:20:28 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config9.m4,v 1.1 2007/07/24 16:13:25 andrey Exp $
+dnl $Id: config9.m4,v 1.2 2007/07/24 19:20:28 andrey Exp $
 dnl config.m4 for extension mysqli
 
 PHP_ARG_WITH(mysqli, for MySQLi support,
@@ -81,13 +81,29 @@
 dnl MySQLnd build
 dnl If some extension uses mysqlnd it will get compiled in PHP whether MYSQLi 
is enabled or not.
 if test $PHP_MYSQLND_ENABLED = yes; then
-  AC_CHECK_TYPES([int8, uint8, int16, uint16, int32, uint32, uchar],[],[], [
-  #include sys/types.h
-  ])
-
-  AC_CHECK_TYPES([int8_t, uint8_t, int16_t, uint16_t, int32_t, uint32_t, 
int64_t, uint64_t],[],[], [
-  #include stdint.h
-  ])
+dnl  AC_CHECK_TYPES([int8, uint8, int16, uint16, int32, uint32, uchar],[],[], [
+dnl  #include sys/types.h
+dnl  ])
+dnl  AC_CHECK_TYPES([int8_t, uint8_t, int16_t, uint16_t, int32_t, uint32_t, 
int64_t, uint64_t],[],[], [
+dnl  #include stdint.h
+dnl  ])
+  PHP_CHECK_SIZEOF(int8, 0)
+  PHP_CHECK_SIZEOF(uint8, 0)
+  PHP_CHECK_SIZEOF(int16, 0)
+  PHP_CHECK_SIZEOF(uint16, 0)
+  PHP_CHECK_SIZEOF(int32, 0)
+  PHP_CHECK_SIZEOF(uint32, 0)
+  PHP_CHECK_SIZEOF(int64, 0)
+  PHP_CHECK_SIZEOF(uint64, 0)
+  PHP_CHECK_SIZEOF(int8_t, 0)
+  PHP_CHECK_SIZEOF(uint8_t, 0)
+  PHP_CHECK_SIZEOF(int16_t, 0)
+  PHP_CHECK_SIZEOF(uint16_t, 0)
+  PHP_CHECK_SIZEOF(int32_t, 0)
+  PHP_CHECK_SIZEOF(uint32_t, 0)
+  PHP_CHECK_SIZEOF(int64_t, 0)
+  PHP_CHECK_SIZEOF(uint64_t, 0)
+  PHP_CHECK_SIZEOF(ulong, 0)
 
   mysqlnd_sources=mysqlnd.c mysqlnd_charset.c mysqlnd_wireprotocol.c \
mysqlnd_ps.c mysqlnd_loaddata.c mysqlnd_palloc.c \
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqlnd/portability.h?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/mysqli/mysqlnd/portability.h
diff -u php-src/ext/mysqli/mysqlnd/portability.h:1.1 
php-src/ext/mysqli/mysqlnd/portability.h:1.2
--- php-src/ext/mysqli/mysqlnd/portability.h:1.1Tue Jul 24 16:13:26 2007
+++ php-src/ext/mysqli/mysqlnd/portability.hTue Jul 24 19:20:28 2007
@@ -59,62 +59,62 @@
 
 /* Typdefs for easyier portability */
 
-#ifndef HAVE_INT8
-#ifndef HAVE_INT8_T
+#if (SIZEOF_INT8 == 0)
+#if (SIZEOF_INT8_T == 0)
 typedef signed char int8;  /* Signed integer = 8bits 
*/
 #else
 typedef int8_t int8;   /* Signed integer = 8bits 
*/
 #endif
 #endif
 
-#ifndef HAVE_UINT8
-#ifndef HAVE_UINT8_T
+#if (SIZEOF_UINT8 == 0)
+#if (SIZEOF_UINT8_T == 0)
 typedef unsigned char uint8;   /* Unsigned integer = 8bits */
 #else
 typedef uint8_t uint8; /* Signed integer = 8bits 
*/
 #endif
 #endif
 
-#ifndef HAVE_INT16
-#ifndef HAVE_INT16_T
+#if (SIZEOF_INT16 == 0)
+#if (SIZEOF_INT16_T == 0)
 typedef signed short int16;/* Signed integer = 16 bits */
 #else
 typedef int16_t int16; /* Signed integer = 16 bits */
 #endif
 #endif
 
-#ifndef HAVE_UINT16
-#ifndef HAVE_UINT16_T
+#if (SIZEOF_UINT16 == 0)
+#if (SIZEOF_UINT16_T == 0)
 typedef unsigned short uint16; /* Signed integer = 16 bits */
 #else
 typedef uint16_t uint16;   /* Signed integer = 16 bits */
 #endif
 #endif
 
-#ifndef HAVE_UCHAR
+#if (SIZEOF_UCHAR == 0)
 typedef unsigned char uchar;   /* Short for unsigned char */
 #endif
 
 
-#if defined(HAVE_INT32_T)  defined (HAVE_UINT32_T)
+#if (SIZEOF_INT32_T != 0)  (SIZEOF_UINT32_T != 0)
 typedef int32_t int32;
 typedef uint32_t uint32;
 
 #elif SIZEOF_INT == 4
 
-#ifndef HAVE_INT32
+#ifndef (SIZEOF_INT32 == 0)
 typedef signed int int32;
 #endif
-#ifndef HAVE_UINT32
+#ifndef (SIZEOF_UINT32 == 0)
 typedef unsigned int uint32;
 #endif
 
 #elif SIZEOF_LONG == 4
 
-#ifndef HAVE_INT32
+#ifndef (SIZEOF_INT32 == 0)
 typedef signed long int32;
 #endif
-#ifndef HAVE_UINT32
+#ifndef (SIZEOF_UINT32 == 0)
 typedef unsigned long uint32;
 #endif
 
@@ -122,7 +122,7 @@
 error Neither int or long is of 4 bytes width
 #endif
 
-#if !defined(HAVE_ULONG)  !defined(__USE_MISC)  !defined(ulong)
+#if (SIZEOF_ULONG == 0)  !defined(__USE_MISC)  !defined(ulong)
 typedef unsigned longulong;/* Short for unsigned long */
 #endif
 #ifndef longlong_defined
@@ -487,14 +487,14 @@
 #ifndef L64
 #define L64(x) x##LL
 #endif
-#ifndef HAVE_UINT64_T
+#if (SIZEOF_UINT64_T == 0)
 typedef unsigned long long my_uint64;
 typedef unsigned long long mynd_ulonglong;
 #else
 typedef uint64_t my_uint64;
 typedef uint64_t mynd_ulonglong;
 #endif
-#ifndef

[PHP-CVS] cvs: php-src /ext/mysql .cvsignore /ext/mysqli .cvsignore

2007-07-24 Thread Andrey Hristov

andrey  Tue Jul 24 19:23:35 2007 UTC

  Modified files:  
/php-src/ext/mysql  .cvsignore 
/php-src/ext/mysqli .cvsignore 
  Log:
  ignor php_have_mysqlnd.h
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/.cvsignore?r1=1.11r2=1.12diff_format=u
Index: php-src/ext/mysql/.cvsignore
diff -u php-src/ext/mysql/.cvsignore:1.11 php-src/ext/mysql/.cvsignore:1.12
--- php-src/ext/mysql/.cvsignore:1.11   Sun Oct 10 16:09:56 2004
+++ php-src/ext/mysql/.cvsignoreTue Jul 24 19:23:35 2007
@@ -48,3 +48,4 @@
 weztest.sqlite
 *.gcda
 *.gcno
+php_have_mysqlnd.h
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/.cvsignore?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/mysqli/.cvsignore
diff -u php-src/ext/mysqli/.cvsignore:1.3 php-src/ext/mysqli/.cvsignore:1.4
--- php-src/ext/mysqli/.cvsignore:1.3   Sun Oct 10 16:09:56 2004
+++ php-src/ext/mysqli/.cvsignore   Tue Jul 24 19:23:35 2007
@@ -48,3 +48,4 @@
 scan_makefile_in.awk
 *.gcda
 *.gcno
+php_have_mysqlnd.h
\ 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: php-src /ext/standard/tests/general_functions debug_zval_dump_o.phpt

2007-07-24 Thread Dmitry Stogov

dmitry  Tue Jul 24 20:03:30 2007 UTC

  Modified files:  
/php-src/ext/standard/tests/general_functions   
debug_zval_dump_o.phpt 
  Log:
  Fixed test
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/debug_zval_dump_o.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/standard/tests/general_functions/debug_zval_dump_o.phpt
diff -u php-src/ext/standard/tests/general_functions/debug_zval_dump_o.phpt:1.3 
php-src/ext/standard/tests/general_functions/debug_zval_dump_o.phpt:1.4
--- php-src/ext/standard/tests/general_functions/debug_zval_dump_o.phpt:1.3 
Tue May 29 12:26:59 2007
+++ php-src/ext/standard/tests/general_functions/debug_zval_dump_o.phpt Tue Jul 
24 20:03:30 2007
@@ -116,7 +116,7 @@
 --EXPECTF--
 *** Testing debug_zval_dump() on objects ***
 -- Iteration 1 --
-object(object_class)#%d (6) refcount(4){
+object(object_class)#%d (6) refcount(5){
   [value1]=
   long(5) refcount(1)
   [value2:object_class:private]=
@@ -124,7 +124,7 @@
   [value3:protected]=
   long(20) refcount(5)
   [value4]=
-  long(30) refcount(6)
+  long(30) refcount(7)
   [array_var]=
   array(2) refcount(5){
 [key1]=
@@ -133,7 +133,7 @@
 long(3) refcount(1)
   }
   [object_class1]=
-  object(object_class)#%d (6) refcount(4){
+  object(object_class)#%d (6) refcount(5){
 [value1]=
 long(5) refcount(1)
 [value2:object_class:private]=
@@ -141,7 +141,7 @@
 [value3:protected]=
 long(20) refcount(5)
 [value4]=
-long(30) refcount(6)
+long(30) refcount(7)
 [array_var]=
 array(2) refcount(5){
   [key1]=
@@ -154,10 +154,10 @@
   }
 }
 -- Iteration 2 --
-object(no_member_class)#%d (0) refcount(3){
+object(no_member_class)#%d (0) refcount(4){
 }
 -- Iteration 3 --
-object(contains_object_class)#%d (9) refcount(3){
+object(contains_object_class)#%d (9) refcount(4){
   [p]=
   long(30) refcount(2)
   [p1:protected]=
@@ -165,7 +165,7 @@
   [p2:contains_object_class:private]=
   long(50) refcount(2)
   [class_object1]=
-  object(object_class)#%d (6) refcount(5){
+  object(object_class)#%d (6) refcount(7){
 [value1]=
 long(5) refcount(1)
 [value2:object_class:private]=
@@ -173,7 +173,7 @@
 [value3:protected]=
 long(20) refcount(5)
 [value4]=
-long(30) refcount(6)
+long(30) refcount(7)
 [array_var]=
 array(2) refcount(5){
   [key1]=
@@ -182,7 +182,7 @@
   long(3) refcount(1)
 }
 [object_class1]=
-object(object_class)#%d (6) refcount(5){
+object(object_class)#%d (6) refcount(7){
   [value1]=
   long(5) refcount(1)
   [value2:object_class:private]=
@@ -190,7 +190,7 @@
   [value3:protected]=
   long(20) refcount(5)
   [value4]=
-  long(30) refcount(6)
+  long(30) refcount(7)
   [array_var]=
   array(2) refcount(5){
 [key1]=
@@ -203,7 +203,7 @@
 }
   }
   [class_object2]=
-  object(object_class)#%d (6) refcount(5){
+  object(object_class)#%d (6) refcount(7){
 [value1]=
 long(5) refcount(1)
 [value2:object_class:private]=
@@ -211,7 +211,7 @@
 [value3:protected]=
 long(20) refcount(5)
 [value4]=
-long(30) refcount(6)
+long(30) refcount(7)
 [array_var]=
 array(2) refcount(5){
   [key1]=
@@ -220,7 +220,7 @@
   long(3) refcount(1)
 }
 [object_class1]=
-object(object_class)#%d (6) refcount(5){
+object(object_class)#%d (6) refcount(7){
   [value1]=
   long(5) refcount(1)
   [value2:object_class:private]=
@@ -228,7 +228,7 @@
   [value3:protected]=
   long(20) refcount(5)
   [value4]=
-  long(30) refcount(6)
+  long(30) refcount(7)
   [array_var]=
   array(2) refcount(5){
 [key1]=
@@ -241,7 +241,7 @@
 }
   }
   [class_object3:contains_object_class:private]=
-  object(object_class)#%d (6) refcount(5){
+  object(object_class)#%d (6) refcount(7){
 [value1]=
 long(5) refcount(1)
 [value2:object_class:private]=
@@ -249,7 +249,7 @@
 [value3:protected]=
 long(20) refcount(5)
 [value4]=
-long(30) refcount(6)
+long(30) refcount(7)
 [array_var]=
 array(2) refcount(5){
   [key1]=
@@ -258,7 +258,7 @@
   long(3) refcount(1)
 }
 [object_class1]=
-object(object_class)#%d (6) refcount(5){
+object(object_class)#%d (6) refcount(7){
   [value1]=
   long(5) refcount(1)
   [value2:object_class:private]=
@@ -266,7 +266,7 @@
   [value3:protected]=
   long(20) refcount(5)
   [value4]=
-  long(30) refcount(6)
+  long(30) refcount(7)
   [array_var]=
   array(2) refcount(5){
 [key1]=
@@ -279,7 +279,7 @@
 }
   }
   [class_object4:protected]=
-  object(object_class)#%d (6) refcount(5){
+  object(object_class)#%d (6) refcount(7){
 [value1]=
 long(5) refcount(1)
 [value2:object_class:private]=
@@ -287,7 +287,7 @@
 [value3:protected]=
 long(20) refcount(5)

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/general_functions debug_zval_dump_o.phpt

2007-07-24 Thread Dmitry Stogov

dmitry  Tue Jul 24 20:08:33 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard/tests/general_functions   
debug_zval_dump_o.phpt 
  Log:
  Fixed test
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/debug_zval_dump_o.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/standard/tests/general_functions/debug_zval_dump_o.phpt
diff -u 
php-src/ext/standard/tests/general_functions/debug_zval_dump_o.phpt:1.1.2.1 
php-src/ext/standard/tests/general_functions/debug_zval_dump_o.phpt:1.1.2.2
--- php-src/ext/standard/tests/general_functions/debug_zval_dump_o.phpt:1.1.2.1 
Sat May 12 10:28:00 2007
+++ php-src/ext/standard/tests/general_functions/debug_zval_dump_o.phpt Tue Jul 
24 20:08:33 2007
@@ -116,7 +116,7 @@
 --EXPECTF--
 *** Testing debug_zval_dump() on objects ***
 -- Iteration 1 --
-object(object_class)#%d (6) refcount(4){
+object(object_class)#%d (6) refcount(5){
   [value1]=
   long(5) refcount(1)
   [value2:private]=
@@ -124,7 +124,7 @@
   [value3:protected]=
   long(20) refcount(5)
   [value4]=
-  long(30) refcount(6)
+  long(30) refcount(7)
   [array_var]=
   array(2) refcount(5){
 [key1]=
@@ -133,7 +133,7 @@
 long(3) refcount(1)
   }
   [object_class1]=
-  object(object_class)#%d (6) refcount(4){
+  object(object_class)#%d (6) refcount(5){
 [value1]=
 long(5) refcount(1)
 [value2:private]=
@@ -141,7 +141,7 @@
 [value3:protected]=
 long(20) refcount(5)
 [value4]=
-long(30) refcount(6)
+long(30) refcount(7)
 [array_var]=
 array(2) refcount(5){
   [key1]=
@@ -154,10 +154,10 @@
   }
 }
 -- Iteration 2 --
-object(no_member_class)#%d (0) refcount(3){
+object(no_member_class)#%d (0) refcount(4){
 }
 -- Iteration 3 --
-object(contains_object_class)#%d (9) refcount(3){
+object(contains_object_class)#%d (9) refcount(4){
   [p]=
   long(30) refcount(2)
   [p1:protected]=
@@ -165,7 +165,7 @@
   [p2:private]=
   long(50) refcount(2)
   [class_object1]=
-  object(object_class)#%d (6) refcount(5){
+  object(object_class)#%d (6) refcount(7){
 [value1]=
 long(5) refcount(1)
 [value2:private]=
@@ -173,7 +173,7 @@
 [value3:protected]=
 long(20) refcount(5)
 [value4]=
-long(30) refcount(6)
+long(30) refcount(7)
 [array_var]=
 array(2) refcount(5){
   [key1]=
@@ -182,7 +182,7 @@
   long(3) refcount(1)
 }
 [object_class1]=
-object(object_class)#%d (6) refcount(5){
+object(object_class)#%d (6) refcount(7){
   [value1]=
   long(5) refcount(1)
   [value2:private]=
@@ -190,7 +190,7 @@
   [value3:protected]=
   long(20) refcount(5)
   [value4]=
-  long(30) refcount(6)
+  long(30) refcount(7)
   [array_var]=
   array(2) refcount(5){
 [key1]=
@@ -203,7 +203,7 @@
 }
   }
   [class_object2]=
-  object(object_class)#%d (6) refcount(5){
+  object(object_class)#%d (6) refcount(7){
 [value1]=
 long(5) refcount(1)
 [value2:private]=
@@ -211,7 +211,7 @@
 [value3:protected]=
 long(20) refcount(5)
 [value4]=
-long(30) refcount(6)
+long(30) refcount(7)
 [array_var]=
 array(2) refcount(5){
   [key1]=
@@ -220,7 +220,7 @@
   long(3) refcount(1)
 }
 [object_class1]=
-object(object_class)#%d (6) refcount(5){
+object(object_class)#%d (6) refcount(7){
   [value1]=
   long(5) refcount(1)
   [value2:private]=
@@ -228,7 +228,7 @@
   [value3:protected]=
   long(20) refcount(5)
   [value4]=
-  long(30) refcount(6)
+  long(30) refcount(7)
   [array_var]=
   array(2) refcount(5){
 [key1]=
@@ -241,7 +241,7 @@
 }
   }
   [class_object3:private]=
-  object(object_class)#%d (6) refcount(5){
+  object(object_class)#%d (6) refcount(7){
 [value1]=
 long(5) refcount(1)
 [value2:private]=
@@ -249,7 +249,7 @@
 [value3:protected]=
 long(20) refcount(5)
 [value4]=
-long(30) refcount(6)
+long(30) refcount(7)
 [array_var]=
 array(2) refcount(5){
   [key1]=
@@ -258,7 +258,7 @@
   long(3) refcount(1)
 }
 [object_class1]=
-object(object_class)#%d (6) refcount(5){
+object(object_class)#%d (6) refcount(7){
   [value1]=
   long(5) refcount(1)
   [value2:private]=
@@ -266,7 +266,7 @@
   [value3:protected]=
   long(20) refcount(5)
   [value4]=
-  long(30) refcount(6)
+  long(30) refcount(7)
   [array_var]=
   array(2) refcount(5){
 [key1]=
@@ -279,7 +279,7 @@
 }
   }
   [class_object4:protected]=
-  object(object_class)#%d (6) refcount(5){
+  object(object_class)#%d (6) refcount(7){
 [value1]=
 long(5) refcount(1)
 [value2:private]=
@@ -287,7 +287,7 @@
 [value3:protected]=
 long(20) refcount(5)
 [value4]=
-long(30) refcount(6)
+long(30) refcount(7)
 [array_var]=
 array(2) refcount(5){
   [key1]=
@@ -296,7

[PHP-CVS] cvs: php-src /ext/mysqli config9.m4

2007-07-24 Thread Antony Dovgal

tony2001Tue Jul 24 20:11:13 2007 UTC

  Modified files:  
/php-src/ext/mysqli config9.m4 
  Log:
  namespace protection
  GD uses the same variable, too.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/config9.m4?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/mysqli/config9.m4
diff -u php-src/ext/mysqli/config9.m4:1.2 php-src/ext/mysqli/config9.m4:1.3
--- php-src/ext/mysqli/config9.m4:1.2   Tue Jul 24 19:20:28 2007
+++ php-src/ext/mysqli/config9.m4   Tue Jul 24 20:11:13 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config9.m4,v 1.2 2007/07/24 19:20:28 andrey Exp $
+dnl $Id: config9.m4,v 1.3 2007/07/24 20:11:13 tony2001 Exp $
 dnl config.m4 for extension mysqli
 
 PHP_ARG_WITH(mysqli, for MySQLi support,
@@ -26,7 +26,7 @@
 AC_DEFINE(HAVE_EMBEDDED_MYSQLI, 1, [embedded MySQL support enabled])
 MYSQL_LIB_CFG='--libmysqld-libs'
 dnl mysqlnd doesn't support embedded, so we have to add some extra stuff
-extra_sources=mysqli_embedded.c
+mysqli_extra_sources=mysqli_embedded.c
   elif test $enable_maintainer_zts = yes; then
 MYSQL_LIB_CFG='--libs_r'
 MYSQL_LIB_NAME='mysqlclient_r'
@@ -60,14 +60,14 @@
 $MYSQLI_LIBLINE
   ])
 
-  extra_sources=$extra_sources mysqli_repl.c
+  mysqli_extra_sources=$mysqli_extra_sources mysqli_repl.c
 fi
 
 dnl Build extension
-if test -n $extra_sources || test $PHP_MYSQLI != no; then
+if test -n $mysqli_extra_sources || test $PHP_MYSQLI != no; then
   mysqli_sources=mysqli.c mysqli_api.c mysqli_prop.c mysqli_nonapi.c \
   mysqli_fe.c mysqli_report.c mysqli_driver.c mysqli_warning.c 
\
-  mysqli_exception.c $extra_sources
+  mysqli_exception.c $mysqli_extra_sources
   PHP_NEW_EXTENSION(mysqli, $mysqli_sources, $ext_shared)
   PHP_SUBST(MYSQLI_SHARED_LIBADD)
 

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

[PHP-CVS] cvs: php-src /main main.c

2007-07-24 Thread Antony Dovgal

tony2001Tue Jul 24 20:14:03 2007 UTC

  Modified files:  
/php-src/main   main.c 
  Log:
  fix ZTS build
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.740r2=1.741diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.740 php-src/main/main.c:1.741
--- php-src/main/main.c:1.740   Tue Jul 24 14:18:47 2007
+++ php-src/main/main.c Tue Jul 24 20:14:03 2007
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: main.c,v 1.740 2007/07/24 14:18:47 jani Exp $ */
+/* $Id: main.c,v 1.741 2007/07/24 20:14:03 tony2001 Exp $ */
 
 /* {{{ includes
  */
@@ -374,6 +374,7 @@
 {
int mode, tmp_value_length, cgi_or_cli;
char *tmp_value;
+   TSRMLS_FETCH();
 
if (type == ZEND_INI_DISPLAY_ORIG  ini_entry-modified) {
tmp_value = (ini_entry-orig_value ? ini_entry-orig_value : 
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) /main main.c

2007-07-24 Thread Antony Dovgal

tony2001Tue Jul 24 20:32:33 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/main   main.c 
  Log:
  fix ZTS build
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.48r2=1.640.2.23.2.49diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23.2.48 php-src/main/main.c:1.640.2.23.2.49
--- php-src/main/main.c:1.640.2.23.2.48 Tue Jul 24 14:21:36 2007
+++ php-src/main/main.c Tue Jul 24 20:32:32 2007
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: main.c,v 1.640.2.23.2.48 2007/07/24 14:21:36 jani Exp $ */
+/* $Id: main.c,v 1.640.2.23.2.49 2007/07/24 20:32:32 tony2001 Exp $ */
 
 /* {{{ includes
  */
@@ -255,6 +255,7 @@
 {
int mode, tmp_value_length, cgi_or_cli;
char *tmp_value;
+   TSRMLS_FETCH();
 
if (type == ZEND_INI_DISPLAY_ORIG  ini_entry-modified) {
tmp_value = (ini_entry-orig_value ? ini_entry-orig_value : 
NULL );

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

[PHP-CVS] cvs: php-src /ext/pcre php_pcre.c

2007-07-24 Thread Antony Dovgal

tony2001Tue Jul 24 22:34:17 2007 UTC

  Modified files:  
/php-src/ext/pcre   php_pcre.c 
  Log:
  add PCRE_VERSION constant to ext/pcre
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/php_pcre.c?r1=1.216r2=1.217diff_format=u
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.216 php-src/ext/pcre/php_pcre.c:1.217
--- php-src/ext/pcre/php_pcre.c:1.216   Tue Jul 10 09:57:23 2007
+++ php-src/ext/pcre/php_pcre.c Tue Jul 24 22:34:17 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_pcre.c,v 1.216 2007/07/10 09:57:23 dmitry Exp $ */
+/* $Id: php_pcre.c,v 1.217 2007/07/24 22:34:17 tony2001 Exp $ */
 
 /*  TODO
  *  php_pcre_replace_impl():
@@ -66,7 +66,7 @@
int cp_offset;
 } offset_map_t;
 
-ZEND_DECLARE_MODULE_GLOBALS(pcre);
+ZEND_DECLARE_MODULE_GLOBALS(pcre)
 
 
 static void pcre_handle_exec_error(int pcre_code TSRMLS_DC) /* {{{ */
@@ -161,6 +161,7 @@
REGISTER_LONG_CONSTANT(PREG_BACKTRACK_LIMIT_ERROR, 
PHP_PCRE_BACKTRACK_LIMIT_ERROR, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(PREG_RECURSION_LIMIT_ERROR, 
PHP_PCRE_RECURSION_LIMIT_ERROR, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(PREG_BAD_UTF8_ERROR, PHP_PCRE_BAD_UTF8_ERROR, 
CONST_CS | CONST_PERSISTENT);
+   REGISTER_STRING_CONSTANT(PCRE_VERSION, (char *)pcre_version(), 
CONST_CS | CONST_PERSISTENT);
 
return SUCCESS;
 }

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

[PHP-CVS] cvs: php-src /ext/json json.c /ext/json/tests bug42090.phpt

2007-07-24 Thread Hannes Magnusson

bjori   Tue Jul 24 22:54:26 2007 UTC

  Added files: 
/php-src/ext/json/tests bug42090.phpt 

  Modified files:  
/php-src/ext/json   json.c 
  Log:
  Fixed bug#42090 (json_decode causes segmentation fault)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/json/json.c?r1=1.27r2=1.28diff_format=u
Index: php-src/ext/json/json.c
diff -u php-src/ext/json/json.c:1.27 php-src/ext/json/json.c:1.28
--- php-src/ext/json/json.c:1.27Wed Jun 13 17:10:06 2007
+++ php-src/ext/json/json.c Tue Jul 24 22:54:26 2007
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: json.c,v 1.27 2007/06/13 17:10:06 iliaa Exp $ */
+/* $Id: json.c,v 1.28 2007/07/24 22:54:26 bjori Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -485,7 +485,7 @@
RETURN_DOUBLE(d);
}
}
-   if (*str.s == '' || str.s[str_len] == '') {
+   if (str_len  1  *str.s == ''  str.s[str_len-1] == '') {
RETURN_STRINGL(str.s+1, str_len-2, 1);
} else {
RETURN_STRINGL(str.s, str_len, 1);
@@ -514,7 +514,7 @@
RETURN_DOUBLE(d);
}
}
-   if (*str.u == 0x22 /*''*/ || str.u[str_len] == 0x22 /*''*/) {
+   if (str_len  1  *str.u == 0x22 /*''*/  str.u[str_len-1] 
== 0x22 /*''*/) {
RETURN_UNICODEL(str.u+1, str_len-2, 1);
} else {
RETURN_UNICODEL(str.u, str_len, 1);

http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/bug42090.phpt?view=markuprev=1.1
Index: php-src/ext/json/tests/bug42090.phpt
+++ php-src/ext/json/tests/bug42090.phpt
--TEST--
Bug#42090 (json_decode causes segmentation fault)
--SKIPIF--
?php if (!extension_loaded(json)) print skip; ?
--FILE--
?php
var_dump(
json_decode(''),
json_decode('...'),
json_decode(''),
json_decode(''),
json_encode(''),
json_decode(json_encode('')),
json_decode(json_encode(''))
);
?
--EXPECT--
string(0) 
string(5) ...
string(1) 
string(2) 
string(4) \
string(1) 
string(2) 
--UEXPECT--
unicode(0) 
unicode(5) ...
unicode(1) 
unicode(2) 
string(4) \
unicode(1) 
unicode(2) 

-- 
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/reflection php_reflection.c /ext/reflection/tests 026.phpt

2007-07-24 Thread Johannes Schl�ter

johannesTue Jul 24 23:15:59 2007 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/reflection/tests   026.phpt 

  Modified files:  
/php-srcNEWS 
/php-src/ext/reflection php_reflection.c 
  Log:
  - New ReflectionExtension::info() function to print the phpinfo() block
for an extension. [DOC]
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.857r2=1.2027.2.547.2.858diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.857 php-src/NEWS:1.2027.2.547.2.858
--- php-src/NEWS:1.2027.2.547.2.857 Tue Jul 24 22:57:13 2007
+++ php-src/NEWSTue Jul 24 23:15:58 2007
@@ -35,6 +35,8 @@
   (Andrey A. Belashkov, Tony)
 - Added missing MSG_EOR and MSG_EOF constants to sockets extension. (Jani)
 - Added PCRE_VERSION constant. (Tony)
+- Added ReflectionExtension::info() function to print the phpinfo() block for
+  an extension. (Johannes)
 
 - Implemented FR #41884 (ReflectionClass::getDefaultProperties() does not 
handle 
   static attributes). (Tony)
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.164.2.33.2.42r2=1.164.2.33.2.43diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.164.2.33.2.42 
php-src/ext/reflection/php_reflection.c:1.164.2.33.2.43
--- php-src/ext/reflection/php_reflection.c:1.164.2.33.2.42 Mon Jul 23 
01:13:43 2007
+++ php-src/ext/reflection/php_reflection.c Tue Jul 24 23:15:58 2007
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_reflection.c,v 1.164.2.33.2.42 2007/07/23 01:13:43 bjori Exp $ */
+/* $Id: php_reflection.c,v 1.164.2.33.2.43 2007/07/24 23:15:58 johannes Exp $ 
*/
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -4394,6 +4394,20 @@
 }
 /* }}} */
 
+/* {{{ proto public void ReflectionExtension::info() U
+   Prints phpinfo block for the extension */
+ZEND_METHOD(reflection_extension, info)
+{
+   reflection_object *intern;
+   zend_module_entry *module;
+
+   METHOD_NOTSTATIC_NUMPARAMS(reflection_extension_ptr, 0);
+   GET_REFLECTION_OBJECT_PTR(module);
+
+   php_info_print_module(module TSRMLS_CC);
+}
+/* }}} */
+
 /* {{{ method tables */
 static zend_function_entry reflection_exception_functions[] = {
{NULL, NULL, NULL}
@@ -4770,6 +4784,7 @@
ZEND_ME(reflection_extension, getClasses, NULL, 0)
ZEND_ME(reflection_extension, getClassNames, NULL, 0)
ZEND_ME(reflection_extension, getDependencies, NULL, 0)
+   ZEND_ME(reflection_extension, info, NULL, 0)
{NULL, NULL, NULL}
 };
 /* }}} */
@@ -4888,7 +4903,7 @@
php_info_print_table_start();
php_info_print_table_header(2, Reflection, enabled);
 
-   php_info_print_table_row(2, Version, $Id: php_reflection.c,v 
1.164.2.33.2.42 2007/07/23 01:13:43 bjori Exp $);
+   php_info_print_table_row(2, Version, $Id: php_reflection.c,v 
1.164.2.33.2.43 2007/07/24 23:15:58 johannes Exp $);
 
php_info_print_table_end();
 } /* }}} */

http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/026.phpt?view=markuprev=1.1
Index: php-src/ext/reflection/tests/026.phpt
+++ php-src/ext/reflection/tests/026.phpt

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

[PHP-CVS] cvs: php-src /ext/reflection php_reflection.c /ext/reflection/tests 026.phpt

2007-07-24 Thread Johannes Schl�ter

johannesTue Jul 24 23:16:47 2007 UTC

  Modified files:  
/php-src/ext/reflection php_reflection.c 
/php-src/ext/reflection/tests   026.phpt 
  Log:
  - MFB: New ReflectionExtension::info() function to print the phpinfo() block
for an extension.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.279r2=1.280diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.279 
php-src/ext/reflection/php_reflection.c:1.280
--- php-src/ext/reflection/php_reflection.c:1.279   Mon Jul 23 01:21:04 2007
+++ php-src/ext/reflection/php_reflection.c Tue Jul 24 23:16:47 2007
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_reflection.c,v 1.279 2007/07/23 01:21:04 bjori Exp $ */
+/* $Id: php_reflection.c,v 1.280 2007/07/24 23:16:47 johannes Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -4512,6 +4512,20 @@
 }
 /* }}} */
 
+/* {{{ proto public void ReflectionExtension::info() U
+   Prints phpinfo block for the extension */
+ZEND_METHOD(reflection_extension, info)
+{
+   reflection_object *intern;
+   zend_module_entry *module;
+
+   METHOD_NOTSTATIC_NUMPARAMS(reflection_extension_ptr, 0);
+   GET_REFLECTION_OBJECT_PTR(module);
+
+   php_info_print_module(module TSRMLS_CC);
+}
+/* }}} */
+
 /* {{{ method tables */
 static zend_function_entry reflection_exception_functions[] = {
{NULL, NULL, NULL}
@@ -4889,6 +4903,7 @@
ZEND_ME(reflection_extension, getClasses, NULL, 0)
ZEND_ME(reflection_extension, getClassNames, NULL, 0)
ZEND_ME(reflection_extension, getDependencies, NULL, 0)
+   ZEND_ME(reflection_extension, info, NULL, 0)
{NULL, NULL, NULL}
 };
 /* }}} */
@@ -5007,7 +5022,7 @@
php_info_print_table_start();
php_info_print_table_header(2, Reflection, enabled);
 
-   php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.279 
2007/07/23 01:21:04 bjori Exp $);
+   php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.280 
2007/07/24 23:16:47 johannes Exp $);
 
php_info_print_table_end();
 } /* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/026.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/reflection/tests/026.phpt
diff -u /dev/null php-src/ext/reflection/tests/026.phpt:1.2
--- /dev/null   Tue Jul 24 23:16:47 2007
+++ php-src/ext/reflection/tests/026.phpt   Tue Jul 24 23:16:47 2007
@@ -0,0 +1,36 @@
+--TEST--
+reflectionExtension::info()
+--SKIPIF--
+?php extension_loaded('reflection') or die('skip'); ?
+--FILE--
+?php
+$r = new ReflectionExtension(reflection);
+$r-info();
+
+date_default_timezone_set('Europe/Berlin');
+$r = new ReflectionExtension(date);
+$r-info();
+
+echo \nDone!\n;
+
+--EXPECTF--
+Reflection
+
+Reflection = enabled
+Version = %s
+
+date
+
+date/time support = enabled
+Olson Timezone Database Version = %s
+Timezone Database = %s
+Default timezone = %s
+
+Directive = %s = %s
+date.timezone = %s = %s
+date.default_latitude = %s = %s
+date.default_longitude = %s = %s
+date.sunset_zenith = %s = %s
+date.sunrise_zenith = %s = %s
+
+Done!

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

[PHP-CVS] cvs: php-src / NEWS

2007-07-24 Thread Johannes Schl

johannesTue Jul 24 23:25:48 2007 UTC

  Modified files:  
/php-srcNEWS 
  Log:
  - These functions where MFHd 1 year ago
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2147r2=1.2148diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2147 php-src/NEWS:1.2148
--- php-src/NEWS:1.2147 Thu Jul 12 09:23:47 2007
+++ php-src/NEWSTue Jul 24 23:25:48 2007
@@ -50,8 +50,6 @@
 - Added E_STRICT to E_ALL. (Dmitry)
 - Added an optional parameter to strstr() and stristr() for retrieval of either
   the part of haystack before or after first occurence of needle. (Johannes)
-- Added possibility to check in which extension an internal function was
-  defined using reflection API. (Johannes)
 - Added streams features:
   . Context parameter for copy() function. (Sara)
   . Second optional parameter to stream_context_create() to

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

[PHP-CVS] cvs: CVSROOT / avail loginfo

2007-07-24 Thread Philip Olson

philip  Wed Jul 25 04:10:06 2007 UTC

  Modified files:  
/CVSROOTavail loginfo 
  Log:
  PhD karma for Hannes and Gwynne
  # This is the new documentation build system
  
  
http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1292r2=1.1293diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1292 CVSROOT/avail:1.1293
--- CVSROOT/avail:1.1292Fri Jul 20 21:05:29 2007
+++ CVSROOT/avail   Wed Jul 25 04:10:05 2007
@@ -34,6 +34,9 @@
 
 
avail|iliaa,goba,wez,derick,sfox,alan_k,jacques,edink,bjori,philip,mike,curt,didou,nlopess,gwynne|livedocs
 
+# The PhD (DocBook build system) lead developers
+avail|bjori,gwynne|phd
+
 # People who work on the Engine
 
avail|andi,zeev,andrei,stas,sterling,sascha,derick,sebastian,phanto,jani,sniper,hirokawa,fujimoto,rvenkat,sesser,kalowsky,iliaa,hyanantha,georg,wez,edink,helly,hholzgra,imajes,gschlossnagle,moriyoshi,dmitry,jon,pollita,tony2001,johannes,bjori|Zend,ZendEngine2,TSRM
 avail|zoe|ZendEngine2/tests
http://cvs.php.net/viewvc.cgi/CVSROOT/loginfo?r1=1.120r2=1.121diff_format=u
Index: CVSROOT/loginfo
diff -u CVSROOT/loginfo:1.120 CVSROOT/loginfo:1.121
--- CVSROOT/loginfo:1.120   Fri Jun  1 17:09:13 2007
+++ CVSROOT/loginfo Wed Jul 25 04:10:05 2007
@@ -1,5 +1,5 @@
 #
-#ident @(#)cvs/examples:$Name:  $:$Id: loginfo,v 1.120 2007/06/01 17:09:13 
philip Exp $
+#ident @(#)cvs/examples:$Name:  $:$Id: loginfo,v 1.121 2007/07/25 04:10:05 
philip Exp $
 #
 # The loginfo file is used to control where cvs commit log information
 # is sent.  The first entry on a line is a regular expression which is tested
@@ -86,6 +86,7 @@
 ^phpdoc-tw $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
 ^phpdoc-zh $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
 ^phpdoc$CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
+^phd   $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
 ^livedocs  $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED],[EMAIL PROTECTED] 
$USER %{sVv}
 ^docweb$CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
 ^functable $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}

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

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

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

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

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

Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/strings str_pad.phpt

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

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

Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/strings str_pad.phpt

[PHP-CVS] cvs: php-src /ext/sockets sockets.php

[PHP-CVS] cvs: php-src /ext/sockets package.xml

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/sockets package.xml sockets.php

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

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

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/pdo/tests pdo_018.phpt /tests/classes visibility_005.phpt ZendEngine2 zend_builtin_functions.c zend_object_handlers.c ZendEngine2/tests bug27798.phpt bu

[PHP-CVS] cvs: php-src /tests/classes visibility_005.phpt ZendEngine2 zend_builtin_functions.c zend_object_handlers.c ZendEngine2/tests bug27798.phpt bug40757.phpt bug41929.phpt

[PHP-CVS] cvs: php-src /main main.c

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/dom/tests bug28721.phpt bug28817.phpt bug32615.phpt bug34276.phpt bug35342.phpt bug37277.phpt bug37456.phpt bug38850.phpt bug38949.phpt bug40836.phpt bug41257.phpt

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended /main main.c php_globals.h

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /main/streams xp_socket.c

[PHP-CVS] cvs: php-src /ext/mysqli config9.m4 /ext/mysqli/mysqlnd portability.h

[PHP-CVS] cvs: php-src /ext/mysql .cvsignore /ext/mysqli .cvsignore

[PHP-CVS] cvs: php-src /ext/standard/tests/general_functions debug_zval_dump_o.phpt

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/general_functions debug_zval_dump_o.phpt

[PHP-CVS] cvs: php-src /ext/mysqli config9.m4

[PHP-CVS] cvs: php-src /main main.c

[PHP-CVS] cvs: php-src(PHP_5_2) /main main.c

[PHP-CVS] cvs: php-src /ext/pcre php_pcre.c

[PHP-CVS] cvs: php-src /ext/json json.c /ext/json/tests bug42090.phpt

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/reflection php_reflection.c /ext/reflection/tests 026.phpt

[PHP-CVS] cvs: php-src /ext/reflection php_reflection.c /ext/reflection/tests 026.phpt

[PHP-CVS] cvs: php-src / NEWS

[PHP-CVS] cvs: CVSROOT / avail loginfo

32 matches

Site Navigation

Mail list logo

Footer information