date:20060503

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

2006-05-03 Thread changelog

changelog   Thu May  4 05:31:49 2006 UTC

  Modified files:  
/php-srcChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/viewcvs.cgi/php-src/ChangeLog?r1=1.2334r2=1.2335diff_format=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.2334 php-src/ChangeLog:1.2335
--- php-src/ChangeLog:1.2334Wed May  3 05:31:46 2006
+++ php-src/ChangeLog   Thu May  4 05:31:48 2006
@@ -1,3 +1,143 @@
+2006-05-03  Ilia Alshanetsky  [EMAIL PROTECTED]
+
+* (PHP_5_1)
+  configure.in
+  main/php_version.h:
+  Back to dev
+
+* (PHP_5_1)
+  configure.in
+  main/php_version.h:
+  go with 5.1.4
+
+2006-05-03  Sara Golemon  [EMAIL PROTECTED]
+
+* (PHP_5_1)
+  NEWS:
+  News entry for exporting PDO::PARAM_EVT_* constants
+
+2006-05-03  Pierre-Alain Joye  [EMAIL PROTECTED]
+
+* (PHP_5_1)
+  run-tests.php:
+  - remove debug part
+nota bene, there is still work in this area, but this is a start
+
+* tests/basic/021.phpt
+  tests/basic/021.phpt:
+  
+  file 021.phpt was initially added on branch PHP_5_1.
+
+* (PHP_5_1)
+  run-tests.php:
+  - add support for POST_RAW, allow to pass raw POST data
+  - add support for TEST_PHP_CGI_EXECUTABLE env variable, it is now 
possible
+to set both TEST_PHP_EXECUTABLE and CGI
+
+2006-05-03  Brian France  [EMAIL PROTECTED]
+
+* NEWS
+  ext/curl/multi.c:
+  
+  - Add implementation of curl_multi_info_read (Brian)
+  
+  Not adding to PHP 5_1, but should go into 5_2.
+
+2006-05-03  Antony Dovgal  [EMAIL PROTECTED]
+
+* sapi/cgi/cgi_main.c:
+  plug leak
+
+* tests/basic/013.phpt
+  tests/basic/014.phpt
+  tests/basic/015.phpt
+  tests/basic/016.phpt
+  tests/basic/017.phpt
+  tests/basic/018.phpt
+  tests/basic/019.phpt
+  tests/basic/020.phpt:
+  more POST+arrays tests
+
+* tests/basic/013.phpt
+  tests/basic/013.phpt
+  tests/basic/014.phpt
+  tests/basic/014.phpt
+  tests/basic/015.phpt
+  tests/basic/015.phpt
+  tests/basic/016.phpt
+  tests/basic/016.phpt
+  tests/basic/017.phpt
+  tests/basic/017.phpt
+  tests/basic/018.phpt
+  tests/basic/018.phpt
+  tests/basic/019.phpt
+  tests/basic/019.phpt
+  tests/basic/020.phpt
+  tests/basic/020.phpt:
+  
+  file 013.phpt was initially added on branch PHP_5_1.
+
+2006-05-03  Dmitry Stogov  [EMAIL PROTECTED]
+
+* sapi/cgi/fastcgi.c
+  sapi/cgi/fastcgi.c
+  sapi/cgi/fastcgi.h
+  sapi/cgi/fastcgi.h:
+  Fixed bug #37205 (incompatibility with mod_fastcgi)
+
+2006-05-03  Ilia Alshanetsky  [EMAIL PROTECTED]
+
+* (PHP_5_1)
+  NEWS:
+  Prepare news file for release
+
+* (PHP_5_1)
+  ext/standard/php_smart_str.h:
+  Revert previous optimization if preparation for 5.1.4
+
+2006-05-03  Dmitry Stogov  [EMAIL PROTECTED]
+
+* (PHP_5_1)
+  NEWS:
+  Fixed bug #37291 (FastCGI now longer works with isapi_fcgi.dll)
+
+* sapi/cgi/fastcgi.c
+  sapi/cgi/fastcgi.c:
+  Fixed incompatibility with isapi_fcgi.dll
+
+* (PHP_5_1)
+  NEWS
+  main/php_variables.c
+  main/php_variables.c:
+  Fixed bug #37276 (problems witch $_POST array)
+
+2006-05-03  Rob Richards  [EMAIL PROTECTED]
+
+* (PHP_5_1)
+  NEWS:
+  BFN
+  re-order news
+
+* (PHP_5_1)
+  ext/dom/attr.c
+  ext/dom/element.c
+  ext/dom/php_dom.c
+  ext/dom/tests/bug37277.phpt:
+  Fix bug #37277 (cloning Dom Documents or Nodes does not work)
+  Proper fix for bug #36859
+  add test
+
+* ext/dom/tests/bug37277.phpt
+  ext/dom/tests/bug37277.phpt:
+  
+  add test
+
+* ext/dom/attr.c
+  ext/dom/element.c
+  ext/dom/php_dom.c:
+  Fix bug #37277 (cloning Dom Documents or Nodes does not work)
+  Proper fix for bug #36859
+
 2006-05-02  Sara Golemon  [EMAIL PROTECTED]
 
 * ext/standard/file.c:

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

2006-05-03 Thread Dmitry Stogov

dmitry  Wed May  3 06:36:02 2006 UTC

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/soap   soap.c 
  Log:
  MFH
  
  
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/soap.c?r1=1.156.2.27r2=1.156.2.28diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.27 php-src/ext/soap/soap.c:1.156.2.28
--- php-src/ext/soap/soap.c:1.156.2.27  Wed Apr 19 10:48:54 2006
+++ php-src/ext/soap/soap.c Wed May  3 06:36:02 2006
@@ -17,7 +17,7 @@
   |  Dmitry Stogov [EMAIL PROTECTED] |
   +--+
 */
-/* $Id: soap.c,v 1.156.2.27 2006/04/19 10:48:54 dmitry Exp $ */
+/* $Id: soap.c,v 1.156.2.28 2006/05/03 06:36:02 dmitry Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -395,7 +395,7 @@
 # define OnUpdateLong OnUpdateInt
 #endif
 
-ZEND_API ZEND_INI_MH(OnUpdateCacheEnabled)
+ZEND_INI_MH(OnUpdateCacheEnabled)
 {
long *p;
 #ifndef ZTS

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

[PHP-CVS] cvs: php-src /ext/unicode php_property.h

2006-05-03 Thread Andrei Zmievski

andrei  Wed May  3 06:36:53 2006 UTC

  Added files: 
/php-src/ext/unicodephp_property.h 
  Log:
  
  

http://cvs.php.net/viewcvs.cgi/php-src/ext/unicode/php_property.h?view=markuprev=1.1
Index: php-src/ext/unicode/php_property.h
+++ php-src/ext/unicode/php_property.h
/*
   +--+
   | PHP Version 6|
   +--+
   | This source file is subject to version 3.01 of the PHP license,  |
   | that is bundled with this package in the file LICENSE, and is|
   | available through the world-wide-web at the following url:   |
   | http://www.php.net/license/3_01.txt  |
   | If you did not receive a copy of the PHP license and are unable to   |
   | obtain it through the world-wide-web, please send a note to  |
   | [EMAIL PROTECTED] so we can mail you a copy immediately.   |
   +--+
   | Authors: Andrei Zmievski [EMAIL PROTECTED]|
   +--+
*/

/* $Id: php_property.h,v 1.1 2006/05/03 06:36:53 andrei Exp $ */ 

#ifndef PHP_PROPERTY_H
#define PHP_PROPERTY_H

/*
 * C/POSIX migration functions
 */
PHP_FUNCTION(unicode_is_lower);
PHP_FUNCTION(unicode_is_upper);
PHP_FUNCTION(unicode_is_digit);
PHP_FUNCTION(unicode_is_alpha);
PHP_FUNCTION(unicode_is_alnum);
PHP_FUNCTION(unicode_is_xdigit);
PHP_FUNCTION(unicode_is_punct);
PHP_FUNCTION(unicode_is_graph);
PHP_FUNCTION(unicode_is_blank);
PHP_FUNCTION(unicode_is_space);
PHP_FUNCTION(unicode_is_cntrl);
PHP_FUNCTION(unicode_is_print);

/*
 * Additional binary property functions
 */

PHP_FUNCTION(unicode_is_title);
PHP_FUNCTION(unicode_is_defined);
PHP_FUNCTION(unicode_is_id_start);
PHP_FUNCTION(unicode_is_id_part);
PHP_FUNCTION(unicode_is_id_ignorable);
PHP_FUNCTION(unicode_is_iso_control);
PHP_FUNCTION(unicode_is_mirrored);
PHP_FUNCTION(unicode_is_base);
PHP_FUNCTION(unicode_is_whitespace);
PHP_FUNCTION(unicode_is_u_whitespace);
PHP_FUNCTION(unicode_is_u_alphabetic);
PHP_FUNCTION(unicode_is_u_uppercase);
PHP_FUNCTION(unicode_is_u_lowercase);


#endif /* PHP_PROPERTY_H */


/*
 * Local variables:
 * tab-width: 4
 * c-basic-offset: 4
 * End:
 * vim600: noet sw=4 ts=4 fdm=marker
 * vim600: noet sw=4 ts=4
 */

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

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_sqlite config.m4

2006-05-03 Thread Pierre-Alain Joye

pajoye  Wed May  3 11:12:54 2006 UTC

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/pdo_sqlite config.m4 
  Log:
  - document the --with-pdo-sqlite[=dir]
  
  
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo_sqlite/config.m4?r1=1.26.2.8r2=1.26.2.9diff_format=u
Index: php-src/ext/pdo_sqlite/config.m4
diff -u php-src/ext/pdo_sqlite/config.m4:1.26.2.8 
php-src/ext/pdo_sqlite/config.m4:1.26.2.9
--- php-src/ext/pdo_sqlite/config.m4:1.26.2.8   Sat Dec 31 00:56:06 2005
+++ php-src/ext/pdo_sqlite/config.m4Wed May  3 11:12:54 2006
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.26.2.8 2005/12/31 00:56:06 sniper Exp $
+dnl $Id: config.m4,v 1.26.2.9 2006/05/03 11:12:54 pajoye Exp $
 dnl config.m4 for extension pdo_sqlite
 dnl vim:et:sw=2:ts=2:
 
@@ -7,6 +7,9 @@
 PHP_ARG_WITH(pdo-sqlite, for sqlite 3 driver for PDO,
 [  --without-pdo-sqlite  PDO: sqlite 3 support],yes)
 
+PHP_ARG_WITH(pdo-sqlite, for sqlite 3 support for PDO,
+[  --with-pdo-sqlite[=DIR]   PDO: sqlite support. DIR is the sqlite base 
directory, the bundled sqlite is used by default])
+
 if test $PHP_PDO_SQLITE != no; then
 
   ifdef([PHP_CHECK_PDO_INCLUDES],

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

[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /main php_variables.c

2006-05-03 Thread Dmitry Stogov

dmitry  Wed May  3 11:24:29 2006 UTC

  Modified files:  (Branch: PHP_5_1)
/php-src/main   php_variables.c 
/php-srcNEWS 
  Log:
  Fixed bug #37276 (problems witch $_POST array)
  
  
http://cvs.php.net/viewcvs.cgi/php-src/main/php_variables.c?r1=1.104.2.9r2=1.104.2.10diff_format=u
Index: php-src/main/php_variables.c
diff -u php-src/main/php_variables.c:1.104.2.9 
php-src/main/php_variables.c:1.104.2.10
--- php-src/main/php_variables.c:1.104.2.9  Tue Apr 18 06:58:43 2006
+++ php-src/main/php_variables.cWed May  3 11:24:29 2006
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php_variables.c,v 1.104.2.9 2006/04/18 06:58:43 dmitry Exp $ */
+/* $Id: php_variables.c,v 1.104.2.10 2006/05/03 11:24:29 dmitry Exp $ */
 
 #include stdio.h
 #include php.h
@@ -178,7 +178,7 @@
is_array = 1;
*ip = 0;
} else {
-   is_array = 0;
+   goto plain_var;
}
}
} else {
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.542r2=1.2027.2.543diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.542 php-src/NEWS:1.2027.2.543
--- php-src/NEWS:1.2027.2.542   Wed May  3 08:44:32 2006
+++ php-src/NEWSWed May  3 11:24:29 2006
@@ -5,6 +5,7 @@
   for SSL streams. (Wez).
 - Fixed possible crash in highlight_string(). (Dmitry)
 - Fixed bug #37277 (cloning Dom Documents or Nodes does not work). (Rob)
+- Fixed bug #37276 (problems witch $_POST array). (Dmitry)
 - Fixed bug #36632 (bad error reporting for pdo_odbc exec UPDATE). (Wez).
 - Fixed bug #35552 (crash when pdo_odbc prepare fails). (Wez).
 

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

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

2006-05-03 Thread Dmitry Stogov

dmitry  Wed May  3 11:24:51 2006 UTC

  Modified files:  
/php-src/main   php_variables.c 
  Log:
  Fixed bug #37276 (problems witch $_POST array)
  
  
http://cvs.php.net/viewcvs.cgi/php-src/main/php_variables.c?r1=1.126r2=1.127diff_format=u
Index: php-src/main/php_variables.c
diff -u php-src/main/php_variables.c:1.126 php-src/main/php_variables.c:1.127
--- php-src/main/php_variables.c:1.126  Tue Apr 18 06:58:54 2006
+++ php-src/main/php_variables.cWed May  3 11:24:51 2006
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php_variables.c,v 1.126 2006/04/18 06:58:54 dmitry Exp $ */
+/* $Id: php_variables.c,v 1.127 2006/05/03 11:24:51 dmitry Exp $ */
 
 #include stdio.h
 #include php.h
@@ -177,7 +177,7 @@
is_array = 1;
*ip = 0;
} else {
-   is_array = 0;
+   goto plain_var;
}
}
} else {

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

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

2006-05-03 Thread Dmitry Stogov

dmitry  Wed May  3 13:19:58 2006 UTC

  Modified files:  (Branch: PHP_5_1)
/php-src/sapi/cgi   fastcgi.c 
  Log:
  Fixed incompatibility with isapi_fcgi.dll
  
  
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/fastcgi.c?r1=1.4.2.10r2=1.4.2.11diff_format=u
Index: php-src/sapi/cgi/fastcgi.c
diff -u php-src/sapi/cgi/fastcgi.c:1.4.2.10 php-src/sapi/cgi/fastcgi.c:1.4.2.11
--- php-src/sapi/cgi/fastcgi.c:1.4.2.10 Thu Apr 27 11:39:32 2006
+++ php-src/sapi/cgi/fastcgi.c  Wed May  3 13:19:57 2006
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: fastcgi.c,v 1.4.2.10 2006/04/27 11:39:32 dmitry Exp $ */
+/* $Id: fastcgi.c,v 1.4.2.11 2006/05/03 13:19:57 dmitry Exp $ */
 
 #include fastcgi.h
 #include php.h
@@ -510,6 +510,9 @@
len = (hdr.contentLengthB1  8) | hdr.contentLengthB0;
padding = hdr.paddingLength;
}
+#ifdef _WIN32
+   req-has_in = 1;
+#else
if (safe_read(req, hdr, sizeof(fcgi_header)) != 
sizeof(fcgi_header) ||
hdr.version  FCGI_VERSION_1 ||
hdr.type != FCGI_STDIN) {
@@ -519,6 +522,7 @@
req-in_len = (hdr.contentLengthB1  8) | hdr.contentLengthB0;
req-in_pad = hdr.paddingLength;
req-has_in = (req-in_len != 0);
+#endif
} else if (hdr.type == FCGI_GET_VALUES) {
int i, j;
int name_len;

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

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

2006-05-03 Thread Dmitry Stogov

dmitry  Wed May  3 13:20:13 2006 UTC

  Modified files:  
/php-src/sapi/cgi   fastcgi.c 
  Log:
  Fixed incompatibility with isapi_fcgi.dll
  
  
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/fastcgi.c?r1=1.11r2=1.12diff_format=u
Index: php-src/sapi/cgi/fastcgi.c
diff -u php-src/sapi/cgi/fastcgi.c:1.11 php-src/sapi/cgi/fastcgi.c:1.12
--- php-src/sapi/cgi/fastcgi.c:1.11 Thu Apr 27 11:39:46 2006
+++ php-src/sapi/cgi/fastcgi.c  Wed May  3 13:20:12 2006
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: fastcgi.c,v 1.11 2006/04/27 11:39:46 dmitry Exp $ */
+/* $Id: fastcgi.c,v 1.12 2006/05/03 13:20:12 dmitry Exp $ */
 
 #include fastcgi.h
 #include php.h
@@ -510,6 +510,9 @@
len = (hdr.contentLengthB1  8) | hdr.contentLengthB0;
padding = hdr.paddingLength;
}
+#ifdef _WIN32
+   req-has_in = 1;
+#else
if (safe_read(req, hdr, sizeof(fcgi_header)) != 
sizeof(fcgi_header) ||
hdr.version  FCGI_VERSION_1 ||
hdr.type != FCGI_STDIN) {
@@ -519,6 +522,7 @@
req-in_len = (hdr.contentLengthB1  8) | hdr.contentLengthB0;
req-in_pad = hdr.paddingLength;
req-has_in = (req-in_len != 0);
+#endif
} else if (hdr.type == FCGI_GET_VALUES) {
int i, j;
int name_len;

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

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

2006-05-03 Thread Dmitry Stogov

dmitry  Wed May  3 13:25:38 2006 UTC

  Modified files:  (Branch: PHP_5_1)
/php-srcNEWS 
  Log:
  Fixed bug #37291 (FastCGI now longer works with isapi_fcgi.dll)
  
  
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.543r2=1.2027.2.544diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.543 php-src/NEWS:1.2027.2.544
--- php-src/NEWS:1.2027.2.543   Wed May  3 11:24:29 2006
+++ php-src/NEWSWed May  3 13:25:37 2006
@@ -4,6 +4,7 @@
 - Added capture_peer_cert and capture_peer_cert_chain context options
   for SSL streams. (Wez).
 - Fixed possible crash in highlight_string(). (Dmitry)
+- Fixed bug #37291 (FastCGI now longer works with isapi_fcgi.dll). (Dmitry)
 - Fixed bug #37277 (cloning Dom Documents or Nodes does not work). (Rob)
 - Fixed bug #37276 (problems witch $_POST array). (Dmitry)
 - Fixed bug #36632 (bad error reporting for pdo_odbc exec UPDATE). (Wez).

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

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/standard php_smart_str.h

2006-05-03 Thread Ilia Alshanetsky

iliaa   Wed May  3 13:32:10 2006 UTC

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/standard   php_smart_str.h 
  Log:
  Revert previous optimization if preparation for 5.1.4
  
  
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/php_smart_str.h?r1=1.30.2.2r2=1.30.2.3diff_format=u
Index: php-src/ext/standard/php_smart_str.h
diff -u php-src/ext/standard/php_smart_str.h:1.30.2.2 
php-src/ext/standard/php_smart_str.h:1.30.2.3
--- php-src/ext/standard/php_smart_str.h:1.30.2.2   Tue May  2 13:52:24 2006
+++ php-src/ext/standard/php_smart_str.hWed May  3 13:32:10 2006
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_smart_str.h,v 1.30.2.2 2006/05/02 13:52:24 iliaa Exp $ */
+/* $Id: php_smart_str.h,v 1.30.2.3 2006/05/03 13:32:10 iliaa Exp $ */
 
 #ifndef PHP_SMART_STR_H
 #define PHP_SMART_STR_H
@@ -35,11 +35,11 @@
 } while (0)
 
 #ifndef SMART_STR_PREALLOC
-#define SMART_STR_PREALLOC 4096
+#define SMART_STR_PREALLOC 128
 #endif
 
 #ifndef SMART_STR_START_SIZE
-#define SMART_STR_START_SIZE 1024
+#define SMART_STR_START_SIZE 78
 #endif
 
 #ifdef SMART_STR_USE_REALLOC

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

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

2006-05-03 Thread Ilia Alshanetsky

iliaa   Wed May  3 13:32:46 2006 UTC

  Modified files:  (Branch: PHP_5_1)
/php-srcNEWS 
  Log:
  Prepare news file for release
  
  
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.544r2=1.2027.2.545diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.544 php-src/NEWS:1.2027.2.545
--- php-src/NEWS:1.2027.2.544   Wed May  3 13:25:37 2006
+++ php-src/NEWSWed May  3 13:32:46 2006
@@ -1,12 +1,12 @@
 PHPNEWS
 |||
-?? ??? 2006, PHP 5.1.4
+04 May 2006, PHP 5.1.4
 - Added capture_peer_cert and capture_peer_cert_chain context options
   for SSL streams. (Wez).
 - Fixed possible crash in highlight_string(). (Dmitry)
 - Fixed bug #37291 (FastCGI now longer works with isapi_fcgi.dll). (Dmitry)
 - Fixed bug #37277 (cloning Dom Documents or Nodes does not work). (Rob)
-- Fixed bug #37276 (problems witch $_POST array). (Dmitry)
+- Fixed bug #37276 (problems with $_POST array). (Dmitry)
 - Fixed bug #36632 (bad error reporting for pdo_odbc exec UPDATE). (Wez).
 - Fixed bug #35552 (crash when pdo_odbc prepare fails). (Wez).
 

-- 
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_1) / NEWS

2006-05-03 Thread Antony Dovgal


Please wait for at least several hours and let me test it first.
I don't trust our core testers anymore, so please DO NOT release it right now.

On 03.05.2006 17:32, Ilia Alshanetsky wrote:

iliaa   Wed May  3 13:32:46 2006 UTC

  Modified files:  (Branch: PHP_5_1)
/php-src	NEWS 
  Log:

  Prepare news file for release
  
  
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.544r2=1.2027.2.545diff_format=u

Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.544 php-src/NEWS:1.2027.2.545
--- php-src/NEWS:1.2027.2.544   Wed May  3 13:25:37 2006
+++ php-src/NEWSWed May  3 13:32:46 2006
@@ -1,12 +1,12 @@
 PHPNEWS
 |||
-?? ??? 2006, PHP 5.1.4
+04 May 2006, PHP 5.1.4
 - Added capture_peer_cert and capture_peer_cert_chain context options
   for SSL streams. (Wez).
 - Fixed possible crash in highlight_string(). (Dmitry)
 - Fixed bug #37291 (FastCGI now longer works with isapi_fcgi.dll). (Dmitry)
 - Fixed bug #37277 (cloning Dom Documents or Nodes does not work). (Rob)
-- Fixed bug #37276 (problems witch $_POST array). (Dmitry)
+- Fixed bug #37276 (problems with $_POST array). (Dmitry)
 - Fixed bug #36632 (bad error reporting for pdo_odbc exec UPDATE). (Wez).
 - Fixed bug #35552 (crash when pdo_odbc prepare fails). (Wez).
 




--
Wbr, 
Antony Dovgal


--
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_1) / NEWS

2006-05-03 Thread Ilia Alshanetsky


I will not tag the release untill 7-8pm EST time.


On 3-May-06, at 9:49 AM, Antony Dovgal wrote:


Please wait for at least several hours and let me test it first.
I don't trust our core testers anymore, so please DO NOT release  
it right now.


On 03.05.2006 17:32, Ilia Alshanetsky wrote:

iliaa   Wed May  3 13:32:46 2006 UTC
  Modified files:  (Branch: PHP_5_1)
/php-srcNEWS   Log:
  Prepare news file for release
http://cvs.php.net/viewcvs.cgi/php-src/NEWS? 
r1=1.2027.2.544r2=1.2027.2.545diff_format=u

Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.544 php-src/NEWS:1.2027.2.545
--- php-src/NEWS:1.2027.2.544   Wed May  3 13:25:37 2006
+++ php-src/NEWSWed May  3 13:32:46 2006
@@ -1,12 +1,12 @@
  
PHP   
  NEWS
  
| 
||

-?? ??? 2006, PHP 5.1.4
+04 May 2006, PHP 5.1.4
 - Added capture_peer_cert and capture_peer_cert_chain context  
options

   for SSL streams. (Wez).
 - Fixed possible crash in highlight_string(). (Dmitry)
 - Fixed bug #37291 (FastCGI now longer works with  
isapi_fcgi.dll). (Dmitry)
 - Fixed bug #37277 (cloning Dom Documents or Nodes does not  
work). (Rob)

-- Fixed bug #37276 (problems witch $_POST array). (Dmitry)
+- Fixed bug #37276 (problems with $_POST array). (Dmitry)
 - Fixed bug #36632 (bad error reporting for pdo_odbc exec  
UPDATE). (Wez).

 - Fixed bug #35552 (crash when pdo_odbc prepare fails). (Wez).




--
Wbr, Antony Dovgal



Ilia Alshanetsky
Advanced Internet Designs Inc.
[EMAIL PROTECTED]

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

[PHP-CVS] cvs: php-src(PHP_5_1) /sapi/cgi fastcgi.c fastcgi.h

2006-05-03 Thread Dmitry Stogov

dmitry  Wed May  3 15:39:16 2006 UTC

  Modified files:  (Branch: PHP_5_1)
/php-src/sapi/cgi   fastcgi.c fastcgi.h 
  Log:
  Fixed bug #37205 (incompatibility with mod_fastcgi)
  
  
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/fastcgi.c?r1=1.4.2.11r2=1.4.2.12diff_format=u
Index: php-src/sapi/cgi/fastcgi.c
diff -u php-src/sapi/cgi/fastcgi.c:1.4.2.11 php-src/sapi/cgi/fastcgi.c:1.4.2.12
--- php-src/sapi/cgi/fastcgi.c:1.4.2.11 Wed May  3 13:19:57 2006
+++ php-src/sapi/cgi/fastcgi.c  Wed May  3 15:39:16 2006
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: fastcgi.c,v 1.4.2.11 2006/05/03 13:19:57 dmitry Exp $ */
+/* $Id: fastcgi.c,v 1.4.2.12 2006/05/03 15:39:16 dmitry Exp $ */
 
 #include fastcgi.h
 #include php.h
@@ -441,7 +441,6 @@
unsigned char buf[FCGI_MAX_LENGTH+8];
 
req-keep = 0;
-   req-has_in = 0;
req-in_len = 0;
req-out_hdr = NULL;
req-out_pos = req-out_buf;
@@ -510,19 +509,6 @@
len = (hdr.contentLengthB1  8) | hdr.contentLengthB0;
padding = hdr.paddingLength;
}
-#ifdef _WIN32
-   req-has_in = 1;
-#else
-   if (safe_read(req, hdr, sizeof(fcgi_header)) != 
sizeof(fcgi_header) ||
-   hdr.version  FCGI_VERSION_1 ||
-   hdr.type != FCGI_STDIN) {
-   req-keep = 0;
-   return 0;
-   }
-   req-in_len = (hdr.contentLengthB1  8) | hdr.contentLengthB0;
-   req-in_pad = hdr.paddingLength;
-   req-has_in = (req-in_len != 0);
-#endif
} else if (hdr.type == FCGI_GET_VALUES) {
int i, j;
int name_len;
@@ -565,9 +551,6 @@
fcgi_header hdr;
unsigned char buf[8];
 
-   if (!req-has_in) {
-   return 0;
-   }
n = 0;
rest = len;
while (rest  0) {
@@ -635,6 +618,10 @@
RevertToSelf();
}
 #else
+   char buf[8];
+
+   shutdown(req-fd, 1);
+   while (recv(req-fd, buf, sizeof(buf), 0)  0) {}
close(req-fd);
 #endif
req-fd = -1;
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/fastcgi.h?r1=1.2.2.3r2=1.2.2.4diff_format=u
Index: php-src/sapi/cgi/fastcgi.h
diff -u php-src/sapi/cgi/fastcgi.h:1.2.2.3 php-src/sapi/cgi/fastcgi.h:1.2.2.4
--- php-src/sapi/cgi/fastcgi.h:1.2.2.3  Thu Apr 27 11:39:32 2006
+++ php-src/sapi/cgi/fastcgi.h  Wed May  3 15:39:16 2006
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: fastcgi.h,v 1.2.2.3 2006/04/27 11:39:32 dmitry Exp $ */
+/* $Id: fastcgi.h,v 1.2.2.4 2006/05/03 15:39:16 dmitry Exp $ */
 
 /* FastCGI protocol */
 
@@ -97,7 +97,6 @@
intid;
intkeep;
 
-   inthas_in;
intin_len;
intin_pad;
 

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

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

2006-05-03 Thread Dmitry Stogov

dmitry  Wed May  3 15:48:33 2006 UTC

  Modified files:  
/php-src/sapi/cgi   fastcgi.c fastcgi.h 
  Log:
  Fixed bug #37205 (incompatibility with mod_fastcgi)
  
  
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/fastcgi.c?r1=1.12r2=1.13diff_format=u
Index: php-src/sapi/cgi/fastcgi.c
diff -u php-src/sapi/cgi/fastcgi.c:1.12 php-src/sapi/cgi/fastcgi.c:1.13
--- php-src/sapi/cgi/fastcgi.c:1.12 Wed May  3 13:20:12 2006
+++ php-src/sapi/cgi/fastcgi.c  Wed May  3 15:48:33 2006
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: fastcgi.c,v 1.12 2006/05/03 13:20:12 dmitry Exp $ */
+/* $Id: fastcgi.c,v 1.13 2006/05/03 15:48:33 dmitry Exp $ */
 
 #include fastcgi.h
 #include php.h
@@ -305,7 +305,7 @@
memset(sa.sa_unix, 0, sizeof(sa.sa_unix));
sa.sa_unix.sun_family = AF_UNIX;
memcpy(sa.sa_unix.sun_path, path, path_len + 1);
-   sa_len = (size_t)(((struct sockaddr_un *)0)-sun_path)  + 
path_len;
+   sa_len = (size_t)(((struct sockaddr_un *)0)-sun_path)  + 
path_len;
 #ifdef HAVE_SOCKADDR_UN_SUN_LEN
sa.sa_unix.sun_len = sa_len;
 #endif
@@ -441,7 +441,6 @@
unsigned char buf[FCGI_MAX_LENGTH+8];
 
req-keep = 0;
-   req-has_in = 0;
req-in_len = 0;
req-out_hdr = NULL;
req-out_pos = req-out_buf;
@@ -510,19 +509,6 @@
len = (hdr.contentLengthB1  8) | hdr.contentLengthB0;
padding = hdr.paddingLength;
}
-#ifdef _WIN32
-   req-has_in = 1;
-#else
-   if (safe_read(req, hdr, sizeof(fcgi_header)) != 
sizeof(fcgi_header) ||
-   hdr.version  FCGI_VERSION_1 ||
-   hdr.type != FCGI_STDIN) {
-   req-keep = 0;
-   return 0;
-   }
-   req-in_len = (hdr.contentLengthB1  8) | hdr.contentLengthB0;
-   req-in_pad = hdr.paddingLength;
-   req-has_in = (req-in_len != 0);
-#endif
} else if (hdr.type == FCGI_GET_VALUES) {
int i, j;
int name_len;
@@ -548,7 +534,7 @@
}
len = p - buf - sizeof(fcgi_header);
len += fcgi_make_header((fcgi_header*)buf, 
FCGI_GET_VALUES_RESULT, 0, len);
-   if (safe_write(req, buf, sizeof(fcgi_header)+len) != 
sizeof(fcgi_header)+len) {
+   if (safe_write(req, buf, sizeof(fcgi_header)+len) != 
(int)sizeof(fcgi_header)+len) {
return 0;
}
return 0;
@@ -565,9 +551,6 @@
fcgi_header hdr;
unsigned char buf[8];
 
-   if (!req-has_in) {
-   return 0;
-   }
n = 0;
rest = len;
while (rest  0) {
@@ -635,6 +618,10 @@
RevertToSelf();
}
 #else
+   char buf[8];
+
+   shutdown(req-fd, 1);
+   while (recv(req-fd, buf, sizeof(buf), 0)  0) {}
close(req-fd);
 #endif
req-fd = -1;
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/fastcgi.h?r1=1.3r2=1.4diff_format=u
Index: php-src/sapi/cgi/fastcgi.h
diff -u php-src/sapi/cgi/fastcgi.h:1.3 php-src/sapi/cgi/fastcgi.h:1.4
--- php-src/sapi/cgi/fastcgi.h:1.3  Thu Apr 27 11:39:46 2006
+++ php-src/sapi/cgi/fastcgi.h  Wed May  3 15:48:33 2006
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: fastcgi.h,v 1.3 2006/04/27 11:39:46 dmitry Exp $ */
+/* $Id: fastcgi.h,v 1.4 2006/05/03 15:48:33 dmitry Exp $ */
 
 /* FastCGI protocol */
 
@@ -97,7 +97,6 @@
intid;
intkeep;
 
-   inthas_in;
intin_len;
intin_pad;
 

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

[PHP-CVS] cvs: CVSROOT / avail

2006-05-03 Thread Marcus Boerger

helly   Wed May  3 18:54:39 2006 UTC

  Modified files:  
/CVSROOTavail 
  Log:
  - Forgot to add nuno (sorry for that)
  
http://cvs.php.net/viewcvs.cgi/CVSROOT/avail?r1=1.1128r2=1.1129diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1128 CVSROOT/avail:1.1129
--- CVSROOT/avail:1.1128Wed Apr 26 20:49:22 2006
+++ CVSROOT/avail   Wed May  3 18:54:39 2006
@@ -108,7 +108,7 @@
 
 # access to gcov.php.net website.
 
-avail|helly,ilia|php-gcov-web
+avail|helly,ilia,nlopess|php-gcov-web
 
 # the pearbot module is for a bot for irc on the #pear channel on efnet.
 avail|meebey,imajes,toby|pearbot


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

[PHP-CVS] cvs: php-src(PHP_5_1) /tests/basic 013.phpt 014.phpt 015.phpt 016.phpt 017.phpt 018.phpt 019.phpt 020.phpt

2006-05-03 Thread Antony Dovgal

tony2001Wed May  3 19:02:12 2006 UTC

  Added files: (Branch: PHP_5_1)
/php-src/tests/basic013.phpt 014.phpt 015.phpt 016.phpt 017.phpt 
018.phpt 019.phpt 020.phpt 
  Log:
  more POST+array tests
  
  

http://cvs.php.net/viewcvs.cgi/php-src/tests/basic/013.phpt?view=markuprev=1.1
Index: php-src/tests/basic/013.phpt
+++ php-src/tests/basic/013.phpt

http://cvs.php.net/viewcvs.cgi/php-src/tests/basic/014.phpt?view=markuprev=1.1
Index: php-src/tests/basic/014.phpt
+++ php-src/tests/basic/014.phpt

http://cvs.php.net/viewcvs.cgi/php-src/tests/basic/015.phpt?view=markuprev=1.1
Index: php-src/tests/basic/015.phpt
+++ php-src/tests/basic/015.phpt

http://cvs.php.net/viewcvs.cgi/php-src/tests/basic/016.phpt?view=markuprev=1.1
Index: php-src/tests/basic/016.phpt
+++ php-src/tests/basic/016.phpt

http://cvs.php.net/viewcvs.cgi/php-src/tests/basic/017.phpt?view=markuprev=1.1
Index: php-src/tests/basic/017.phpt
+++ php-src/tests/basic/017.phpt

http://cvs.php.net/viewcvs.cgi/php-src/tests/basic/018.phpt?view=markuprev=1.1
Index: php-src/tests/basic/018.phpt
+++ php-src/tests/basic/018.phpt

http://cvs.php.net/viewcvs.cgi/php-src/tests/basic/019.phpt?view=markuprev=1.1
Index: php-src/tests/basic/019.phpt
+++ php-src/tests/basic/019.phpt

http://cvs.php.net/viewcvs.cgi/php-src/tests/basic/020.phpt?view=markuprev=1.1
Index: php-src/tests/basic/020.phpt
+++ php-src/tests/basic/020.phpt

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

[PHP-CVS] cvs: php-src /tests/basic 013.phpt 014.phpt 015.phpt 016.phpt 017.phpt 018.phpt 019.phpt 020.phpt

2006-05-03 Thread Antony Dovgal

tony2001Wed May  3 19:03:57 2006 UTC

  Modified files:  
/php-src/tests/basic013.phpt 014.phpt 015.phpt 016.phpt 017.phpt 
018.phpt 019.phpt 020.phpt 
  Log:
  more POST+arrays tests
  
  
http://cvs.php.net/viewcvs.cgi/php-src/tests/basic/013.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/tests/basic/013.phpt
diff -u /dev/null php-src/tests/basic/013.phpt:1.2
--- /dev/null   Wed May  3 19:03:57 2006
+++ php-src/tests/basic/013.phptWed May  3 19:03:56 2006
@@ -0,0 +1,15 @@
+--TEST--
+POST Method test and arrays
+--SKIPIF--
+?php if (php_sapi_name()=='cli') echo 'skip'; ?
+--POST--
+a[]=1
+--FILE--
+?php
+var_dump($_POST['a']); 
+?
+--EXPECT--
+array(1) {
+  [0]=
+  string(1) 1
+}
http://cvs.php.net/viewcvs.cgi/php-src/tests/basic/014.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/tests/basic/014.phpt
diff -u /dev/null php-src/tests/basic/014.phpt:1.2
--- /dev/null   Wed May  3 19:03:57 2006
+++ php-src/tests/basic/014.phptWed May  3 19:03:56 2006
@@ -0,0 +1,17 @@
+--TEST--
+POST Method test and arrays - 2
+--SKIPIF--
+?php if (php_sapi_name()=='cli') echo 'skip'; ?
+--POST--
+a[]=1a[]=1
+--FILE--
+?php
+var_dump($_POST['a']); 
+?
+--EXPECT--
+array(2) {
+  [0]=
+  string(1) 1
+  [1]=
+  string(1) 1
+}
http://cvs.php.net/viewcvs.cgi/php-src/tests/basic/015.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/tests/basic/015.phpt
diff -u /dev/null php-src/tests/basic/015.phpt:1.2
--- /dev/null   Wed May  3 19:03:57 2006
+++ php-src/tests/basic/015.phptWed May  3 19:03:56 2006
@@ -0,0 +1,15 @@
+--TEST--
+POST Method test and arrays - 3 
+--SKIPIF--
+?php if (php_sapi_name()=='cli') echo 'skip'; ?
+--POST--
+a[]=1a[0]=5
+--FILE--
+?php
+var_dump($_POST['a']); 
+?
+--EXPECT--
+array(1) {
+  [0]=
+  string(1) 5
+}
http://cvs.php.net/viewcvs.cgi/php-src/tests/basic/016.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/tests/basic/016.phpt
diff -u /dev/null php-src/tests/basic/016.phpt:1.2
--- /dev/null   Wed May  3 19:03:57 2006
+++ php-src/tests/basic/016.phptWed May  3 19:03:56 2006
@@ -0,0 +1,17 @@
+--TEST--
+POST Method test and arrays - 4 
+--SKIPIF--
+?php if (php_sapi_name()=='cli') echo 'skip'; ?
+--POST--
+a[a]=1a[b]=3
+--FILE--
+?php
+var_dump($_POST['a']); 
+?
+--EXPECT--
+array(2) {
+  [a]=
+  string(1) 1
+  [b]=
+  string(1) 3
+}
http://cvs.php.net/viewcvs.cgi/php-src/tests/basic/017.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/tests/basic/017.phpt
diff -u /dev/null php-src/tests/basic/017.phpt:1.2
--- /dev/null   Wed May  3 19:03:57 2006
+++ php-src/tests/basic/017.phptWed May  3 19:03:56 2006
@@ -0,0 +1,19 @@
+--TEST--
+POST Method test and arrays - 5 
+--SKIPIF--
+?php if (php_sapi_name()=='cli') echo 'skip'; ?
+--POST--
+a[]=1a[a]=1a[b]=3
+--FILE--
+?php
+var_dump($_POST['a']); 
+?
+--EXPECT--
+array(3) {
+  [0]=
+  string(1) 1
+  [a]=
+  string(1) 1
+  [b]=
+  string(1) 3
+}
http://cvs.php.net/viewcvs.cgi/php-src/tests/basic/018.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/tests/basic/018.phpt
diff -u /dev/null php-src/tests/basic/018.phpt:1.2
--- /dev/null   Wed May  3 19:03:57 2006
+++ php-src/tests/basic/018.phptWed May  3 19:03:56 2006
@@ -0,0 +1,36 @@
+--TEST--
+POST Method test and arrays - 6 
+--SKIPIF--
+?php if (php_sapi_name()=='cli') echo 'skip'; ?
+--POST--
+a[][]=1a[][]=3b[a][b][c]=1b[a][b][d]=1
+--FILE--
+?php
+var_dump($_POST['a']); 
+var_dump($_POST['b']); 
+?
+--EXPECT--
+array(2) {
+  [0]=
+  array(1) {
+[0]=
+string(1) 1
+  }
+  [1]=
+  array(1) {
+[0]=
+string(1) 3
+  }
+}
+array(1) {
+  [a]=
+  array(1) {
+[b]=
+array(2) {
+  [c]=
+  string(1) 1
+  [d]=
+  string(1) 1
+}
+  }
+}
http://cvs.php.net/viewcvs.cgi/php-src/tests/basic/019.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/tests/basic/019.phpt
diff -u /dev/null php-src/tests/basic/019.phpt:1.2
--- /dev/null   Wed May  3 19:03:57 2006
+++ php-src/tests/basic/019.phptWed May  3 19:03:56 2006
@@ -0,0 +1,19 @@
+--TEST--
+POST Method test and arrays - 7 
+--SKIPIF--
+?php if (php_sapi_name()=='cli') echo 'skip'; ?
+--POST--
+a[]=1a[]]=3a[[]=4
+--FILE--
+?php
+var_dump($_POST['a']); 
+?
+--EXPECT--
+array(3) {
+  [0]=
+  string(1) 1
+  [1]=
+  string(1) 3
+  [[]=
+  string(1) 4
+}
http://cvs.php.net/viewcvs.cgi/php-src/tests/basic/020.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/tests/basic/020.phpt
diff -u /dev/null php-src/tests/basic/020.phpt:1.2
--- /dev/null   Wed May  3 19:03:57 2006
+++ php-src/tests/basic/020.phptWed May  3 19:03:56 2006
@@ -0,0 +1,17 @@
+--TEST--
+POST Method test and arrays - 8 
+--SKIPIF--
+?php if (php_sapi_name()=='cli') echo 'skip'; ?
+--POST--
+a[a[]]=1a[b[]]=3
+--FILE--
+?php
+var_dump($_POST['a']); 
+?
+--EXPECT--
+array(2) {
+  [a[]=
+  string(1) 1
+  [b[]=
+  string(1) 3
+}

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

2006-05-03 Thread Antony Dovgal

tony2001Wed May  3 19:40:49 2006 UTC

  Modified files:  
/php-src/sapi/cgi   cgi_main.c 
  Log:
  plug leak
  
  
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.285r2=1.286diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.285 php-src/sapi/cgi/cgi_main.c:1.286
--- php-src/sapi/cgi/cgi_main.c:1.285   Tue Apr 18 06:58:10 2006
+++ php-src/sapi/cgi/cgi_main.c Wed May  3 19:40:49 2006
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: cgi_main.c,v 1.285 2006/04/18 06:58:10 dmitry Exp $ */
+/* $Id: cgi_main.c,v 1.286 2006/05/03 19:40:49 tony2001 Exp $ */
 
 #include php.h
 #include php_globals.h
@@ -1408,6 +1408,7 @@
 
if (script_file) {
/* override path_translated if -f on 
command line */
+   
STR_FREE(SG(request_info).path_translated);
SG(request_info).path_translated = 
script_file;
}
 

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

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

2006-05-03 Thread Antony Dovgal

tony2001Wed May  3 19:40:58 2006 UTC

  Modified files:  (Branch: PHP_5_1)
/php-src/sapi/cgi   cgi_main.c 
  Log:
  MFH: plug leak
  
  
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.267.2.14r2=1.267.2.15diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.267.2.14 
php-src/sapi/cgi/cgi_main.c:1.267.2.15
--- php-src/sapi/cgi/cgi_main.c:1.267.2.14  Tue Apr 18 06:57:55 2006
+++ php-src/sapi/cgi/cgi_main.c Wed May  3 19:40:58 2006
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: cgi_main.c,v 1.267.2.14 2006/04/18 06:57:55 dmitry Exp $ */
+/* $Id: cgi_main.c,v 1.267.2.15 2006/05/03 19:40:58 tony2001 Exp $ */
 
 #include php.h
 #include php_globals.h
@@ -1468,6 +1468,7 @@
 
if (script_file) {
/* override path_translated if -f on command 
line */
+   STR_FREE(SG(request_info).path_translated);
SG(request_info).path_translated = script_file;
}
 

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

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

2006-05-03 Thread Brian France

bfrance Wed May  3 19:52:48 2006 UTC

  Modified files:  
/php-srcNEWS 
/php-src/ext/curl   multi.c 
  Log:
  
  - Add implementation of curl_multi_info_read (Brian)
  
  Not adding to PHP 5_1, but should go into 5_2.
  
  
  
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2113r2=1.2114diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2113 php-src/NEWS:1.2114
--- php-src/NEWS:1.2113 Mon Apr 10 10:16:42 2006
+++ php-src/NEWSWed May  3 19:52:48 2006
@@ -34,6 +34,7 @@
   . Added curl_setopt_array() which allows setting of multiple cURL options.
   . Added CURLINFO_HEADER_OUT constant to facilitate request retrieval.
 
+- Add implementation of curl_multi_info_read (Brian)
 - Added jump label operator (limited goto). (Dmitry, Sara)
 - Added E_STRICT to E_ALL. (Dmitry)
 - Added gmp_nextprime() function. (Tony, patch by ants dot aasma at gmail dot 
com) 
http://cvs.php.net/viewcvs.cgi/php-src/ext/curl/multi.c?r1=1.22r2=1.23diff_format=u
Index: php-src/ext/curl/multi.c
diff -u php-src/ext/curl/multi.c:1.22 php-src/ext/curl/multi.c:1.23
--- php-src/ext/curl/multi.c:1.22   Thu Apr 13 11:26:43 2006
+++ php-src/ext/curl/multi.cWed May  3 19:52:48 2006
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: multi.c,v 1.22 2006/04/13 11:26:43 tony2001 Exp $ */
+/* $Id: multi.c,v 1.23 2006/05/03 19:52:48 bfrance Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -84,17 +84,29 @@
ZEND_FETCH_RESOURCE(mh, php_curlm *, z_mh, -1, 
le_curl_multi_handle_name, le_curl_multi_handle);
ZEND_FETCH_RESOURCE(ch, php_curl *, z_ch, -1, le_curl_name, le_curl);
 
-   zval_add_ref(z_ch);
-
_php_curl_cleanup_handle(ch);
ch-uses++;
 
+   /* we want to create a copy of this zval that we store in the 
multihandle
+  structure element easyh - so we separate it from the original
+  input zval to this function using SEPARATE_ZVAL */
+   SEPARATE_ZVAL( z_ch );
zend_llist_add_element(mh-easyh, z_ch);
 
RETURN_LONG((long) curl_multi_add_handle(mh-multi, ch-cp));   
 }
 /* }}} */
 
+
+/* Used internally as comparison routine passed to zend_list_del_element */
+static int curl_compare_resources( zval **z1, zval **z2 )
+{
+   return (Z_TYPE_PP( z1 ) == Z_TYPE_PP( z2 )  
+Z_TYPE_PP( z1 ) == IS_RESOURCE 
+Z_LVAL_PP( z1 ) == Z_LVAL_PP( z2 ) );
+}
+
+
 /* {{{ proto int curl_multi_remove_handle(resource mh, resource ch)
Remove a multi handle from a set of cURL handles */
 PHP_FUNCTION(curl_multi_remove_handle)
@@ -112,6 +124,9 @@
ZEND_FETCH_RESOURCE(ch, php_curl *, z_ch, -1, le_curl_name, le_curl);
 
--ch-uses;
+
+   zend_llist_del_element( mh-easyh, z_ch, 
+   (int (*)(void *, void 
*)) curl_compare_resources );

RETURN_LONG((long) curl_multi_remove_handle(mh-multi, ch-cp));
 }
@@ -206,13 +221,11 @@
 {
zval  *z_mh;
php_curlm *mh;
-   CURLMsg   *tmp_msg;
+   CURLMsg   *tmp_msg;
intqueued_msgs;
+   zval  *zmsgs_in_queue = NULL;
 
-   /* XXX: Not Implemented */
-   return;
-   
-   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, r, z_mh) == 
FAILURE) {
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, r|z, z_mh, 
zmsgs_in_queue) == FAILURE) {
return;
}
 
@@ -222,12 +235,46 @@
if (tmp_msg == NULL) {
RETURN_FALSE;
}
+   if (zmsgs_in_queue) {
+   zval_dtor(zmsgs_in_queue);
+   ZVAL_LONG(zmsgs_in_queue, queued_msgs);
+   }
 
array_init(return_value);
add_assoc_long(return_value, msg, tmp_msg-msg);
add_assoc_long(return_value, result, tmp_msg-data.result);
-   /* add_assoc_resource(return_value, handle, 
zend_list_id_by_pointer(tmp_msg-easy_handle, le_curl TSRMLS_CC)); */
-   add_assoc_string(return_value, whatever, (char *) 
tmp_msg-data.whatever, 1);
+
+   /* find the original easy curl handle */
+   {
+   zend_llist_position pos;
+   php_curl *ch;
+   zval**pz_ch;
+
+   /* search the list of easy handles hanging off the multi-handle 
*/
+   for(pz_ch = (zval **)zend_llist_get_first_ex(mh-easyh, pos); 
pz_ch;
+   pz_ch = (zval **)zend_llist_get_next_ex(mh-easyh, 
pos)) {
+   ZEND_FETCH_RESOURCE(ch, php_curl *, pz_ch, -1, 
le_curl_name, le_curl);
+   if (ch-cp == tmp_msg-easy_handle) {
+
+   /* we are adding a reference to the underlying 
php_curl
+  resource, so we need to add one to the 
resource's refcount 
+  in order to ensure it doesn't get destroyed 
when the 
+  underlying curl easy handle

Re: [PHP-CVS] cvs: php-src /tests/basic 013.phpt 014.phpt 015.phpt 016.phpt 017.phpt 018.phpt 019.phpt 020.phpt

2006-05-03 Thread Hannes Magnusson


http://cvs.php.net/viewcvs.cgi/php-src/tests/basic/013.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/tests/basic/013.phpt
diff -u /dev/null php-src/tests/basic/013.phpt:1.2
--- /dev/null   Wed May  3 19:03:57 2006
+++ php-src/tests/basic/013.phptWed May  3 19:03:56 2006
@@ -0,0 +1,15 @@
+--TEST--
+POST Method test and arrays
+--SKIPIF--
+?php if (php_sapi_name()=='cli') echo 'skip'; ?
+--POST--
+a[]=1


That SKIPIF will never execute under cli, run-tests is smart enough to
check for POST section before executing

-Hannes

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

Re: [PHP-CVS] cvs: CVSROOT / avail

2006-05-03 Thread Nuno Lopes


Thanks Marcus!
BTW, are you considering mentoring a student to work on the gcov site? Or do 
you think it doesn't worth for a SoC project? (judging for the votes so 
far..)


Nuno


- Original Message - 
From: Marcus Boerger [EMAIL PROTECTED]

To: php-cvs@lists.php.net
Sent: Wednesday, May 03, 2006 7:54 PM
Subject: [PHP-CVS] cvs: CVSROOT / avail



helly Wed May  3 18:54:39 2006 UTC

 Modified files:
   /CVSROOT avail
 Log:
 - Forgot to add nuno (sorry for that)

http://cvs.php.net/viewcvs.cgi/CVSROOT/avail?r1=1.1128r2=1.1129diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1128 CVSROOT/avail:1.1129
--- CVSROOT/avail:1.1128 Wed Apr 26 20:49:22 2006
+++ CVSROOT/avail Wed May  3 18:54:39 2006
@@ -108,7 +108,7 @@

# access to gcov.php.net website.

-avail|helly,ilia|php-gcov-web
+avail|helly,ilia,nlopess|php-gcov-web

# the pearbot module is for a bot for irc on the #pear channel on efnet.
avail|meebey,imajes,toby|pearbot


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


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

[PHP-CVS] cvs: php-src(PHP_5_1) / run-tests.php

2006-05-03 Thread Pierre-Alain Joye

pajoye  Wed May  3 21:33:45 2006 UTC

  Modified files:  (Branch: PHP_5_1)
/php-srcrun-tests.php 
  Log:
  - add support for POST_RAW, allow to pass raw POST data
  - add support for TEST_PHP_CGI_EXECUTABLE env variable, it is now possible
to set both TEST_PHP_EXECUTABLE and CGI
  
  
http://cvs.php.net/viewcvs.cgi/php-src/run-tests.php?r1=1.226.2.35r2=1.226.2.36diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.35 php-src/run-tests.php:1.226.2.36
--- php-src/run-tests.php:1.226.2.35Sat Mar 11 18:13:37 2006
+++ php-src/run-tests.php   Wed May  3 21:33:44 2006
@@ -23,7 +23,7 @@
+--+
  */
 
-/* $Id: run-tests.php,v 1.226.2.35 2006/03/11 18:13:37 helly Exp $ */
+/* $Id: run-tests.php,v 1.226.2.36 2006/05/03 21:33:44 pajoye Exp $ */
 
 /* Sanity check to ensure that pcre extension needed by this script is 
available.
  * In the event it is not, print a nice error message indicating that this 
script will
@@ -112,6 +112,15 @@
$environment['TEST_PHP_EXECUTABLE'] = $php;
 }
 
+if (getenv('TEST_PHP_CGI_EXECUTABLE')) {
+   $php_cgi = getenv('TEST_PHP_CGI_EXECUTABLE');
+   if ($php_cgi=='auto') {
+   $php_cgi = $cwd.'/sapi/cgi/php';
+   putenv(TEST_PHP_CGI_EXECUTABLE=$php_cgi);
+   }
+   $environment['TEST_PHP_CGI_EXECUTABLE'] = $php_cgi;
+}
+
 if ($argc !=2 || ($argv[1] != '-h'  $argv[1] != '-help'  $argv != 
'--help'))
 {
if (empty($php) || !file_exists($php)) {
@@ -388,7 +397,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
-   echo '$Revision: 1.226.2.35 $'.\n;
+   echo '$Revision: 1.226.2.36 $'.\n;
exit(1);
default:
echo Illegal switch '$switch' 
specified!\n;
@@ -919,7 +928,11 @@
 
$temp_filenames = null;
$org_file = $file;
-   
+
+   if (isset($env['TEST_PHP_CGI_EXECUTABLE'])) {
+   $php_cgi = $env['TEST_PHP_CGI_EXECUTABLE'];
+   }
+
if (is_array($file)) $file = $file[0];
 
if ($DETAILED) echo 
@@ -932,7 +945,9 @@
'TEST'   = '',
'SKIPIF' = '',
'GET'= '',
+   'POST_RAW' = '',
'POST'   = '',
+   'UPLOAD' = '',
'ARGS'   = '',
);
 
@@ -957,7 +972,7 @@
$line = fgets($fp);
 
// Match the beginning of a section.
-   if (preg_match('/^--([A-Z]+)--/', $line, $r)) {
+   if (preg_match('/^--([A-Z_]+)--/', $line, $r)) {
$section = $r[1];
$section_text[$section] = '';
$secfile = $section == 'FILE' || $section == 'FILEEOF';
@@ -1019,8 +1034,11 @@
$tested = trim($section_text['TEST']);
 
/* For GET/POST tests, check if cgi sapi is available and if it is, use 
it. */
-   if ((!empty($section_text['GET']) || !empty($section_text['POST']))) {
-   if (!strncasecmp(PHP_OS, win, 3)  file_exists(dirname($php) 
./php-cgi.exe)) {
+   if (!empty($section_text['GET']) || !empty($section_text['POST']) || 
!empty($section_text['POST_RAW'])) {
+   if (isset($php_cgi)) {
+   $old_php = $php;
+   $php = $php_cgi .' -C ';
+   } elseif (!strncasecmp(PHP_OS, win, 3)  
file_exists(dirname($php) ./php-cgi.exe)) {
$old_php = $php;
$php = realpath(dirname($php) ./php-cgi.exe) .' -C ';
} elseif (file_exists(./sapi/cgi/php)) {
@@ -1256,18 +1274,39 @@
 
$args = $section_text['ARGS'] ? ' -- '.$section_text['ARGS'] : '';
 
-   if (array_key_exists('POST', $section_text)  
!empty($section_text['POST'])) {
+   if (array_key_exists('POST_RAW', $section_text)  
!empty($section_text['POST_RAW'])) {
+   $post = trim($section_text['POST_RAW']);
+   $raw_lines = explode(\n, $post);
+
+   $request = '';
+   foreach ($raw_lines as $line) {
+   if (empty($env['CONTENT_TYPE'])  
eregi('^(Content-Type:)(.*)', $line, $res)) {
+   $env['CONTENT_TYPE'] = trim(str_replace(\r, 
'', $res[2]));
+   continue;
+   }
+   $request .= $line . \n;
+   }
+
+   $env['CONTENT_LENGTH'] = strlen($request);
+   $env['REQUEST_METHOD'] = 'POST';
+
+   if (empty($request)) {
+   return 'BORKED';
+   }
+   save_text($tmp_post, $request);
+   $cmd

[PHP-CVS] cvs: php-src(PHP_5_1) /tests/basic 021.phpt

2006-05-03 Thread Pierre-Alain Joye

pajoye  Wed May  3 21:35:26 2006 UTC

  Added files: (Branch: PHP_5_1)
/php-src/tests/basic021.phpt 
  Log:
  - add test for multipart POST
  - also first example of the POST_RAW section
  
  

http://cvs.php.net/viewcvs.cgi/php-src/tests/basic/021.phpt?view=markuprev=1.1
Index: php-src/tests/basic/021.phpt
+++ php-src/tests/basic/021.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_1) / run-tests.php

2006-05-03 Thread Pierre-Alain Joye

pajoye  Wed May  3 21:37:16 2006 UTC

  Modified files:  (Branch: PHP_5_1)
/php-srcrun-tests.php 
  Log:
  - remove debug part
nota bene, there is still work in this area, but this is a start
  
  
http://cvs.php.net/viewcvs.cgi/php-src/run-tests.php?r1=1.226.2.36r2=1.226.2.37diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.36 php-src/run-tests.php:1.226.2.37
--- php-src/run-tests.php:1.226.2.36Wed May  3 21:33:44 2006
+++ php-src/run-tests.php   Wed May  3 21:37:16 2006
@@ -23,7 +23,7 @@
+--+
  */
 
-/* $Id: run-tests.php,v 1.226.2.36 2006/05/03 21:33:44 pajoye Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37 2006/05/03 21:37:16 pajoye Exp $ */
 
 /* Sanity check to ensure that pcre extension needed by this script is 
available.
  * In the event it is not, print a nice error message indicating that this 
script will
@@ -397,7 +397,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
-   echo '$Revision: 1.226.2.36 $'.\n;
+   echo '$Revision: 1.226.2.37 $'.\n;
exit(1);
default:
echo Illegal switch '$switch' 
specified!\n;
@@ -1306,7 +1306,6 @@
$env['CONTENT_LENGTH'] = $content_length;
 
$cmd = $php$pass_options$ini_settings -f \$test_file\ 21  
$tmp_post;
-   save_text('/home/pierre/cmd.txt', $cmd);
} else {
 
$env['REQUEST_METHOD'] = 'GET';

-- 
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_1) / run-tests.php

2006-05-03 Thread Marcus Boerger

Hello Pierre-Alain,

  i don't have /home/pierre on my machine and i will never have that.
Please respect the rule to this one file: only authors are allowed
to commit to this (check the archieves). The rule is there for a reason.

Wednesday, May 3, 2006, 11:33:45 PM, you wrote:

 pajoye  Wed May  3 21:33:45 2006 UTC

   Modified files:  (Branch: PHP_5_1)
 /php-srcrun-tests.php 
   Log:
   - add support for POST_RAW, allow to pass raw POST data
   - add support for TEST_PHP_CGI_EXECUTABLE env variable, it is now possible
 to set both TEST_PHP_EXECUTABLE and CGI
   
   
 http://cvs.php.net/viewcvs.cgi/php-src/run-tests.php?r1=1.226.2.35r2=1.226.2.36diff_format=u
 Index: php-src/run-tests.php
 diff -u php-src/run-tests.php:1.226.2.35 php-src/run-tests.php:1.226.2.36
 --- php-src/run-tests.php:1.226.2.35Sat Mar 11 18:13:37 2006
 +++ php-src/run-tests.php   Wed May  3 21:33:44 2006
 @@ -23,7 +23,7 @@
 +--+
   */
  
 -/* $Id: run-tests.php,v 1.226.2.35 2006/03/11 18:13:37 helly Exp $ */
 +/* $Id: run-tests.php,v 1.226.2.36 2006/05/03 21:33:44 pajoye Exp $ */
  
  /* Sanity check to ensure that pcre extension needed by this script is 
 available.
   * In the event it is not, print a nice error message indicating that this 
 script will
 @@ -112,6 +112,15 @@
 $environment['TEST_PHP_EXECUTABLE'] = $php;
  }
  
 +if (getenv('TEST_PHP_CGI_EXECUTABLE')) {
 +   $php_cgi = getenv('TEST_PHP_CGI_EXECUTABLE');
 +   if ($php_cgi=='auto') {
 +   $php_cgi = $cwd.'/sapi/cgi/php';
 +   putenv(TEST_PHP_CGI_EXECUTABLE=$php_cgi);
 +   }
 +   $environment['TEST_PHP_CGI_EXECUTABLE'] = $php_cgi;
 +}
 +
  if ($argc !=2 || ($argv[1] != '-h'  $argv[1] != '-help'  $argv != 
 '--help'))
  {
 if (empty($php) || !file_exists($php)) {
 @@ -388,7 +397,7 @@
 $html_output = 
 is_resource($html_file);
 break;
 case '--version':
 -   echo '$Revision: 1.226.2.35 $'.\n;
 +   echo '$Revision: 1.226.2.36 $'.\n;
 exit(1);
 default:
 echo Illegal switch '$switch' 
 specified!\n;
 @@ -919,7 +928,11 @@
  
 $temp_filenames = null;
 $org_file = $file;
 -   
 +
 +   if (isset($env['TEST_PHP_CGI_EXECUTABLE'])) {
 +   $php_cgi = $env['TEST_PHP_CGI_EXECUTABLE'];
 +   }
 +
 if (is_array($file)) $file = $file[0];
  
 if ($DETAILED) echo 
 @@ -932,7 +945,9 @@
 'TEST'   = '',
 'SKIPIF' = '',
 'GET'= '',
 +   'POST_RAW' = '',
 'POST'   = '',
 +   'UPLOAD' = '',
 'ARGS'   = '',
 );
  
 @@ -957,7 +972,7 @@
 $line = fgets($fp);
  
 // Match the beginning of a section.
 -   if (preg_match('/^--([A-Z]+)--/', $line, $r)) {
 +   if (preg_match('/^--([A-Z_]+)--/', $line, $r)) {
 $section = $r[1];
 $section_text[$section] = '';
 $secfile = $section == 'FILE' || $section == 
 'FILEEOF';
 @@ -1019,8 +1034,11 @@
 $tested = trim($section_text['TEST']);
  
 /* For GET/POST tests, check if cgi sapi is available and if it is, 
 use it. */
 -   if ((!empty($section_text['GET']) || !empty($section_text['POST']))) {
 -   if (!strncasecmp(PHP_OS, win, 3) 
 file_exists(dirname($php) ./php-cgi.exe)) {
 +   if (!empty($section_text['GET']) || !empty($section_text['POST'])
 || !empty($section_text['POST_RAW'])) {
 +   if (isset($php_cgi)) {
 +   $old_php = $php;
 +   $php = $php_cgi .' -C ';
 +   } elseif (!strncasecmp(PHP_OS, win, 3) 
 file_exists(dirname($php) ./php-cgi.exe)) {
 $old_php = $php;
 $php = realpath(dirname($php) ./php-cgi.exe) .' -C 
 ';
 } elseif (file_exists(./sapi/cgi/php)) {
 @@ -1256,18 +1274,39 @@
  
 $args = $section_text['ARGS'] ? ' -- '.$section_text['ARGS'] : '';
  
 -   if (array_key_exists('POST', $section_text)  
 !empty($section_text['POST'])) {
 +   if (array_key_exists('POST_RAW', $section_text)  
 !empty($section_text['POST_RAW'])) {
 +   $post = trim($section_text['POST_RAW']);
 +   $raw_lines = explode(\n, $post);
 +
 +   $request = '';
 +   foreach ($raw_lines as $line) {
 +   if (empty($env['CONTENT_TYPE']) 
 eregi('^(Content-Type:)(.*)', $line, $res)) {
 +   $env['CONTENT_TYPE'] =
 trim(str_replace(\r, '', $res[2]));
 +

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

2006-05-03 Thread Sara Golemon

pollita Wed May  3 21:57:58 2006 UTC

  Modified files:  
/php-src/ext/pdopdo_dbh.c 
  Log:
  Expose PARAM_EVT_* constants
  
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.128r2=1.129diff_format=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.128 php-src/ext/pdo/pdo_dbh.c:1.129
--- php-src/ext/pdo/pdo_dbh.c:1.128 Sat Apr 29 14:53:26 2006
+++ php-src/ext/pdo/pdo_dbh.c   Wed May  3 21:57:58 2006
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: pdo_dbh.c,v 1.128 2006/04/29 14:53:26 fmk Exp $ */
+/* $Id: pdo_dbh.c,v 1.129 2006/05/03 21:57:58 pollita Exp $ */
 
 /* The PDO Database Handle Class */
 
@@ -1266,6 +1266,14 @@
REGISTER_PDO_CLASS_CONST_LONG(PARAM_STMT, (long)PDO_PARAM_STMT);
REGISTER_PDO_CLASS_CONST_LONG(PARAM_INPUT_OUTPUT, 
(long)PDO_PARAM_INPUT_OUTPUT);
 
+   REGISTER_PDO_CLASS_CONST_LONG(PARAM_EVT_ALLOC,
(long)PDO_PARAM_EVT_ALLOC);
+   REGISTER_PDO_CLASS_CONST_LONG(PARAM_EVT_FREE, 
(long)PDO_PARAM_EVT_FREE);
+   REGISTER_PDO_CLASS_CONST_LONG(PARAM_EVT_EXEC_PRE, 
(long)PDO_PARAM_EVT_EXEC_PRE);
+   REGISTER_PDO_CLASS_CONST_LONG(PARAM_EVT_EXEC_POST,
(long)PDO_PARAM_EVT_EXEC_POST);
+   REGISTER_PDO_CLASS_CONST_LONG(PARAM_EVT_FETCH_PRE,
(long)PDO_PARAM_EVT_FETCH_PRE);
+   REGISTER_PDO_CLASS_CONST_LONG(PARAM_EVT_FETCH_POST,   
(long)PDO_PARAM_EVT_FETCH_POST);
+   REGISTER_PDO_CLASS_CONST_LONG(PARAM_EVT_NORMALIZE,
(long)PDO_PARAM_EVT_NORMALIZE);
+
REGISTER_PDO_CLASS_CONST_LONG(FETCH_LAZY, (long)PDO_FETCH_LAZY);
REGISTER_PDO_CLASS_CONST_LONG(FETCH_ASSOC,(long)PDO_FETCH_ASSOC);
REGISTER_PDO_CLASS_CONST_LONG(FETCH_NUM,  (long)PDO_FETCH_NUM);

-- 
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_1) / run-tests.php

2006-05-03 Thread Pierre


On 5/3/06, Marcus Boerger [EMAIL PROTECTED] wrote:

Hello Pierre-Alain,

  i don't have /home/pierre on my machine and i will never have that.
Please respect the rule to this one file: only authors are allowed
to commit to this (check the archieves). The rule is there for a reason.


It is already removed. Sorry for the noise.

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

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo pdo_dbh.c

2006-05-03 Thread Sara Golemon

pollita Wed May  3 21:58:39 2006 UTC

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/pdopdo_dbh.c 
  Log:
  mfh(r-1.129) Expose PARAM_EVT_* constants
  
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.82.2.30r2=1.82.2.31diff_format=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.82.2.30 php-src/ext/pdo/pdo_dbh.c:1.82.2.31
--- php-src/ext/pdo/pdo_dbh.c:1.82.2.30 Sun Apr  9 08:05:01 2006
+++ php-src/ext/pdo/pdo_dbh.c   Wed May  3 21:58:38 2006
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: pdo_dbh.c,v 1.82.2.30 2006/04/09 08:05:01 wez Exp $ */
+/* $Id: pdo_dbh.c,v 1.82.2.31 2006/05/03 21:58:38 pollita Exp $ */
 
 /* The PDO Database Handle Class */
 
@@ -1250,6 +1250,14 @@
REGISTER_PDO_CLASS_CONST_LONG(PARAM_STMT, (long)PDO_PARAM_STMT);
REGISTER_PDO_CLASS_CONST_LONG(PARAM_INPUT_OUTPUT, 
(long)PDO_PARAM_INPUT_OUTPUT);
 
+   REGISTER_PDO_CLASS_CONST_LONG(PARAM_EVT_ALLOC,
(long)PDO_PARAM_EVT_ALLOC);
+   REGISTER_PDO_CLASS_CONST_LONG(PARAM_EVT_FREE, 
(long)PDO_PARAM_EVT_FREE);
+   REGISTER_PDO_CLASS_CONST_LONG(PARAM_EVT_EXEC_PRE, 
(long)PDO_PARAM_EVT_EXEC_PRE);
+   REGISTER_PDO_CLASS_CONST_LONG(PARAM_EVT_EXEC_POST,
(long)PDO_PARAM_EVT_EXEC_POST);
+   REGISTER_PDO_CLASS_CONST_LONG(PARAM_EVT_FETCH_PRE,
(long)PDO_PARAM_EVT_FETCH_PRE);
+   REGISTER_PDO_CLASS_CONST_LONG(PARAM_EVT_FETCH_POST,   
(long)PDO_PARAM_EVT_FETCH_POST);
+   REGISTER_PDO_CLASS_CONST_LONG(PARAM_EVT_NORMALIZE,
(long)PDO_PARAM_EVT_NORMALIZE);
+
REGISTER_PDO_CLASS_CONST_LONG(FETCH_LAZY, (long)PDO_FETCH_LAZY);
REGISTER_PDO_CLASS_CONST_LONG(FETCH_ASSOC,(long)PDO_FETCH_ASSOC);
REGISTER_PDO_CLASS_CONST_LONG(FETCH_NUM,  (long)PDO_FETCH_NUM);

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

[PHP-CVS] cvs: php-src /ext/unicode php_property.h property.c unicode.c

2006-05-03 Thread Andrei Zmievski

andrei  Wed May  3 22:03:10 2006 UTC

  Modified files:  
/php-src/ext/unicodephp_property.h property.c unicode.c 
  Log:
  Some more property functions.
  
  # I am pondering a different prefix..
  
  
http://cvs.php.net/viewcvs.cgi/php-src/ext/unicode/php_property.h?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/unicode/php_property.h
diff -u php-src/ext/unicode/php_property.h:1.1 
php-src/ext/unicode/php_property.h:1.2
--- php-src/ext/unicode/php_property.h:1.1  Wed May  3 06:36:53 2006
+++ php-src/ext/unicode/php_property.h  Wed May  3 22:03:10 2006
@@ -14,7 +14,7 @@
+--+
 */
 
-/* $Id: php_property.h,v 1.1 2006/05/03 06:36:53 andrei Exp $ */ 
+/* $Id: php_property.h,v 1.2 2006/05/03 22:03:10 andrei Exp $ */ 
 
 #ifndef PHP_PROPERTY_H
 #define PHP_PROPERTY_H
@@ -53,6 +53,17 @@
 PHP_FUNCTION(unicode_is_u_uppercase);
 PHP_FUNCTION(unicode_is_u_lowercase);
 
+/*
+ * Single character property functions.
+ */
+
+PHP_FUNCTION(unicode_get_numeric_value);
+PHP_FUNCTION(unicode_get_combining_class);
+PHP_FUNCTION(unicode_get_digit_value);
+PHP_FUNCTION(unicode_get_mirror);
+PHP_FUNCTION(unicode_get_direction);
+PHP_FUNCTION(unicode_get_char_type);
+PHP_FUNCTION(unicode_is_char_valid);
 
 #endif /* PHP_PROPERTY_H */
 
http://cvs.php.net/viewcvs.cgi/php-src/ext/unicode/property.c?r1=1.4r2=1.5diff_format=u
Index: php-src/ext/unicode/property.c
diff -u php-src/ext/unicode/property.c:1.4 php-src/ext/unicode/property.c:1.5
--- php-src/ext/unicode/property.c:1.4  Tue May  2 22:43:52 2006
+++ php-src/ext/unicode/property.c  Wed May  3 22:03:10 2006
@@ -14,7 +14,7 @@
+--+
  */
 
-/* $Id: property.c,v 1.4 2006/05/02 22:43:52 andrei Exp $ */ 
+/* $Id: property.c,v 1.5 2006/05/03 22:03:10 andrei Exp $ */ 
 
 #include php_unicode.h
 
@@ -109,9 +109,7 @@
 
 /* }}} */
 
-/*
- * Additional binary property functions
- */
+/* {{{ Additional binary property functions */
 
 PHP_FUNCTION(unicode_is_title)
 {
@@ -178,6 +176,146 @@
check_property_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, u_isULowercase);
 }
 
+/* }}} */
+
+/* {{{ Single character properties */
+
+PHP_FUNCTION(unicode_get_numeric_value)
+{
+   UChar  *str;
+   int str_len;
+   int offset = 0;
+   UChar32 ch;
+
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, u, str, 
str_len) == FAILURE) {
+   return;
+   }
+
+   if (str_len == 0) {
+   RETURN_FALSE;
+   }
+   U16_NEXT(str, offset, str_len, ch);
+
+   RETURN_DOUBLE(u_getNumericValue(ch));
+}
+
+PHP_FUNCTION(unicode_get_combining_class)
+{
+   UChar  *str;
+   int str_len;
+   int offset = 0;
+   UChar32 ch;
+
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, u, str, 
str_len) == FAILURE) {
+   return;
+   }
+
+   if (str_len == 0) {
+   RETURN_FALSE;
+   }
+   U16_NEXT(str, offset, str_len, ch);
+
+   RETURN_LONG((long)u_getCombiningClass(ch));
+}
+
+PHP_FUNCTION(unicode_get_digit_value)
+{
+   UChar  *str;
+   int str_len;
+   int offset = 0;
+   UChar32 ch;
+
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, u, str, 
str_len) == FAILURE) {
+   return;
+   }
+
+   if (str_len == 0) {
+   RETURN_FALSE;
+   }
+   U16_NEXT(str, offset, str_len, ch);
+
+   RETURN_LONG(u_charDigitValue(ch));
+}
+
+PHP_FUNCTION(unicode_get_mirror)
+{
+   UChar  *str;
+   int str_len;
+   int offset = 0, buf_len;
+   UChar32 ch;
+   UChar   buf[3];
+
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, u, str, 
str_len) == FAILURE) {
+   return;
+   }
+
+   if (str_len == 0) {
+   RETURN_FALSE;
+   }
+   U16_NEXT(str, offset, str_len, ch);
+   buf_len = zend_codepoint_to_uchar(u_charMirror(ch), buf);
+
+   RETURN_UNICODEL(buf, buf_len, 1);
+}
+
+PHP_FUNCTION(unicode_get_direction)
+{
+   UChar  *str;
+   int str_len;
+   int offset = 0;
+   UChar32 ch;
+
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, u, str, 
str_len) == FAILURE) {
+   return;
+   }
+
+   if (str_len == 0) {
+   RETURN_FALSE;
+   }
+   U16_NEXT(str, offset, str_len, ch);
+
+   RETURN_LONG((long)u_charDirection(ch));
+}
+
+PHP_FUNCTION(unicode_get_char_type)
+{
+   UChar  *str;
+   int str_len;
+   int offset = 0;
+   UChar32 ch;
+
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, u, str,

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

2006-05-03 Thread Sara Golemon

pollita Wed May  3 22:44:37 2006 UTC

  Modified files:  (Branch: PHP_5_1)
/php-srcNEWS 
  Log:
  News entry for exporting PDO::PARAM_EVT_* constants
  
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.545r2=1.2027.2.546diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.545 php-src/NEWS:1.2027.2.546
--- php-src/NEWS:1.2027.2.545   Wed May  3 13:32:46 2006
+++ php-src/NEWSWed May  3 22:44:37 2006
@@ -3,6 +3,7 @@
 04 May 2006, PHP 5.1.4
 - Added capture_peer_cert and capture_peer_cert_chain context options
   for SSL streams. (Wez).
+- Added PDO::PARAM_EVT_* family of constants. (Sara)
 - Fixed possible crash in highlight_string(). (Dmitry)
 - Fixed bug #37291 (FastCGI now longer works with isapi_fcgi.dll). (Dmitry)
 - Fixed bug #37277 (cloning Dom Documents or Nodes does not work). (Rob)

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

[PHP-CVS] cvs: php-src(PHP_5_1) / configure.in /main php_version.h

2006-05-03 Thread Ilia Alshanetsky

iliaa   Wed May  3 23:30:02 2006 UTC

  Modified files:  (Branch: PHP_5_1)
/php-srcconfigure.in 
/php-src/main   php_version.h 
  Log:
  go with 5.1.4
  
  
http://cvs.php.net/viewcvs.cgi/php-src/configure.in?r1=1.579.2.50r2=1.579.2.51diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.50 php-src/configure.in:1.579.2.51
--- php-src/configure.in:1.579.2.50 Wed Apr 26 16:07:11 2006
+++ php-src/configure.inWed May  3 23:30:02 2006
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.579.2.50 2006/04/26 16:07:11 iliaa Exp $ -*- 
autoconf -*-
+ ## $Id: configure.in,v 1.579.2.51 2006/05/03 23:30:02 iliaa Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -40,9 +40,9 @@
 AC_CONFIG_HEADER(main/php_config.h)
 
 MAJOR_VERSION=5
-MINOR_VERSION=2
-RELEASE_VERSION=0
-EXTRA_VERSION=-dev
+MINOR_VERSION=1
+RELEASE_VERSION=4
+EXTRA_VERSION=
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION
 
 dnl Define where extension directories are located in the configure context
http://cvs.php.net/viewcvs.cgi/php-src/main/php_version.h?r1=1.112.2.35r2=1.112.2.36diff_format=u
Index: php-src/main/php_version.h
diff -u php-src/main/php_version.h:1.112.2.35 
php-src/main/php_version.h:1.112.2.36
--- php-src/main/php_version.h:1.112.2.35   Wed Apr 26 16:07:11 2006
+++ php-src/main/php_version.h  Wed May  3 23:30:02 2006
@@ -1,7 +1,7 @@
 /* automatically generated by configure */
 /* edit configure.in to change version number */
 #define PHP_MAJOR_VERSION 5
-#define PHP_MINOR_VERSION 2
-#define PHP_RELEASE_VERSION 0
-#define PHP_EXTRA_VERSION -dev
-#define PHP_VERSION 5.2.0-dev
+#define PHP_MINOR_VERSION 1
+#define PHP_RELEASE_VERSION 4
+#define PHP_EXTRA_VERSION 
+#define PHP_VERSION 5.1.4

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

[PHP-CVS] cvs: php-src(PHP_5_1) / configure.in /main php_version.h

2006-05-03 Thread Ilia Alshanetsky

iliaa   Wed May  3 23:31:43 2006 UTC

  Modified files:  (Branch: PHP_5_1)
/php-src/main   php_version.h 
/php-srcconfigure.in 
  Log:
  Back to dev
  
  
http://cvs.php.net/viewcvs.cgi/php-src/main/php_version.h?r1=1.112.2.36r2=1.112.2.37diff_format=u
Index: php-src/main/php_version.h
diff -u php-src/main/php_version.h:1.112.2.36 
php-src/main/php_version.h:1.112.2.37
--- php-src/main/php_version.h:1.112.2.36   Wed May  3 23:30:02 2006
+++ php-src/main/php_version.h  Wed May  3 23:31:43 2006
@@ -2,6 +2,6 @@
 /* edit configure.in to change version number */
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 1
-#define PHP_RELEASE_VERSION 4
-#define PHP_EXTRA_VERSION 
-#define PHP_VERSION 5.1.4
+#define PHP_RELEASE_VERSION 5
+#define PHP_EXTRA_VERSION -dev
+#define PHP_VERSION 5.1.5-dev
http://cvs.php.net/viewcvs.cgi/php-src/configure.in?r1=1.579.2.51r2=1.579.2.52diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.51 php-src/configure.in:1.579.2.52
--- php-src/configure.in:1.579.2.51 Wed May  3 23:30:02 2006
+++ php-src/configure.inWed May  3 23:31:43 2006
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.579.2.51 2006/05/03 23:30:02 iliaa Exp $ -*- 
autoconf -*-
+ ## $Id: configure.in,v 1.579.2.52 2006/05/03 23:31:43 iliaa Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -41,8 +41,8 @@
 
 MAJOR_VERSION=5
 MINOR_VERSION=1
-RELEASE_VERSION=4
-EXTRA_VERSION=
+RELEASE_VERSION=5
+EXTRA_VERSION=-dev
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION
 
 dnl Define where extension directories are located in the configure context

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

[PHP-CVS] cvs: php-src /ext/unicode php_property.h property.c unicode.c

2006-05-03 Thread Andrei Zmievski

andrei  Thu May  4 00:01:34 2006 UTC

  Modified files:  
/php-src/ext/unicodephp_property.h property.c unicode.c 
  Log:
  Change prefix to char_ and rename some functions.
  
  http://cvs.php.net/viewcvs.cgi/php-src/ext/unicode/php_property.h?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/unicode/php_property.h
diff -u php-src/ext/unicode/php_property.h:1.2 
php-src/ext/unicode/php_property.h:1.3
--- php-src/ext/unicode/php_property.h:1.2  Wed May  3 22:03:10 2006
+++ php-src/ext/unicode/php_property.h  Thu May  4 00:01:34 2006
@@ -14,7 +14,7 @@
+--+
 */
 
-/* $Id: php_property.h,v 1.2 2006/05/03 22:03:10 andrei Exp $ */ 
+/* $Id: php_property.h,v 1.3 2006/05/04 00:01:34 andrei Exp $ */ 
 
 #ifndef PHP_PROPERTY_H
 #define PHP_PROPERTY_H
@@ -22,48 +22,56 @@
 /*
  * C/POSIX migration functions
  */
-PHP_FUNCTION(unicode_is_lower);
-PHP_FUNCTION(unicode_is_upper);
-PHP_FUNCTION(unicode_is_digit);
-PHP_FUNCTION(unicode_is_alpha);
-PHP_FUNCTION(unicode_is_alnum);
-PHP_FUNCTION(unicode_is_xdigit);
-PHP_FUNCTION(unicode_is_punct);
-PHP_FUNCTION(unicode_is_graph);
-PHP_FUNCTION(unicode_is_blank);
-PHP_FUNCTION(unicode_is_space);
-PHP_FUNCTION(unicode_is_cntrl);
-PHP_FUNCTION(unicode_is_print);
+PHP_FUNCTION(char_is_lower);
+PHP_FUNCTION(char_is_upper);
+PHP_FUNCTION(char_is_digit);
+PHP_FUNCTION(char_is_alpha);
+PHP_FUNCTION(char_is_alnum);
+PHP_FUNCTION(char_is_xdigit);
+PHP_FUNCTION(char_is_punct);
+PHP_FUNCTION(char_is_graph);
+PHP_FUNCTION(char_is_blank);
+PHP_FUNCTION(char_is_space);
+PHP_FUNCTION(char_is_cntrl);
+PHP_FUNCTION(char_is_print);
 
 /*
  * Additional binary property functions
  */
 
-PHP_FUNCTION(unicode_is_title);
-PHP_FUNCTION(unicode_is_defined);
-PHP_FUNCTION(unicode_is_id_start);
-PHP_FUNCTION(unicode_is_id_part);
-PHP_FUNCTION(unicode_is_id_ignorable);
-PHP_FUNCTION(unicode_is_iso_control);
-PHP_FUNCTION(unicode_is_mirrored);
-PHP_FUNCTION(unicode_is_base);
-PHP_FUNCTION(unicode_is_whitespace);
-PHP_FUNCTION(unicode_is_u_whitespace);
-PHP_FUNCTION(unicode_is_u_alphabetic);
-PHP_FUNCTION(unicode_is_u_uppercase);
-PHP_FUNCTION(unicode_is_u_lowercase);
+PHP_FUNCTION(char_is_defined);
+PHP_FUNCTION(char_is_id_start);
+PHP_FUNCTION(char_is_id_part);
+PHP_FUNCTION(char_is_id_ignorable);
+PHP_FUNCTION(char_is_iso_control);
+PHP_FUNCTION(char_is_mirrored);
+PHP_FUNCTION(char_is_base);
+PHP_FUNCTION(char_is_whitespace);
+PHP_FUNCTION(char_is_alphabetic);
+PHP_FUNCTION(char_is_uppercase);
+PHP_FUNCTION(char_is_lowercase);
+PHP_FUNCTION(char_is_titlecase);
 
 /*
  * Single character property functions.
  */
 
-PHP_FUNCTION(unicode_get_numeric_value);
-PHP_FUNCTION(unicode_get_combining_class);
-PHP_FUNCTION(unicode_get_digit_value);
-PHP_FUNCTION(unicode_get_mirror);
-PHP_FUNCTION(unicode_get_direction);
-PHP_FUNCTION(unicode_get_char_type);
-PHP_FUNCTION(unicode_is_char_valid);
+PHP_FUNCTION(char_get_numeric_value);
+PHP_FUNCTION(char_get_combining_class);
+PHP_FUNCTION(char_get_digit_value);
+PHP_FUNCTION(char_get_mirrored);
+PHP_FUNCTION(char_get_direction);
+PHP_FUNCTION(char_get_type);
+PHP_FUNCTION(char_is_valid);
+
+/*
+ * Other functions
+ */
+
+PHP_FUNCTION(char_to_digit);
+PHP_FUNCTION(char_from_digit);
+PHP_FUNCTION(char_from_name);
+PHP_FUNCTION(char_get_name);
 
 #endif /* PHP_PROPERTY_H */
 
http://cvs.php.net/viewcvs.cgi/php-src/ext/unicode/property.c?r1=1.5r2=1.6diff_format=u
Index: php-src/ext/unicode/property.c
diff -u php-src/ext/unicode/property.c:1.5 php-src/ext/unicode/property.c:1.6
--- php-src/ext/unicode/property.c:1.5  Wed May  3 22:03:10 2006
+++ php-src/ext/unicode/property.c  Thu May  4 00:01:34 2006
@@ -14,7 +14,7 @@
+--+
  */
 
-/* $Id: property.c,v 1.5 2006/05/03 22:03:10 andrei Exp $ */ 
+/* $Id: property.c,v 1.6 2006/05/04 00:01:34 andrei Exp $ */ 
 
 #include php_unicode.h
 
@@ -47,62 +47,62 @@
 
 /* {{{ C/POSIX migration functions */
 
-PHP_FUNCTION(unicode_is_lower)
+PHP_FUNCTION(char_is_lower)
 {
check_property_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, u_islower);
 }
 
-PHP_FUNCTION(unicode_is_upper)
+PHP_FUNCTION(char_is_upper)
 {
check_property_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, u_isupper);
 }
 
-PHP_FUNCTION(unicode_is_digit)
+PHP_FUNCTION(char_is_digit)
 {
check_property_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, u_isdigit);
 }
 
-PHP_FUNCTION(unicode_is_alpha)
+PHP_FUNCTION(char_is_alpha)
 {
check_property_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, u_isalpha);
 }
 
-PHP_FUNCTION(unicode_is_alnum)
+PHP_FUNCTION(char_is_alnum)
 {
check_property_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, u_isalnum);
 }
 
-PHP_FUNCTION(unicode_is_xdigit)
+PHP_FUNCTION(char_is_xdigit)
 {
check_property_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, u_isxdigit);
 }
 
-PHP_FUNCTION(unicode_is_punct)
+PHP_FUNCTION(char_is_punct)
 {

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo package2.xml

2006-05-03 Thread Sara Golemon

pollita Thu May  4 00:21:51 2006 UTC

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/pdopackage2.xml 
  Log:
  Note addition of new class constants
  
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo/package2.xml?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/pdo/package2.xml
diff -u php-src/ext/pdo/package2.xml:1.1.2.2 
php-src/ext/pdo/package2.xml:1.1.2.3
--- php-src/ext/pdo/package2.xml:1.1.2.2Tue May  2 02:32:40 2006
+++ php-src/ext/pdo/package2.xmlThu May  4 00:21:51 2006
@@ -61,6 +61,7 @@
 http://pecl4win.php.net
 
 ** Changes **
+- Added PDO::PARAM_EVT_* family of constants. (Sara)
 - Fixed bug #37167 (PDO segfaults when throwing exception from the
   fetch handler). (Tony)
 - Fixed memory corruption when PDO::FETCH_LAZY mode is being used. (Ilia)

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

[PHP-CVS] cvs: php-src /ext/dom/tests bug37277.phpt

2006-05-03 Thread Rob Richards

rrichards   Wed May  3 08:41:33 2006 UTC

  Added files: 
/php-src/ext/dom/tests  bug37277.phpt 
  Log:
  add test
  

http://cvs.php.net/viewcvs.cgi/php-src/ext/dom/tests/bug37277.phpt?view=markuprev=1.1
Index: php-src/ext/dom/tests/bug37277.phpt
+++ php-src/ext/dom/tests/bug37277.phpt
--TEST--
Bug # 37277 (cloning Dom Documents or Nodes does not work)
--SKIPIF--
?php require_once('skipif.inc'); ?
--FILE--
?php
$dom1 = new DomDocument('1.0', 'UTF-8');

$xml = 'foo /';
$dom1-loadXml($xml);

$node = clone $dom1-documentElement;

$dom2 = new DomDocument('1.0', 'UTF-8');
$dom2-appendChild($dom2-importNode($node-cloneNode(true), TRUE));

print $dom2-saveXML();


?
--EXPECT--

?xml version=1.0 encoding=UTF-8?
foo/

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

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

2006-05-03 Thread Rob Richards

rrichards   Wed May  3 08:44:32 2006 UTC

  Modified files:  (Branch: PHP_5_1)
/php-srcNEWS 
  Log:
  BFN
  re-order news
  
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.541r2=1.2027.2.542diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.541 php-src/NEWS:1.2027.2.542
--- php-src/NEWS:1.2027.2.541   Tue May  2 15:50:04 2006
+++ php-src/NEWSWed May  3 08:44:32 2006
@@ -4,8 +4,9 @@
 - Added capture_peer_cert and capture_peer_cert_chain context options
   for SSL streams. (Wez).
 - Fixed possible crash in highlight_string(). (Dmitry)
-- Fixed bug #35552 (crash when pdo_odbc prepare fails). (Wez).
+- Fixed bug #37277 (cloning Dom Documents or Nodes does not work). (Rob)
 - Fixed bug #36632 (bad error reporting for pdo_odbc exec UPDATE). (Wez).
+- Fixed bug #35552 (crash when pdo_odbc prepare fails). (Wez).
 
 28 Apr 2006, PHP 5.1.3
 - Updated bundled PCRE library to version 6.6. (Andrei)

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

[PHP-CVS] cvs: php-src /ext/dom attr.c element.c php_dom.c

2006-05-03 Thread Rob Richards

rrichards   Wed May  3 08:40:52 2006 UTC

  Modified files:  
/php-src/ext/domphp_dom.c attr.c element.c 
  Log:
  Fix bug #37277 (cloning Dom Documents or Nodes does not work)
  Proper fix for bug #36859
  
http://cvs.php.net/viewcvs.cgi/php-src/ext/dom/php_dom.c?r1=1.93r2=1.94diff_format=u
Index: php-src/ext/dom/php_dom.c
diff -u php-src/ext/dom/php_dom.c:1.93 php-src/ext/dom/php_dom.c:1.94
--- php-src/ext/dom/php_dom.c:1.93  Wed Mar 29 15:08:52 2006
+++ php-src/ext/dom/php_dom.c   Wed May  3 08:40:52 2006
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: php_dom.c,v 1.93 2006/03/29 15:08:52 tony2001 Exp $ */
+/* $Id: php_dom.c,v 1.94 2006/05/03 08:40:52 rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -460,7 +460,6 @@
retval.handle = zend_objects_store_put(new_object, obj-dtor, 
obj-free_storage, obj-clone TSRMLS_CC);
intern = (dom_object *) new_object;
intern-handle = retval.handle;
-   intern-ptr = NULL;
retval.handlers = Z_OBJ_HT_P(zobject);

old_object = (dom_object *) obj-object;
http://cvs.php.net/viewcvs.cgi/php-src/ext/dom/attr.c?r1=1.22r2=1.23diff_format=u
Index: php-src/ext/dom/attr.c
diff -u php-src/ext/dom/attr.c:1.22 php-src/ext/dom/attr.c:1.23
--- php-src/ext/dom/attr.c:1.22 Mon Feb 13 10:23:57 2006
+++ php-src/ext/dom/attr.c  Wed May  3 08:40:52 2006
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: attr.c,v 1.22 2006/02/13 10:23:57 dmitry Exp $ */
+/* $Id: attr.c,v 1.23 2006/05/03 08:40:52 rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -77,7 +77,7 @@
}
 
if (intern != NULL) {
-   oldnode = (xmlNodePtr)intern-ptr;
+   oldnode = dom_object_get_node(intern);
if (oldnode != NULL) {
php_libxml_node_free_resource(oldnode  TSRMLS_CC);
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/dom/element.c?r1=1.42r2=1.43diff_format=u
Index: php-src/ext/dom/element.c
diff -u php-src/ext/dom/element.c:1.42 php-src/ext/dom/element.c:1.43
--- php-src/ext/dom/element.c:1.42  Mon Feb 13 10:23:57 2006
+++ php-src/ext/dom/element.c   Wed May  3 08:40:52 2006
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: element.c,v 1.42 2006/02/13 10:23:57 dmitry Exp $ */
+/* $Id: element.c,v 1.43 2006/05/03 08:40:52 rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -128,7 +128,7 @@
 
intern = (dom_object *)zend_object_store_get_object(id TSRMLS_CC);
if (intern != NULL) {
-   oldnode = (xmlNodePtr)intern-ptr;
+   oldnode = dom_object_get_node(intern);
if (oldnode != NULL) {
php_libxml_node_free_resource(oldnode  TSRMLS_CC);
}

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

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/dom attr.c element.c php_dom.c /ext/dom/tests bug37277.phpt

2006-05-03 Thread Rob Richards

rrichards   Wed May  3 08:43:04 2006 UTC

  Added files: (Branch: PHP_5_1)
/php-src/ext/dom/tests  bug37277.phpt 

  Modified files:  
/php-src/ext/domattr.c element.c php_dom.c 
  Log:
  Fix bug #37277 (cloning Dom Documents or Nodes does not work)
  Proper fix for bug #36859
  add test
  
http://cvs.php.net/viewcvs.cgi/php-src/ext/dom/attr.c?r1=1.18.2.1r2=1.18.2.2diff_format=u
Index: php-src/ext/dom/attr.c
diff -u php-src/ext/dom/attr.c:1.18.2.1 php-src/ext/dom/attr.c:1.18.2.2
--- php-src/ext/dom/attr.c:1.18.2.1 Sun Jan  1 12:50:06 2006
+++ php-src/ext/dom/attr.c  Wed May  3 08:43:04 2006
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: attr.c,v 1.18.2.1 2006/01/01 12:50:06 sniper Exp $ */
+/* $Id: attr.c,v 1.18.2.2 2006/05/03 08:43:04 rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -77,7 +77,7 @@
}
 
if (intern != NULL) {
-   oldnode = (xmlNodePtr)intern-ptr;
+   oldnode = dom_object_get_node(intern);
if (oldnode != NULL) {
php_libxml_node_free_resource(oldnode  TSRMLS_CC);
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/dom/element.c?r1=1.36.2.3r2=1.36.2.4diff_format=u
Index: php-src/ext/dom/element.c
diff -u php-src/ext/dom/element.c:1.36.2.3 php-src/ext/dom/element.c:1.36.2.4
--- php-src/ext/dom/element.c:1.36.2.3  Sun Jan  1 12:50:06 2006
+++ php-src/ext/dom/element.c   Wed May  3 08:43:04 2006
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: element.c,v 1.36.2.3 2006/01/01 12:50:06 sniper Exp $ */
+/* $Id: element.c,v 1.36.2.4 2006/05/03 08:43:04 rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -128,7 +128,7 @@
 
intern = (dom_object *)zend_object_store_get_object(id TSRMLS_CC);
if (intern != NULL) {
-   oldnode = (xmlNodePtr)intern-ptr;
+   oldnode = dom_object_get_node(intern);
if (oldnode != NULL) {
php_libxml_node_free_resource(oldnode  TSRMLS_CC);
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/dom/php_dom.c?r1=1.73.2.11r2=1.73.2.12diff_format=u
Index: php-src/ext/dom/php_dom.c
diff -u php-src/ext/dom/php_dom.c:1.73.2.11 php-src/ext/dom/php_dom.c:1.73.2.12
--- php-src/ext/dom/php_dom.c:1.73.2.11 Wed Mar 29 14:28:41 2006
+++ php-src/ext/dom/php_dom.c   Wed May  3 08:43:04 2006
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: php_dom.c,v 1.73.2.11 2006/03/29 14:28:41 tony2001 Exp $ */
+/* $Id: php_dom.c,v 1.73.2.12 2006/05/03 08:43:04 rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -443,7 +443,6 @@
retval.handle = zend_objects_store_put(new_object, obj-dtor, 
obj-free_storage, obj-clone TSRMLS_CC);
intern = (dom_object *) new_object;
intern-handle = retval.handle;
-   intern-ptr = NULL;
retval.handlers = Z_OBJ_HT_P(zobject);

old_object = (dom_object *) obj-object;

http://cvs.php.net/viewcvs.cgi/php-src/ext/dom/tests/bug37277.phpt?view=markuprev=1.1
Index: php-src/ext/dom/tests/bug37277.phpt
+++ php-src/ext/dom/tests/bug37277.phpt
--TEST--
Bug # 37277 (cloning Dom Documents or Nodes does not work)
--SKIPIF--
?php require_once('skipif.inc'); ?
--FILE--
?php
$dom1 = new DomDocument('1.0', 'UTF-8');

$xml = 'foo /';
$dom1-loadXml($xml);

$node = clone $dom1-documentElement;

$dom2 = new DomDocument('1.0', 'UTF-8');
$dom2-appendChild($dom2-importNode($node-cloneNode(true), TRUE));

print $dom2-saveXML();


?
--EXPECT--

?xml version=1.0 encoding=UTF-8?
foo/

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

40 matches

Mail list logo