date:20080128

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

2008-01-28 Thread changelog

changelog   Tue Jan 29 01:31:29 2008 UTC

  Modified files:  
/ZendEngine2ChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1227r2=1.1228diff_format=u
Index: ZendEngine2/ChangeLog
diff -u ZendEngine2/ChangeLog:1.1227 ZendEngine2/ChangeLog:1.1228
--- ZendEngine2/ChangeLog:1.1227Fri Jan 25 01:31:35 2008
+++ ZendEngine2/ChangeLog   Tue Jan 29 01:31:29 2008
@@ -1,3 +1,18 @@
+2008-01-28  Stanislav Malyshev  [EMAIL PROTECTED]
+
+* zend_execute.h
+  zend_execute.h:
+  fix type
+
+2008-01-28  Derick Rethans  [EMAIL PROTECTED]
+
+* (PHP_5_3)
+  zend.c:
+  - MFH: Send the debug info to stderr instead of stdout.
+
+* zend.c:
+  - Send the debug info to stderr instead of stdout.
+
 2008-01-24  Dmitry Stogov  [EMAIL PROTECTED]
 
 * zend_API.h
@@ -20990,7 +21005,7 @@
 2003-06-10  Jani Taskinen  [EMAIL PROTECTED]
 
 * zend_multiply.h:
-  - Missing $Id: ChangeLog,v 1.1227 2008/01/25 01:31:35 changelog Exp $ tag
+  - Missing $Id: ChangeLog,v 1.1228 2008/01/29 01:31:29 changelog Exp $ tag
 
 2003-06-10  James Cox  [EMAIL PROTECTED]
 
@@ -22714,7 +22729,7 @@
   zend_types.h
   zend_variables.c
   zend_variables.h:
-  - Added some missing CVS $Id: ChangeLog,v 1.1227 2008/01/25 01:31:35 
changelog Exp $ tags, headers and footers.
+  - Added some missing CVS $Id: ChangeLog,v 1.1228 2008/01/29 01:31:29 
changelog Exp $ tags, headers and footers.
 
 2003-01-30  Ilia Alshanetsky  [EMAIL PROTECTED]

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

2008-01-28 Thread Dmitry Stogov

dmitry  Mon Jan 28 08:55:19 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcNEWS 
  Log:
  Better message
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.90r2=1.2027.2.547.2.965.2.91diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.90 
php-src/NEWS:1.2027.2.547.2.965.2.91
--- php-src/NEWS:1.2027.2.547.2.965.2.90Sun Jan 27 18:07:20 2008
+++ php-src/NEWSMon Jan 28 08:55:19 2008
@@ -50,6 +50,8 @@
 
 - Removed the experimental RPL (master/slave) functions from mysqli. (Andrey)
 
+- Improved engine stack implementation for better performance and stability.
+  (Dmitry)
 - Improved php.ini handling: (Jani)
   . Added .htaccess style user-defined php.ini files support for CGI/FastCGI
   . Added support for special [PATH=/opt/httpd/www.example.com/] and 
@@ -82,7 +84,6 @@
   (Dmitry, Pierre)
 - Added lcfirst() function. (David C)
 
-- Changed EG(argument_stack) implementation. (Dmitry)
 - Changed exception handling. Now each op_array doesn't contain
   ZEND_HANDLE_EXCEPTION opcode in the end. (Dmitry)
 

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

Re: [PHP-CVS] cvs: php-src /ext/mysqlnd mysqlnd_result.c

2008-01-28 Thread Andrey Hristov

 Hi Rob,
sorry - my fault. I saw the error in another mysqlnd build on Windows
but seems I forgot to port it back :(

Andrey

Rob Richards wrote:
 rrichards Fri Jan 25 15:54:31 2008 UTC
 
   Modified files:  
 /php-src/ext/mysqlnd  mysqlnd_result.c 
   Log:
   fix win32 compile
   
 http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_result.c?r1=1.10r2=1.11diff_format=u
 Index: php-src/ext/mysqlnd/mysqlnd_result.c
 diff -u php-src/ext/mysqlnd/mysqlnd_result.c:1.10 
 php-src/ext/mysqlnd/mysqlnd_result.c:1.11
 --- php-src/ext/mysqlnd/mysqlnd_result.c:1.10 Wed Jan 23 19:09:33 2008
 +++ php-src/ext/mysqlnd/mysqlnd_result.c  Fri Jan 25 15:54:31 2008
 @@ -18,7 +18,7 @@
+--+
  */
  
 -/* $Id: mysqlnd_result.c,v 1.10 2008/01/23 19:09:33 andrey Exp $ */
 +/* $Id: mysqlnd_result.c,v 1.11 2008/01/25 15:54:31 rrichards Exp $ */
  #include php.h
  #include mysqlnd.h
  #include mysqlnd_wireprotocol.h
 @@ -766,9 +766,9 @@
   if (result-data-data_cursor 
   (result-data-data_cursor - result-data-data)  
 result-data-row_count)
   {
 - ret = mnd_malloc(result-field_count * sizeof(char *));
 -
   zval **current_row = *result-data-data_cursor;
 +
 + ret = mnd_malloc(result-field_count * sizeof(char *));
   for (i = 0; i  result-field_count; i++) {
   zval *data = current_row[i];
   if (Z_TYPE_P(data) != IS_NULL) {
 

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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysql php_mysql_structs.h

2008-01-28 Thread Nuno Lopes

nlopess Mon Jan 28 11:16:00 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mysql  php_mysql_structs.h 
  Log:
  remove unused PHP_MYSQL_API macro
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql_structs.h?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/mysql/php_mysql_structs.h
diff -u php-src/ext/mysql/php_mysql_structs.h:1.1.2.2 
php-src/ext/mysql/php_mysql_structs.h:1.1.2.3
--- php-src/ext/mysql/php_mysql_structs.h:1.1.2.2   Mon Dec 31 07:17:10 2007
+++ php-src/ext/mysql/php_mysql_structs.h   Mon Jan 28 11:16:00 2008
@@ -18,17 +18,11 @@
 */
 
 
-/* $Id: php_mysql_structs.h,v 1.1.2.2 2007/12/31 07:17:10 sebastian Exp $ */
+/* $Id: php_mysql_structs.h,v 1.1.2.3 2008/01/28 11:16:00 nlopess Exp $ */
 
 #ifndef PHP_MYSQL_STRUCTS_H
 #define PHP_MYSQL_STRUCTS_H
 
-#ifdef PHP_WIN32
-#define PHP_MYSQL_API __declspec(dllexport)
-#else
-#define PHP_MYSQL_API
-#endif
-
 #ifdef ZTS
 #include TSRM.h
 #endif

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

[PHP-CVS] cvs: php-src /ext/mysql php_mysql_structs.h

2008-01-28 Thread Nuno Lopes

nlopess Mon Jan 28 11:16:37 2008 UTC

  Modified files:  
/php-src/ext/mysql  php_mysql_structs.h 
  Log:
  remove unused PHP_MYSQL_API macro
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql_structs.h?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/mysql/php_mysql_structs.h
diff -u php-src/ext/mysql/php_mysql_structs.h:1.3 
php-src/ext/mysql/php_mysql_structs.h:1.4
--- php-src/ext/mysql/php_mysql_structs.h:1.3   Mon Dec 31 07:12:11 2007
+++ php-src/ext/mysql/php_mysql_structs.h   Mon Jan 28 11:16:37 2008
@@ -17,17 +17,11 @@
+--+
 */
 
-/* $Id: php_mysql_structs.h,v 1.3 2007/12/31 07:12:11 sebastian Exp $ */
+/* $Id: php_mysql_structs.h,v 1.4 2008/01/28 11:16:37 nlopess Exp $ */
 
 #ifndef PHP_MYSQL_STRUCTS_H
 #define PHP_MYSQL_STRUCTS_H
 
-#ifdef PHP_WIN32
-#define PHP_MYSQL_API __declspec(dllexport)
-#else
-#define PHP_MYSQL_API
-#endif
-
 #if HAVE_MYSQL
 
 #ifdef ZTS

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

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

2008-01-28 Thread Hannes Magnusson

bjori   Mon Jan 28 11:34:23 2008 UTC

  Modified files:  
/php-srcNEWS 
  Log:
  Remove items already in 5.3
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2155r2=1.2156diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2155 php-src/NEWS:1.2156
--- php-src/NEWS:1.2155 Tue Jan 22 19:51:11 2008
+++ php-src/NEWSMon Jan 28 11:34:23 2008
@@ -33,10 +33,6 @@
 - Moved extensions to PECL:
   . ext/ncurses (Hartmut)
 
-- Improved ext/openssl (Dmitry)
-  . Added support for OpenSSL digest functions
-  . Added support for OpenSSL cipher functions
-  . Added access to internal values of DSA, RSA and DH keys
 - Improved ext/zlib; re-implemented non-file related functionality. (Mike)
 - Improved output layer; see README.NEW-OUTPUT-API for internals. (Mike)
 - Improved ext/mhash: (Mike)
@@ -55,7 +51,6 @@
 set params during context creation. (Sara)
   . context and binary_pipes params in other_options arg. (Sara)
   . stream_resolve_include_path(). (Sara)
-- Added gmp_testbit() function. (Tony)
 - Added shm_has_var() function. (Mike)
 - Added str_getcsv() function. (Sara)
 - Added ext/hash support to ext/session's ID generator. (Sara)

-- 
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_3) /ext/libxml php_libxml2.def

2008-01-28 Thread Steph Fox


Hi Rob,


He must not have updated the zip.zip file.
If you actually download a snap you will see they are builing with .31


As I said - they haven't built in ages. The last build was on the 21st. And 
until this moment I thought the stuff in php-dev on Edin's site was used in 
the build directly :)



Sorry to have not mentioned this change earlier.


No worries - I realized what must've happened, but couldn't remember 
off-hand which bits and pieces need updating alonga libxml so tried to save 
myself some angst by going the Edin route.


I was waiting on Edin releasing the 4.4.8 windows build first (and for 
some reason he hasn't done it yet).


He's up to the eyeballs in it, is why.

Edin - when you get around to updating zip.zip/the phpdev files, please 
delete everything GTK-related? It breaks the current PHP-GTK build to have 
those libs around.


Thanks,

- Steph



Rob

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

Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/libxml php_libxml2.def

2008-01-28 Thread Steph Fox

Erm - I literally downloaded zip.zip less than an hour before I mailed you. 
The lib in there has NOT been updated, take a look for yourself at 
libxml/xmlversion.h where it clearly states:


#define LIBXML_DOTTED_VERSION 2.6.26

Snaps hasn't worked in ages, but that was originally due to another issue 
which has since been fixed.


- Steph

- Original Message - 
From: Rob Richards [EMAIL PROTECTED]

To: Steph Fox [EMAIL PROTECTED]
Cc: php-cvs@lists.php.net; Edin Kadribasic [EMAIL PROTECTED]
Sent: Monday, January 28, 2008 2:22 PM
Subject: Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/libxml php_libxml2.def



Hey Steph,

You need to download the new libs (libxml2 2.6.31 and libxslt 1.1.22). 
Edin actually updated to .31 on the 11th.

http://ctindustries.net/libxml/

Rob

Steph Fox wrote:

Hi Rob,

Unfortunately Edin's library collection - which I just went and updated 
locally because of this - still carries libxml 2.6.26, not 2.6.27. That 
presumably means snaps is also broken...


php5ts.dll.def : error LNK2001: unresolved external symbol 
xmlXPathCompiledEvalToBoolean

Release_TS\php5ts.lib : fatal error LNK1120: 1 unresolved externals
LINK : fatal error LNK1141: failure during build of exports file

Wouldn't you think it'd tell me _before_ completing a 40-minute build? 
sigh /


- Steph

- Original Message - From: Rob Richards [EMAIL PROTECTED]
To: php-cvs@lists.php.net
Sent: Sunday, January 27, 2008 4:33 PM
Subject: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/libxml php_libxml2.def



rrichards Sun Jan 27 16:33:01 2008 UTC

 Modified files:  (Branch: PHP_5_3)
   /php-src/ext/libxml php_libxml2.def
 Log:
 MFH: add missing export









--
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_3) /main SAPI.c

2008-01-28 Thread Scott MacVicar

scottmacMon Jan 28 16:09:08 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/main   SAPI.c 
  Log:
  MFH: Fixed bug #43954 (Memory leak when sending the same HTTP status code 
more than once.)
  
http://cvs.php.net/viewvc.cgi/php-src/main/SAPI.c?r1=1.202.2.7.2.15.2.2r2=1.202.2.7.2.15.2.3diff_format=u
Index: php-src/main/SAPI.c
diff -u php-src/main/SAPI.c:1.202.2.7.2.15.2.2 
php-src/main/SAPI.c:1.202.2.7.2.15.2.3
--- php-src/main/SAPI.c:1.202.2.7.2.15.2.2  Mon Dec 31 07:17:17 2007
+++ php-src/main/SAPI.c Mon Jan 28 16:09:08 2008
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: SAPI.c,v 1.202.2.7.2.15.2.2 2007/12/31 07:17:17 sebastian Exp $ */
+/* $Id: SAPI.c,v 1.202.2.7.2.15.2.3 2008/01/28 16:09:08 scottmac Exp $ */
 
 #include ctype.h
 #include sys/stat.h
@@ -593,6 +593,10 @@
 !strncasecmp(header_line, HTTP/, 5)) {
/* filter out the response code */

sapi_update_response_code(sapi_extract_response_code(header_line) TSRMLS_CC);
+   /* sapi_update_response_code doesn't free the status line if 
the code didn't change */
+   if (SG(sapi_headers).http_status_line) {
+   efree(SG(sapi_headers).http_status_line);
+   }
SG(sapi_headers).http_status_line = header_line;
return SUCCESS;
} else {

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

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

2008-01-28 Thread Scott MacVicar

scottmacMon Jan 28 16:08:15 2008 UTC

  Modified files:  
/php-src/main   SAPI.c 
  Log:
  Fixed bug #43954 (Memory leak when sending the same HTTP status code more 
than once.)
  
http://cvs.php.net/viewvc.cgi/php-src/main/SAPI.c?r1=1.228r2=1.229diff_format=u
Index: php-src/main/SAPI.c
diff -u php-src/main/SAPI.c:1.228 php-src/main/SAPI.c:1.229
--- php-src/main/SAPI.c:1.228   Mon Dec 31 07:12:18 2007
+++ php-src/main/SAPI.c Mon Jan 28 16:08:14 2008
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: SAPI.c,v 1.228 2007/12/31 07:12:18 sebastian Exp $ */
+/* $Id: SAPI.c,v 1.229 2008/01/28 16:08:14 scottmac Exp $ */
 
 #include ctype.h
 #include sys/stat.h
@@ -616,6 +616,10 @@
 !strncasecmp(header_line, HTTP/, 5)) {
/* filter out the response code */

sapi_update_response_code(sapi_extract_response_code(header_line) TSRMLS_CC);
+   /* sapi_update_response_code doesn't free the status line if 
the code didn't change */
+   if (SG(sapi_headers).http_status_line) {
+   efree(SG(sapi_headers).http_status_line);
+   }
SG(sapi_headers).http_status_line = header_line;
return SUCCESS;
} 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_2) / NEWS /main SAPI.c

2008-01-28 Thread Scott MacVicar

scottmacMon Jan 28 16:12:55 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
/php-src/main   SAPI.c 
  Log:
  MFH: Fixed bug #43954 (Memory leak when sending the same HTTP status code 
more than once.)
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1060r2=1.2027.2.547.2.1061diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1060 php-src/NEWS:1.2027.2.547.2.1061
--- php-src/NEWS:1.2027.2.547.2.1060Sat Jan 26 16:26:33 2008
+++ php-src/NEWSMon Jan 28 16:12:54 2008
@@ -8,6 +8,8 @@
   which to group by data is specified. (Ilia)
 - Upgraded PCRE to version 7.5 (Nuno)
 
+- Fixed bug #43954 (Memory leak when sending the same HTTP status code
+  multiple times). (Scott)
 - Fixed faulty fix for bug #40189 (endless loop in zlib.inflate stream 
filter). 
   (Greg)
 - Fixed bug #43912 (Interbase column names are truncated to 31 characters).
http://cvs.php.net/viewvc.cgi/php-src/main/SAPI.c?r1=1.202.2.7.2.17r2=1.202.2.7.2.18diff_format=u
Index: php-src/main/SAPI.c
diff -u php-src/main/SAPI.c:1.202.2.7.2.17 php-src/main/SAPI.c:1.202.2.7.2.18
--- php-src/main/SAPI.c:1.202.2.7.2.17  Mon Dec 31 07:20:14 2007
+++ php-src/main/SAPI.c Mon Jan 28 16:12:55 2008
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: SAPI.c,v 1.202.2.7.2.17 2007/12/31 07:20:14 sebastian Exp $ */
+/* $Id: SAPI.c,v 1.202.2.7.2.18 2008/01/28 16:12:55 scottmac Exp $ */
 
 #include ctype.h
 #include sys/stat.h
@@ -593,6 +593,10 @@
 !strncasecmp(header_line, HTTP/, 5)) {
/* filter out the response code */

sapi_update_response_code(sapi_extract_response_code(header_line) TSRMLS_CC);
+   /* sapi_update_response_code doesn't free the status line if 
the code didn't change */
+   if (SG(sapi_headers).http_status_line) {
+   efree(SG(sapi_headers).http_status_line);
+   }
SG(sapi_headers).http_status_line = header_line;
return SUCCESS;
} else {

-- 
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_3) /ext/libxml php_libxml2.def

2008-01-28 Thread Rob Richards


Steph Fox wrote:
Erm - I literally downloaded zip.zip less than an hour before I mailed 
you. The lib in there has NOT been updated, take a look for yourself at 
libxml/xmlversion.h where it clearly states:


#define LIBXML_DOTTED_VERSION 2.6.26

He must not have updated the zip.zip file.
If you actually download a snap you will see they are builing with .31

The change to the .def file was Edin's builds not being able to build a 
shared xsl extension (because the export was missing). I had tested with 
 statically built xsl which is why I missed it those few weeks back.




Snaps hasn't worked in ages, but that was originally due to another 
issue which has since been fixed.


Sorry to have not mentioned this change earlier. I was waiting on Edin 
releasing the 4.4.8 windows build first (and for some reason he hasn't 
done it yet).


Rob

--
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_3) /ext/libxml php_libxml2.def

2008-01-28 Thread Steph Fox


Hi Rob,

Unfortunately Edin's library collection - which I just went and updated 
locally because of this - still carries libxml 2.6.26, not 2.6.27. That 
presumably means snaps is also broken...


php5ts.dll.def : error LNK2001: unresolved external symbol 
xmlXPathCompiledEvalToBoolean

Release_TS\php5ts.lib : fatal error LNK1120: 1 unresolved externals
LINK : fatal error LNK1141: failure during build of exports file

Wouldn't you think it'd tell me _before_ completing a 40-minute build? sigh 
/


- Steph

- Original Message - 
From: Rob Richards [EMAIL PROTECTED]

To: php-cvs@lists.php.net
Sent: Sunday, January 27, 2008 4:33 PM
Subject: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/libxml php_libxml2.def



rrichards Sun Jan 27 16:33:01 2008 UTC

 Modified files:  (Branch: PHP_5_3)
   /php-src/ext/libxml php_libxml2.def
 Log:
 MFH: add missing export








--
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_3) / NEWS /ext/date php_date.c

2008-01-28 Thread Derick Rethans

derick  Mon Jan 28 21:12:42 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcNEWS 
/php-src/ext/date   php_date.c 
  Log:
  - MFH: Added two optional parameters to timezone_transitions_get() /
DateTimeZone::getTranstions() to limit the range of transitions being
returned.
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.92r2=1.2027.2.547.2.965.2.93diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.92 
php-src/NEWS:1.2027.2.547.2.965.2.93
--- php-src/NEWS:1.2027.2.547.2.965.2.92Mon Jan 28 20:30:50 2008
+++ php-src/NEWSMon Jan 28 21:12:41 2008
@@ -20,6 +20,9 @@
 without invoking the date parser. (Scott)
   * date_timestamp_get() / DateTime::getTimestamp() to retrieve the Unix
 timestamp belonging to a date object.
+  * two optional parameters to timezone_transitions_get() /
+DateTimeZone::getTranstions() to limit the range of transitions being
+returned.
 
 - Added ability to store associative infor with objects in SplObjectStorage.
   (Marcus)
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.51.2.15r2=1.43.2.45.2.51.2.16diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.43.2.45.2.51.2.15 
php-src/ext/date/php_date.c:1.43.2.45.2.51.2.16
--- php-src/ext/date/php_date.c:1.43.2.45.2.51.2.15 Mon Jan 28 20:35:17 2008
+++ php-src/ext/date/php_date.c Mon Jan 28 21:12:41 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_date.c,v 1.43.2.45.2.51.2.15 2008/01/28 20:35:17 derick Exp $ */
+/* $Id: php_date.c,v 1.43.2.45.2.51.2.16 2008/01/28 21:12:41 derick Exp $ */
 
 #include php.h
 #include php_streams.h
@@ -2448,16 +2448,17 @@
 }
 /* }}} */
 
-/* {{{ proto array timezone_transitions_get(DateTimeZone object)
-   Returns numeracilly indexed array containing associative array for all 
transitions for the timezone.
+/* {{{ proto array timezone_transitions_get(DateTimeZone object [, long 
timestamp_begin [, long timestamp_end ]])
+   Returns numerically indexed array containing associative array for all 
transitions in the specified range for the timezone.
 */
 PHP_FUNCTION(timezone_transitions_get)
 {
zval*object, *element;
php_timezone_obj*tzobj;
-   int  i;
+   int  i, first = 1;
+   long timestamp_begin = LONG_MIN, timestamp_end = 
LONG_MAX;
 
-   if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), 
O, object, date_ce_timezone) == FAILURE) {
+   if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), 
O|ll, object, date_ce_timezone, timestamp_begin, timestamp_end) == 
FAILURE) {
RETURN_FALSE;
}
tzobj = (php_timezone_obj *) zend_object_store_get_object(object 
TSRMLS_CC);
@@ -2468,15 +2469,30 @@
 
array_init(return_value);
for (i = 0; i  tzobj-tzi.tz-timecnt; ++i) {
-   MAKE_STD_ZVAL(element);
-   array_init(element);
-   add_assoc_long(element, ts, tzobj-tzi.tz-trans[i]);
-   add_assoc_string(element, time, 
php_format_date(DATE_FORMAT_ISO8601, 13, tzobj-tzi.tz-trans[i], 0 TSRMLS_CC), 
0);
-   add_assoc_long(element, offset, 
tzobj-tzi.tz-type[tzobj-tzi.tz-trans_idx[i]].offset);
-   add_assoc_bool(element, isdst,  
tzobj-tzi.tz-type[tzobj-tzi.tz-trans_idx[i]].isdst);
-   add_assoc_string(element, abbr, 
tzobj-tzi.tz-timezone_abbr[tzobj-tzi.tz-type[tzobj-tzi.tz-trans_idx[i]].abbr_idx],
 1);
+   if (tzobj-tzi.tz-trans[i] = timestamp_begin  
tzobj-tzi.tz-trans[i]  timestamp_end) {
+   if (first  timestamp_begin != LONG_MIN  i  0  
timestamp_begin != tzobj-tzi.tz-trans[i])
+   {
+   MAKE_STD_ZVAL(element);
+   array_init(element);
+   add_assoc_long(element, ts, 
timestamp_begin);
+   add_assoc_string(element, time, 
php_format_date(DATE_FORMAT_ISO8601, 13, timestamp_begin, 0 TSRMLS_CC), 0);
+   add_assoc_long(element, offset, 
tzobj-tzi.tz-type[tzobj-tzi.tz-trans_idx[i-1]].offset);
+   add_assoc_bool(element, isdst,  
tzobj-tzi.tz-type[tzobj-tzi.tz-trans_idx[i-1]].isdst);
+   add_assoc_string(element, abbr, 
tzobj-tzi.tz-timezone_abbr[tzobj-tzi.tz-type[tzobj-tzi.tz-trans_idx[i-1]].abbr_idx],
 1);
 
-   add_next_index_zval(return_value, element);
+   add_next_index_zval(return_value, element);
+   }
+   MAKE_STD_ZVAL(element);
+   array_init(element);
+   add_assoc_long(element, ts, 
tzobj-tzi.tz-trans[i]);
+

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

2008-01-28 Thread Derick Rethans

derick  Mon Jan 28 21:12:24 2008 UTC

  Modified files:  
/php-src/ext/date   php_date.c 
  Log:
  - Added two optional parameters to timezone_transitions_get() /
DateTimeZone::getTranstions() to limit the range of transitions being
returned.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.161r2=1.162diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.161 php-src/ext/date/php_date.c:1.162
--- php-src/ext/date/php_date.c:1.161   Mon Jan 28 20:36:04 2008
+++ php-src/ext/date/php_date.c Mon Jan 28 21:12:24 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_date.c,v 1.161 2008/01/28 20:36:04 derick Exp $ */
+/* $Id: php_date.c,v 1.162 2008/01/28 21:12:24 derick Exp $ */
 
 #include php.h
 #include php_streams.h
@@ -2606,16 +2606,17 @@
 }
 /* }}} */
 
-/* {{{ proto array timezone_transitions_get(DateTimeZone object)
-   Returns numeracilly indexed array containing associative array for all 
transitions for the timezone.
+/* {{{ proto array timezone_transitions_get(DateTimeZone object [, long 
timestamp_begin [, long timestamp_end ]])
+   Returns numerically indexed array containing associative array for all 
transitions in the specified range for the timezone.
 */
 PHP_FUNCTION(timezone_transitions_get)
 {
zval*object, *element;
php_timezone_obj*tzobj;
-   int  i;
+   int  i, first = 1;
+   long timestamp_begin = LONG_MIN, timestamp_end = 
LONG_MAX;
 
-   if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), 
O, object, date_ce_timezone) == FAILURE) {
+   if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), 
O|ll, object, date_ce_timezone, timestamp_begin, timestamp_end) == 
FAILURE) {
RETURN_FALSE;
}
tzobj = (php_timezone_obj *) zend_object_store_get_object(object 
TSRMLS_CC);
@@ -2626,19 +2627,38 @@
 
array_init(return_value);
for (i = 0; i  tzobj-tzi.tz-timecnt; ++i) {
-   MAKE_STD_ZVAL(element);
-   array_init(element);
-   add_ascii_assoc_long(element, ts, 
tzobj-tzi.tz-trans[i]);
-   if (UG(unicode)) {
-   add_ascii_assoc_unicode(element, time, (UChar*) 
php_format_date(DATE_FORMAT_ISO8601, 13, tzobj-tzi.tz-trans[i], 0 TSRMLS_CC), 
0);
-   } else {
-   add_assoc_string(element, time, 
php_format_date(DATE_FORMAT_ISO8601, 13, tzobj-tzi.tz-trans[i], 0 TSRMLS_CC), 
0);
-   }
-   add_ascii_assoc_long(element, offset, 
tzobj-tzi.tz-type[tzobj-tzi.tz-trans_idx[i]].offset);
-   add_ascii_assoc_bool(element, isdst,  
tzobj-tzi.tz-type[tzobj-tzi.tz-trans_idx[i]].isdst);
-   add_ascii_assoc_ascii_string(element, abbr, 
tzobj-tzi.tz-timezone_abbr[tzobj-tzi.tz-type[tzobj-tzi.tz-trans_idx[i]].abbr_idx],
 1);
+   if (tzobj-tzi.tz-trans[i] = timestamp_begin  
tzobj-tzi.tz-trans[i]  timestamp_end) {
+   if (first  timestamp_begin != LONG_MIN  i  0  
timestamp_begin != tzobj-tzi.tz-trans[i])
+   {
+   MAKE_STD_ZVAL(element);
+   array_init(element);
+   add_ascii_assoc_long(element, ts, 
timestamp_begin);
+   if (UG(unicode)) {
+   add_ascii_assoc_unicode(element, 
time, (UChar*) php_format_date(DATE_FORMAT_ISO8601, 13, timestamp_begin, 0 
TSRMLS_CC), 0);
+   } else {
+   add_assoc_string(element, time, 
php_format_date(DATE_FORMAT_ISO8601, 13, timestamp_begin, 0 TSRMLS_CC), 0);
+   }
+   add_ascii_assoc_long(element, offset, 
tzobj-tzi.tz-type[tzobj-tzi.tz-trans_idx[i-1]].offset);
+   add_ascii_assoc_bool(element, isdst,  
tzobj-tzi.tz-type[tzobj-tzi.tz-trans_idx[i-1]].isdst);
+   add_ascii_assoc_ascii_string(element, abbr, 
tzobj-tzi.tz-timezone_abbr[tzobj-tzi.tz-type[tzobj-tzi.tz-trans_idx[i-1]].abbr_idx],
 1);
+
+   add_next_index_zval(return_value, element);
+   }
+   MAKE_STD_ZVAL(element);
+   array_init(element);
+   add_ascii_assoc_long(element, ts, 
tzobj-tzi.tz-trans[i]);
+   if (UG(unicode)) {
+   add_ascii_assoc_unicode(element, time, 
(UChar*) php_format_date(DATE_FORMAT_ISO8601, 13, tzobj-tzi.tz-trans[i], 0 
TSRMLS_CC), 0);
+   } else {
+   add_assoc_string(element, time, 
php_format_date(DATE_FORMAT_ISO8601, 13, tzobj-tzi.tz-trans[i], 0

[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/date php_date.c php_date.h

2008-01-28 Thread Derick Rethans

derick  Mon Jan 28 20:30:51 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcNEWS 
/php-src/ext/date   php_date.c php_date.h 
  Log:
  - MFH: Added date_timestamp_get() / DateTime::getTimestamp() to retrieve the
Unix timestamp belonging to a date object.
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.91r2=1.2027.2.547.2.965.2.92diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.91 
php-src/NEWS:1.2027.2.547.2.965.2.92
--- php-src/NEWS:1.2027.2.547.2.965.2.91Mon Jan 28 08:55:19 2008
+++ php-src/NEWSMon Jan 28 20:30:50 2008
@@ -18,6 +18,8 @@
 timezone_identifiers_list() / DateTimezone::listIdentifiers().
   * date_timestamp_set() / DateTime::setTimestamp() to set a Unix timestamp
 without invoking the date parser. (Scott)
+  * date_timestamp_get() / DateTime::getTimestamp() to retrieve the Unix
+timestamp belonging to a date object.
 
 - Added ability to store associative infor with objects in SplObjectStorage.
   (Marcus)
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.51.2.13r2=1.43.2.45.2.51.2.14diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.43.2.45.2.51.2.13 
php-src/ext/date/php_date.c:1.43.2.45.2.51.2.14
--- php-src/ext/date/php_date.c:1.43.2.45.2.51.2.13 Sun Jan 27 17:44:29 2008
+++ php-src/ext/date/php_date.c Mon Jan 28 20:30:50 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_date.c,v 1.43.2.45.2.51.2.13 2008/01/27 17:44:29 derick Exp $ */
+/* $Id: php_date.c,v 1.43.2.45.2.51.2.14 2008/01/28 20:30:50 derick Exp $ */
 
 #include php.h
 #include php_streams.h
@@ -182,6 +182,7 @@
PHP_FE(date_date_set, NULL)
PHP_FE(date_isodate_set, NULL)
PHP_FE(date_timestamp_set, NULL)
+   PHP_FE(date_timestamp_get, NULL)
 
PHP_FE(timezone_open, NULL)
PHP_FE(timezone_name_get, NULL)
@@ -215,6 +216,7 @@
PHP_ME_MAPPING(setDate, date_date_set,  NULL, 0)
PHP_ME_MAPPING(setISODate,  date_isodate_set,   NULL, 0)
PHP_ME_MAPPING(setTimestamp,date_timestamp_set, NULL, 0)
+   PHP_ME_MAPPING(getTimestamp,date_timestamp_get, NULL, 0)
{NULL, NULL, NULL}
 };
 
@@ -2267,6 +2269,32 @@
 }
 /* }}} */
 
+/* {{{ proto long date_timestamp_get(DateTime object)
+   Gets the Unix timestamp.
+*/
+PHP_FUNCTION(date_timestamp_get)
+{
+   zval *object;
+   php_date_obj *dateobj;
+   long  timestamp;
+   int   error;
+
+   if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), 
O, object, date_ce_date) == FAILURE) {
+   RETURN_FALSE;
+   }
+   dateobj = (php_date_obj *) zend_object_store_get_object(object 
TSRMLS_CC);
+   DATE_CHECK_INITIALIZED(dateobj-time, DateTime);
+   timelib_update_ts(dateobj-time, NULL);
+
+   timestamp = timelib_date_to_int(dateobj-time, error);
+   if (error) {
+   RETURN_FALSE;
+   } else {
+   RETVAL_LONG(timestamp);
+   }
+}
+/* }}} */
+
 static int timezone_initialize(timelib_tzinfo **tzi, /*const*/ char *tz 
TSRMLS_DC)
 {
char *tzid;
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.h?r1=1.17.2.11.2.3.2.3r2=1.17.2.11.2.3.2.4diff_format=u
Index: php-src/ext/date/php_date.h
diff -u php-src/ext/date/php_date.h:1.17.2.11.2.3.2.3 
php-src/ext/date/php_date.h:1.17.2.11.2.3.2.4
--- php-src/ext/date/php_date.h:1.17.2.11.2.3.2.3   Sun Jan 13 15:15:48 2008
+++ php-src/ext/date/php_date.h Mon Jan 28 20:30:51 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: php_date.h,v 1.17.2.11.2.3.2.3 2008/01/13 15:15:48 derick Exp $ */
+/* $Id: php_date.h,v 1.17.2.11.2.3.2.4 2008/01/28 20:30:51 derick Exp $ */
 
 #ifndef PHP_DATE_H
 #define PHP_DATE_H
@@ -63,6 +63,7 @@
 PHP_FUNCTION(date_date_set);
 PHP_FUNCTION(date_isodate_set);
 PHP_FUNCTION(date_timestamp_set);
+PHP_FUNCTION(date_timestamp_get);
 
 PHP_METHOD(DateTimeZone, __construct);
 PHP_FUNCTION(timezone_open);

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

[PHP-CVS] cvs: php-src /ext/date/tests strtotime.phpt

2008-01-28 Thread Derick Rethans

derick  Mon Jan 28 21:02:09 2008 UTC

  Modified files:  
/php-src/ext/date/tests strtotime.phpt 
  Log:
  - MF53: Fixed test case.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/strtotime.phpt?r1=1.4r2=1.5diff_format=u
Index: php-src/ext/date/tests/strtotime.phpt
diff -u php-src/ext/date/tests/strtotime.phpt:1.4 
php-src/ext/date/tests/strtotime.phpt:1.5
--- php-src/ext/date/tests/strtotime.phpt:1.4   Sun Jan 27 22:15:59 2008
+++ php-src/ext/date/tests/strtotime.phpt   Mon Jan 28 21:02:09 2008
@@ -16,3 +16,5 @@
 --EXPECT--
 2005-07-14T22:30:41+0200
 2005-07-15T00:30:41+0200
+2005-07-14T22:30:41+0200
+2005-07-14T22:30:41+0200

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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/date/tests strtotime.phpt

2008-01-28 Thread Derick Rethans

derick  Mon Jan 28 21:00:14 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/date/tests strtotime.phpt 
  Log:
  - Fixed test case.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/strtotime.phpt?r1=1.1.2.2.4.1r2=1.1.2.2.4.2diff_format=u
Index: php-src/ext/date/tests/strtotime.phpt
diff -u php-src/ext/date/tests/strtotime.phpt:1.1.2.2.4.1 
php-src/ext/date/tests/strtotime.phpt:1.1.2.2.4.2
--- php-src/ext/date/tests/strtotime.phpt:1.1.2.2.4.1   Sun Jan 27 22:16:48 2008
+++ php-src/ext/date/tests/strtotime.phpt   Mon Jan 28 21:00:14 2008
@@ -16,3 +16,5 @@
 --EXPECT--
 2005-07-14T22:30:41+0200
 2005-07-15T00:30:41+0200
+2005-07-14T22:30:41+0200
+2005-07-14T22:30:41+0200

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

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

2008-01-28 Thread Derick Rethans

derick  Mon Jan 28 20:35:17 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/date   php_date.c 
  Log:
  - Add missing folding tags.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.51.2.14r2=1.43.2.45.2.51.2.15diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.43.2.45.2.51.2.14 
php-src/ext/date/php_date.c:1.43.2.45.2.51.2.15
--- php-src/ext/date/php_date.c:1.43.2.45.2.51.2.14 Mon Jan 28 20:30:50 2008
+++ php-src/ext/date/php_date.c Mon Jan 28 20:35:17 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_date.c,v 1.43.2.45.2.51.2.14 2008/01/28 20:30:50 derick Exp $ */
+/* $Id: php_date.c,v 1.43.2.45.2.51.2.15 2008/01/28 20:35:17 derick Exp $ */
 
 #include php.h
 #include php_streams.h
@@ -2029,6 +2029,7 @@
parsed_time = timelib_parse_from_format(format, date, date_len, error, 
DATE_TIMEZONEDB);
php_date_do_return_parsed_time(INTERNAL_FUNCTION_PARAM_PASSTHRU, 
parsed_time, error);
 }
+/* }}} */
 
 /* {{{ proto string date_format(DateTime object, string format)
Returns date formatted according to given format

-- 
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_3) /ext/libxml php_libxml2.def

2008-01-28 Thread Rob Richards


Hey Steph,

You need to download the new libs (libxml2 2.6.31 and libxslt 1.1.22). 
Edin actually updated to .31 on the 11th.

http://ctindustries.net/libxml/

Rob

Steph Fox wrote:

Hi Rob,

Unfortunately Edin's library collection - which I just went and updated 
locally because of this - still carries libxml 2.6.26, not 2.6.27. That 
presumably means snaps is also broken...


php5ts.dll.def : error LNK2001: unresolved external symbol 
xmlXPathCompiledEvalToBoolean

Release_TS\php5ts.lib : fatal error LNK1120: 1 unresolved externals
LINK : fatal error LNK1141: failure during build of exports file

Wouldn't you think it'd tell me _before_ completing a 40-minute build? 
sigh /


- Steph

- Original Message - From: Rob Richards [EMAIL PROTECTED]
To: php-cvs@lists.php.net
Sent: Sunday, January 27, 2008 4:33 PM
Subject: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/libxml php_libxml2.def



rrichards Sun Jan 27 16:33:01 2008 UTC

 Modified files:  (Branch: PHP_5_3)
   /php-src/ext/libxml php_libxml2.def
 Log:
 MFH: add missing export




 





--
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 /ext/date php_date.c php_date.h

2008-01-28 Thread Derick Rethans

derick  Mon Jan 28 20:29:40 2008 UTC

  Modified files:  
/php-src/ext/date   php_date.c php_date.h 
  Log:
  - Added DateTime::getTimestamp() / date_timestamp_get().
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.159r2=1.160diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.159 php-src/ext/date/php_date.c:1.160
--- php-src/ext/date/php_date.c:1.159   Sun Jan 27 17:44:16 2008
+++ php-src/ext/date/php_date.c Mon Jan 28 20:29:40 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_date.c,v 1.159 2008/01/27 17:44:16 derick Exp $ */
+/* $Id: php_date.c,v 1.160 2008/01/28 20:29:40 derick Exp $ */
 
 #include php.h
 #include php_streams.h
@@ -184,6 +184,7 @@
PHP_FE(date_date_set, NULL)
PHP_FE(date_isodate_set, NULL)
PHP_FE(date_timestamp_set, NULL)
+   PHP_FE(date_timestamp_get, NULL)
 
PHP_FE(timezone_open, NULL)
PHP_FE(timezone_name_get, NULL)
@@ -218,6 +219,7 @@
PHP_ME_MAPPING(setDate, date_date_set, NULL, 0)
PHP_ME_MAPPING(setISODate,  date_isodate_set,  NULL, 0)
PHP_ME_MAPPING(setTimestamp,date_timestamp_set, NULL, 0)
+   PHP_ME_MAPPING(getTimestamp,date_timestamp_get, NULL, 0)
{NULL, NULL, NULL}
 };
 
@@ -2425,6 +2427,32 @@
 }
 /* }}} */
 
+/* {{{ proto long date_timestamp_get(DateTime object)
+   Gets the Unix timestamp.
+*/
+PHP_FUNCTION(date_timestamp_get)
+{
+   zval *object;
+   php_date_obj *dateobj;
+   long  timestamp;
+   int   error;
+
+   if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), 
O, object, date_ce_date) == FAILURE) {
+   RETURN_FALSE;
+   }
+   dateobj = (php_date_obj *) zend_object_store_get_object(object 
TSRMLS_CC);
+   DATE_CHECK_INITIALIZED(dateobj-time, DateTime);
+   timelib_update_ts(dateobj-time, NULL);
+
+   timestamp = timelib_date_to_int(dateobj-time, error);
+   if (error) {
+   RETURN_FALSE;
+   } else {
+   RETVAL_LONG(timestamp);
+   }
+}
+/* }}} */
+
 static int timezone_initialize(timelib_tzinfo **tzi, /*const*/ char *tz 
TSRMLS_DC)
 {
char *tzid;
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.h?r1=1.35r2=1.36diff_format=u
Index: php-src/ext/date/php_date.h
diff -u php-src/ext/date/php_date.h:1.35 php-src/ext/date/php_date.h:1.36
--- php-src/ext/date/php_date.h:1.35Sun Jan 13 15:16:47 2008
+++ php-src/ext/date/php_date.h Mon Jan 28 20:29:40 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: php_date.h,v 1.35 2008/01/13 15:16:47 derick Exp $ */
+/* $Id: php_date.h,v 1.36 2008/01/28 20:29:40 derick Exp $ */
 
 #ifndef PHP_DATE_H
 #define PHP_DATE_H
@@ -64,6 +64,7 @@
 PHP_FUNCTION(date_date_set);
 PHP_FUNCTION(date_isodate_set);
 PHP_FUNCTION(date_timestamp_set);
+PHP_FUNCTION(date_timestamp_get);
 
 PHP_METHOD(DateTimeZone, __construct);
 PHP_FUNCTION(timezone_open);

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

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

2008-01-28 Thread Antony Dovgal

tony2001Mon Jan 28 23:08:54 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcNEWS 
  Log:
  BFN
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.94r2=1.2027.2.547.2.965.2.95diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.94 
php-src/NEWS:1.2027.2.547.2.965.2.95
--- php-src/NEWS:1.2027.2.547.2.965.2.94Mon Jan 28 22:48:15 2008
+++ php-src/NEWSMon Jan 28 23:08:54 2008
@@ -98,6 +98,8 @@
   to different characters with cp1251 and cp866. (Scott)
 - Fixed possible crash in ext/soap because of uninitialized value. (Zdash Urf)
 
+- Fixed bug #43927 (koi8r is missing from html_entity_decode()). 
+  (andy at demos dot su, Tony)
 - Fixed bug #43808 (date_create never fails (even when it should)). (Derick)
 - Fixed bug #43559 (array_merge_recursive() doesn't behave as expected with 
   duplicate NULL values). (Felipe, Tony)

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

[PHP-CVS] cvs: php-src /ext/standard html.c /ext/standard/tests/strings bug43927.phpt

2008-01-28 Thread Antony Dovgal

tony2001Mon Jan 28 23:08:07 2008 UTC

  Modified files:  
/php-src/ext/standard   html.c 
/php-src/ext/standard/tests/strings bug43927.phpt 
  Log:
  MFB: fix #43927 (koi8r is missing from html_entity_decode())
  patch by andy at demos dot su
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/html.c?r1=1.130r2=1.131diff_format=u
Index: php-src/ext/standard/html.c
diff -u php-src/ext/standard/html.c:1.130 php-src/ext/standard/html.c:1.131
--- php-src/ext/standard/html.c:1.130   Fri Jan 25 18:11:19 2008
+++ php-src/ext/standard/html.c Mon Jan 28 23:08:07 2008
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: html.c,v 1.130 2008/01/25 18:11:19 scottmac Exp $ */
+/* $Id: html.c,v 1.131 2008/01/28 23:08:07 tony2001 Exp $ */
 
 /*
  * HTML entity resources:
@@ -958,6 +958,7 @@
case cs_cp1251:
case cs_8859_5:
case cs_cp866:
+   case cs_koi8r:
replacement[0] = k;
replacement[1] = '\0';
replacement_len = 1;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug43927.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/strings/bug43927.phpt
diff -u /dev/null php-src/ext/standard/tests/strings/bug43927.phpt:1.2
--- /dev/null   Mon Jan 28 23:08:07 2008
+++ php-src/ext/standard/tests/strings/bug43927.phptMon Jan 28 23:08:07 2008
@@ -0,0 +1,16 @@
+--TEST--
+Bug #43927 (koi8r is missing from html_entity_decode())
+--FILE--
+?php
+var_dump(html_entity_decode(amp;lt;, ENT_COMPAT, 'koi8-r'));
+var_dump(html_entity_decode(amp;#38;, ENT_COMPAT, 'koi8-r'));
+var_dump(html_entity_decode(amp;#38;lt;, ENT_COMPAT, 'koi8-r'));
+?
+--EXPECT--
+string(4) lt;
+string(5) #38;
+string(8) #38;lt;
+--UEXPECT--
+unicode(4) lt;
+unicode(5) #38;
+unicode(8) #38;lt;

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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/strings bug43927.phpt

2008-01-28 Thread Antony Dovgal

tony2001Mon Jan 28 23:07:45 2008 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/strings bug43927.phpt 
  Log:
  add test
  
  

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

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

[PHP-CVS] cvs: php-src /ext/spl spl_observer.c /ext/spl/internal splobjectstorage.inc

2008-01-28 Thread Marcus Boerger

helly   Mon Jan 28 22:43:21 2008 UTC

  Modified files:  
/php-src/ext/splspl_observer.c 
/php-src/ext/spl/internal   splobjectstorage.inc 
  Log:
  - Make SplObjectStorage implement ArrayAccess
  
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_observer.c?r1=1.22r2=1.23diff_format=u
Index: php-src/ext/spl/spl_observer.c
diff -u php-src/ext/spl/spl_observer.c:1.22 php-src/ext/spl/spl_observer.c:1.23
--- php-src/ext/spl/spl_observer.c:1.22 Sun Jan 27 18:04:54 2008
+++ php-src/ext/spl/spl_observer.c  Mon Jan 28 22:43:21 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: spl_observer.c,v 1.22 2008/01/27 18:04:54 helly Exp $ */
+/* $Id: spl_observer.c,v 1.23 2008/01/28 22:43:21 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include config.h
@@ -288,6 +288,25 @@
intern-index = 0;
 } /* }}} */
 
+/* {{{ proto mixed SplObjectStorage::offsetGet($object) U
+ Returns associated information for a stored object */
+SPL_METHOD(SplObjectStorage, offsetGet)
+{
+   zval *obj;
+   spl_SplObjectStorageElement *element;
+   spl_SplObjectStorage *intern = 
(spl_SplObjectStorage*)zend_object_store_get_object(getThis() TSRMLS_CC);
+   
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, o, obj) == 
FAILURE) {
+   return;
+   }
+   element = spl_object_storage_get(intern, obj TSRMLS_CC);
+   if (!element) {
+   zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 
TSRMLS_CC, Object not found);
+   } else {
+   RETURN_ZVAL(element-inf,1, 0);
+   }
+} /* }}} */
+
 /* {{{ proto bool SplObjectStorage::contains($obj) U
  Determine whethe an object is contained in the storage */
 SPL_METHOD(SplObjectStorage, contains)
@@ -565,20 +584,39 @@
ZEND_ARG_INFO(0, info)
 ZEND_END_ARG_INFO();
 
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_offsetGet, 0, 0, 1)
+   ZEND_ARG_INFO(0, object)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_offsetSet, 0, 0, 2)
+   ZEND_ARG_INFO(0, object)
+   ZEND_ARG_INFO(0, info)
+ZEND_END_ARG_INFO()
+
 static const zend_function_entry spl_funcs_SplObjectStorage[] = {
SPL_ME(SplObjectStorage,  attach,  arginfo_attach,0)
SPL_ME(SplObjectStorage,  detach,  arginfo_Object,0)
SPL_ME(SplObjectStorage,  contains,arginfo_Object,0)
+   SPL_ME(SplObjectStorage,  getInfo, NULL,  0)
+   SPL_ME(SplObjectStorage,  setInfo, arginfo_setInfo,   0)
+   /* Countable */
SPL_ME(SplObjectStorage,  count,   NULL,  0)
+   /* Iterator */
SPL_ME(SplObjectStorage,  rewind,  NULL,  0)
SPL_ME(SplObjectStorage,  valid,   NULL,  0)
SPL_ME(SplObjectStorage,  key, NULL,  0)
SPL_ME(SplObjectStorage,  current, NULL,  0)
SPL_ME(SplObjectStorage,  next,NULL,  0)
+   /* Serializable */
SPL_ME(SplObjectStorage,  unserialize, arginfo_Serialized,0)
SPL_ME(SplObjectStorage,  serialize,   NULL,  0)
-   SPL_ME(SplObjectStorage,  getInfo, NULL,  0)
-   SPL_ME(SplObjectStorage,  setInfo, arginfo_setInfo,   0)
+   /* ArrayAccess */
+   SPL_MA(SplObjectStorage, offsetExists, SplObjectStorage, contains, 
arginfo_offsetGet, 0)
+   SPL_MA(SplObjectStorage, offsetSet,SplObjectStorage, attach,   
arginfo_offsetSet, 0)
+   SPL_MA(SplObjectStorage, offsetUnset,  SplObjectStorage, detach,   
arginfo_offsetGet, 0)
+   SPL_ME(SplObjectStorage, offsetGet,arginfo_offsetGet, 0)
{NULL, NULL, NULL}
 };
 
@@ -595,6 +633,7 @@
REGISTER_SPL_IMPLEMENTS(SplObjectStorage, Countable);
REGISTER_SPL_IMPLEMENTS(SplObjectStorage, Iterator);
REGISTER_SPL_IMPLEMENTS(SplObjectStorage, Serializable);
+   REGISTER_SPL_IMPLEMENTS(SplObjectStorage, ArrayAccess);
 
return SUCCESS;
 }
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/internal/splobjectstorage.inc?r1=1.5r2=1.6diff_format=u
Index: php-src/ext/spl/internal/splobjectstorage.inc
diff -u php-src/ext/spl/internal/splobjectstorage.inc:1.5 
php-src/ext/spl/internal/splobjectstorage.inc:1.6
--- php-src/ext/spl/internal/splobjectstorage.inc:1.5   Sun Jan 27 18:04:54 2008
+++ php-src/ext/spl/internal/splobjectstorage.inc   Mon Jan 28 22:43:21 2008
@@ -20,7 +20,7 @@
  * here therefore has a complexity of O(n) while the actual implementation has
  * complexity O(1).
  */
-class SplObjectStorage implements Iterator, Countable
+class SplObjectStorage implements Iterator, Countable, ArrayAccess
 {
private $storage = array();
private $index = 0;
@@ -88,9 +88,9 @@
return count($this-storage);
}
 
-   /** @param obj object to look for
+   /** @param $obj

[PHP-CVS] cvs: php-src /ext/mysql config.w32 /ext/mysqli/tests mysqli_get_client_stats.phpt /ext/mysqlnd config.w32 config9.m4 mysqlnd.c mysqlnd_block_alloc.c mysqlnd_block_alloc.h mysqlnd_priv.h my

2008-01-28 Thread Andrey Hristov

andrey  Mon Jan 28 22:54:21 2008 UTC

  Modified files:  
/php-src/ext/mysql  config.w32 
/php-src/ext/mysqli/tests   mysqli_get_client_stats.phpt 
/php-src/ext/mysqlndmysqlnd_block_alloc.c mysqlnd_block_alloc.h 
config.w32 config9.m4 mysqlnd.c mysqlnd_priv.h 
mysqlnd_ps.c mysqlnd_result.c 
mysqlnd_structs.h mysqlnd_wireprotocol.c 
  Log:
  MFB:
  some config.w32 fixes
  moved mysqlnd's block allocator to a separate file and also now
  it's part of the connection, no MT problems.
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/config.w32?r1=1.5r2=1.6diff_format=u
Index: php-src/ext/mysql/config.w32
diff -u php-src/ext/mysql/config.w32:1.5 php-src/ext/mysql/config.w32:1.6
--- php-src/ext/mysql/config.w32:1.5Sat Jan 19 18:56:19 2008
+++ php-src/ext/mysql/config.w32Mon Jan 28 22:54:21 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.5 2008/01/19 18:56:19 andrey Exp $
+// $Id: config.w32,v 1.6 2008/01/28 22:54:21 andrey Exp $
 // vim:ft=javascript
 
 ARG_WITH(mysql, MySQL support, no);
@@ -8,13 +8,15 @@
if (CHECK_LIB(libmysql.lib, mysql, PHP_MYSQL) 
CHECK_HEADER_ADD_INCLUDE(mysql.h, CFLAGS_MYSQL,
PHP_MYSQL + \\include; + PHP_PHP_BUILD + 
\\include\\mysql; + PHP_MYSQL)) {
+   EXTENSION(mysql, php_mysql.c);
+   AC_DEFINE('HAVE_MYSQL', 1, 'Have MySQL library');
} else {
WARNING(mysql not enabled; libraries and headers not 
found);
}
} else {
AC_DEFINE('HAVE_MYSQLND', 1, 'MySQL native driver support 
enabled');
ADD_EXTENSION_DEP('mysql', 'mysqlnd', true);
+   EXTENSION(mysql, php_mysql.c);
+   AC_DEFINE('HAVE_MYSQL', 1, 'Have MySQL library');
}
-   EXTENSION(mysql, php_mysql.c);
-   AC_DEFINE('HAVE_MYSQL', 1, 'Have MySQL library');
 }
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_get_client_stats.phpt?r1=1.4r2=1.5diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_get_client_stats.phpt
diff -u php-src/ext/mysqli/tests/mysqli_get_client_stats.phpt:1.4 
php-src/ext/mysqli/tests/mysqli_get_client_stats.phpt:1.5
--- php-src/ext/mysqli/tests/mysqli_get_client_stats.phpt:1.4   Mon Jan 28 
18:27:49 2008
+++ php-src/ext/mysqli/tests/mysqli_get_client_stats.phpt   Mon Jan 28 
22:54:21 2008
@@ -969,9 +969,9 @@
   [mem_efree_count]=
   string(1) 0
   [mem_malloc_count]=
-  string(1) 1
+  string(1) 0
   [mem_malloc_ammount]=
-  string(%d) %d
+  string(1) 0
   [mem_calloc_count]=
   string(1) 0
   [mem_calloc_ammount]=
@@ -1106,9 +1106,9 @@
   [umem_efree_count]=
   unicode(1) 0
   [umem_malloc_count]=
-  unicode(1) 1
+  unicode(1) 0
   [umem_malloc_ammount]=
-  unicode(%d) %d
+  unicode(1) 0
   [umem_calloc_count]=
   unicode(1) 0
   [umem_calloc_ammount]=
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_block_alloc.c?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_block_alloc.c
diff -u /dev/null php-src/ext/mysqlnd/mysqlnd_block_alloc.c:1.2
--- /dev/null   Mon Jan 28 22:54:21 2008
+++ php-src/ext/mysqlnd/mysqlnd_block_alloc.c   Mon Jan 28 22:54:21 2008
@@ -0,0 +1,201 @@
+/*
+  +--+
+  | PHP Version 6|
+  +--+
+  | Copyright (c) 2006-2008 The PHP Group|
+  +--+
+  | 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: Georg Richter [EMAIL PROTECTED] |
+  |  Andrey Hristov [EMAIL PROTECTED]   |
+  |  Ulf Wendel [EMAIL PROTECTED]  |
+  +--+
+*/
+
+/* $Id: mysqlnd_block_alloc.c,v 1.2 2008/01/28 22:54:21 andrey Exp $ */
+
+#include php.h
+#include mysqlnd.h
+#include mysqlnd_block_alloc.h
+#include mysqlnd_debug.h
+#include mysqlnd_priv.h
+
+
+/* {{{ mysqlnd_mempool_free_chunk */
+static void
+mysqlnd_mempool_free_contents(MYSQLND_MEMORY_POOL * pool TSRMLS_DC)
+{
+   DBG_ENTER(mysqlnd_mempool_dtor);

[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/spl spl_observer.c /ext/spl/internal splobjectstorage.inc

2008-01-28 Thread Marcus Boerger

helly   Mon Jan 28 22:48:15 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcNEWS 
/php-src/ext/splspl_observer.c 
/php-src/ext/spl/internal   splobjectstorage.inc 
  Log:
  - MFH Make SplObjectStorage implement ArrayAccess
  [DOC]
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.93r2=1.2027.2.547.2.965.2.94diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.93 
php-src/NEWS:1.2027.2.547.2.965.2.94
--- php-src/NEWS:1.2027.2.547.2.965.2.93Mon Jan 28 21:12:41 2008
+++ php-src/NEWSMon Jan 28 22:48:15 2008
@@ -24,8 +24,11 @@
 DateTimeZone::getTranstions() to limit the range of transitions being
 returned.
 
-- Added ability to store associative infor with objects in SplObjectStorage.
-  (Marcus)
+- Improved SPL extension:
+  . Added ability to store associative information with objects in 
+SplObjectStorage. (Marcus)
+  . Added ArrayAccess support to SplObjectStorage. (Marcus)
+  . Added SplDoublyLinkedList, SplStack, SplQueue classes. (Etienne)
 - Added ability to use Traversable objects instead of plain arrays in ext/soap.
   (Joshua Reese, Dmitry)
 - Added ?: operator. (Marcus)
@@ -51,7 +54,6 @@
   (Etienne Kneuss)
 - Added compact handler for Zend MM storage. (Dmitry)
 - Added + and * specifiers to zend_parse_parameters(). (Andrei)
-- Added SplDoublyLinkedList, SplStack, SplQueue classes. (Etienne)
 
 - Removed the experimental RPL (master/slave) functions from mysqli. (Andrey)
 
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_observer.c?r1=1.2.2.6.2.3.2.6r2=1.2.2.6.2.3.2.7diff_format=u
Index: php-src/ext/spl/spl_observer.c
diff -u php-src/ext/spl/spl_observer.c:1.2.2.6.2.3.2.6 
php-src/ext/spl/spl_observer.c:1.2.2.6.2.3.2.7
--- php-src/ext/spl/spl_observer.c:1.2.2.6.2.3.2.6  Sun Jan 27 18:07:20 2008
+++ php-src/ext/spl/spl_observer.c  Mon Jan 28 22:48:15 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: spl_observer.c,v 1.2.2.6.2.3.2.6 2008/01/27 18:07:20 helly Exp $ */
+/* $Id: spl_observer.c,v 1.2.2.6.2.3.2.7 2008/01/28 22:48:15 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include config.h
@@ -288,6 +288,25 @@
intern-index = 0;
 } /* }}} */
 
+/* {{{ proto mixed SplObjectStorage::offsetGet($object)
+ Returns associated information for a stored object */
+SPL_METHOD(SplObjectStorage, offsetGet)
+{
+   zval *obj;
+   spl_SplObjectStorageElement *element;
+   spl_SplObjectStorage *intern = 
(spl_SplObjectStorage*)zend_object_store_get_object(getThis() TSRMLS_CC);
+   
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, o, obj) == 
FAILURE) {
+   return;
+   }
+   element = spl_object_storage_get(intern, obj TSRMLS_CC);
+   if (!element) {
+   zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 
TSRMLS_CC, Object not found);
+   } else {
+   RETURN_ZVAL(element-inf,1, 0);
+   }
+} /* }}} */
+
 /* {{{ proto bool SplObjectStorage::contains($obj)
  Determine whethe an object is contained in the storage */
 SPL_METHOD(SplObjectStorage, contains)
@@ -565,20 +584,39 @@
ZEND_ARG_INFO(0, info)
 ZEND_END_ARG_INFO();
 
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_offsetGet, 0, 0, 1)
+   ZEND_ARG_INFO(0, object)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_offsetSet, 0, 0, 2)
+   ZEND_ARG_INFO(0, object)
+   ZEND_ARG_INFO(0, info)
+ZEND_END_ARG_INFO()
+
 static const zend_function_entry spl_funcs_SplObjectStorage[] = {
SPL_ME(SplObjectStorage,  attach,  arginfo_attach,0)
SPL_ME(SplObjectStorage,  detach,  arginfo_Object,0)
SPL_ME(SplObjectStorage,  contains,arginfo_Object,0)
+   SPL_ME(SplObjectStorage,  getInfo, NULL,  0)
+   SPL_ME(SplObjectStorage,  setInfo, arginfo_setInfo,   0)
+   /* Countable */
SPL_ME(SplObjectStorage,  count,   NULL,  0)
+   /* Iterator */
SPL_ME(SplObjectStorage,  rewind,  NULL,  0)
SPL_ME(SplObjectStorage,  valid,   NULL,  0)
SPL_ME(SplObjectStorage,  key, NULL,  0)
SPL_ME(SplObjectStorage,  current, NULL,  0)
SPL_ME(SplObjectStorage,  next,NULL,  0)
+   /* Serializable */
SPL_ME(SplObjectStorage,  unserialize, arginfo_Serialized,0)
SPL_ME(SplObjectStorage,  serialize,   NULL,  0)
-   SPL_ME(SplObjectStorage,  getInfo, NULL,  0)
-   SPL_ME(SplObjectStorage,  setInfo, arginfo_setInfo,   0)
+   /* ArrayAccess */
+   SPL_MA(SplObjectStorage, offsetExists, SplObjectStorage, contains, 
arginfo_offsetGet, 0)
+   SPL_MA(SplObjectStorage, offsetSet,SplObjectStorage, attach,   
arginfo_offsetSet, 0)
+

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysql config.w32 /ext/mysqli/tests mysqli_get_client_stats.phpt /ext/mysqlnd config.w32 config9.m4 mysqlnd.c mysqlnd_block_alloc.c mysqlnd_block_alloc.h mysqlnd_

2008-01-28 Thread Andrey Hristov

andrey  Mon Jan 28 22:50:06 2008 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/mysqlndmysqlnd_block_alloc.c mysqlnd_block_alloc.h 

  Modified files:  
/php-src/ext/mysql  config.w32 
/php-src/ext/mysqli/tests   mysqli_get_client_stats.phpt 
/php-src/ext/mysqlndconfig.w32 config9.m4 mysqlnd.c mysqlnd_priv.h 
mysqlnd_ps.c mysqlnd_result.c 
mysqlnd_structs.h mysqlnd_wireprotocol.c 
  Log:
  some config.w32 fixes
  moved mysqlnd's block allocator to a separate file and also now
  it's part of the connection, no MT problems.
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/config.w32?r1=1.2.6.2r2=1.2.6.3diff_format=u
Index: php-src/ext/mysql/config.w32
diff -u php-src/ext/mysql/config.w32:1.2.6.2 
php-src/ext/mysql/config.w32:1.2.6.3
--- php-src/ext/mysql/config.w32:1.2.6.2Sat Jan 19 18:21:44 2008
+++ php-src/ext/mysql/config.w32Mon Jan 28 22:50:06 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.2.6.2 2008/01/19 18:21:44 andrey Exp $
+// $Id: config.w32,v 1.2.6.3 2008/01/28 22:50:06 andrey Exp $
 // vim:ft=javascript
 
 ARG_WITH(mysql, MySQL support, no);
@@ -8,13 +8,15 @@
if (CHECK_LIB(libmysql.lib, mysql, PHP_MYSQL) 
CHECK_HEADER_ADD_INCLUDE(mysql.h, CFLAGS_MYSQL,
PHP_MYSQL + \\include; + PHP_PHP_BUILD + 
\\include\\mysql; + PHP_MYSQL)) {
+   EXTENSION(mysql, php_mysql.c);
+   AC_DEFINE('HAVE_MYSQL', 1, 'Have MySQL library');
} else {
WARNING(mysql not enabled; libraries and headers not 
found);
}
} else {
AC_DEFINE('HAVE_MYSQLND', 1, 'MySQL native driver support 
enabled');
ADD_EXTENSION_DEP('mysql', 'mysqlnd', true);
+   EXTENSION(mysql, php_mysql.c);
+   AC_DEFINE('HAVE_MYSQL', 1, 'Have MySQL library');
}
-   EXTENSION(mysql, php_mysql.c);
-   AC_DEFINE('HAVE_MYSQL', 1, 'Have MySQL library');
 }
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_get_client_stats.phpt?r1=1.2.2.3r2=1.2.2.4diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_get_client_stats.phpt
diff -u php-src/ext/mysqli/tests/mysqli_get_client_stats.phpt:1.2.2.3 
php-src/ext/mysqli/tests/mysqli_get_client_stats.phpt:1.2.2.4
--- php-src/ext/mysqli/tests/mysqli_get_client_stats.phpt:1.2.2.3   Mon Jan 
28 18:25:50 2008
+++ php-src/ext/mysqli/tests/mysqli_get_client_stats.phpt   Mon Jan 28 
22:50:06 2008
@@ -969,9 +969,9 @@
   [mem_efree_count]=
   string(1) 0
   [mem_malloc_count]=
-  string(1) 1
+  string(1) 0
   [mem_malloc_ammount]=
-  string(%d) %d
+  string(1) 0
   [mem_calloc_count]=
   string(1) 0
   [mem_calloc_ammount]=
@@ -1106,9 +1106,9 @@
   [umem_efree_count]=
   unicode(1) 0
   [umem_malloc_count]=
-  unicode(1) 1
+  unicode(1) 0
   [umem_malloc_ammount]=
-  unicode(%d) %d
+  unicode(1) 0
   [umem_calloc_count]=
   unicode(1) 0
   [umem_calloc_ammount]=
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/config.w32?r1=1.4.2.3r2=1.4.2.4diff_format=u
Index: php-src/ext/mysqlnd/config.w32
diff -u php-src/ext/mysqlnd/config.w32:1.4.2.3 
php-src/ext/mysqlnd/config.w32:1.4.2.4
--- php-src/ext/mysqlnd/config.w32:1.4.2.3  Wed Jan 23 19:11:28 2008
+++ php-src/ext/mysqlnd/config.w32  Mon Jan 28 22:50:06 2008
@@ -1,15 +1,12 @@
-// $Id: config.w32,v 1.4.2.3 2008/01/23 19:11:28 andrey Exp $
+// $Id: config.w32,v 1.4.2.4 2008/01/28 22:50:06 andrey Exp $
 // vim:ft=javascript
 
-ARG_WITH(mysqlnd, MySQL-nd support, no);
-
-if (PHP_MYSQLND != no) {
-mysqld_source = ;
 if (CHECK_LIB(ws2_32.lib, mysqlnd)) {
mysqlnd_source = 
mysqlnd.c  +
-   mysqlnd_debug.c  +
+   mysqlnd_block_alloc.c +
mysqlnd_charset.c  +
+   mysqlnd_debug.c  +
mysqlnd_loaddata.c  +
mysqlnd_palloc.c  +
mysqlnd_ps.c  +
@@ -21,4 +18,3 @@
mysqlnd_wireprotocol.c;
EXTENSION(mysqlnd, mysqlnd_source, false);
 }
-}
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/config9.m4?r1=1.3.2.3r2=1.3.2.4diff_format=u
Index: php-src/ext/mysqlnd/config9.m4
diff -u php-src/ext/mysqlnd/config9.m4:1.3.2.3 
php-src/ext/mysqlnd/config9.m4:1.3.2.4
--- php-src/ext/mysqlnd/config9.m4:1.3.2.3  Wed Jan 23 19:11:28 2008
+++ php-src/ext/mysqlnd/config9.m4  Mon Jan 28 22:50:06 2008
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config9.m4,v 1.3.2.3 2008/01/23 19:11:28 andrey Exp $
+dnl $Id: config9.m4,v 1.3.2.4 2008/01/28 22:50:06 andrey Exp $
 dnl config.m4 for mysqlnd driver
 
 dnl If some extension uses mysqlnd it will get compiled in PHP core
@@ -7,7 +7,8 @@
   mysqlnd_sources=mysqlnd.c mysqlnd_charset.c mysqlnd_wireprotocol.c \
mysqlnd_ps.c mysqlnd_loaddata.c mysqlnd_palloc.c \

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

2008-01-28 Thread Antony Dovgal

tony2001Mon Jan 28 23:07:12 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard   html.c 
  Log:
  fix #43927 (koi8r is missing from html_entity_decode())
  patch by andy at demos dot su
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/html.c?r1=1.111.2.2.2.14.2.6r2=1.111.2.2.2.14.2.7diff_format=u
Index: php-src/ext/standard/html.c
diff -u php-src/ext/standard/html.c:1.111.2.2.2.14.2.6 
php-src/ext/standard/html.c:1.111.2.2.2.14.2.7
--- php-src/ext/standard/html.c:1.111.2.2.2.14.2.6  Fri Jan 25 18:10:45 2008
+++ php-src/ext/standard/html.c Mon Jan 28 23:07:12 2008
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: html.c,v 1.111.2.2.2.14.2.6 2008/01/25 18:10:45 scottmac Exp $ */
+/* $Id: html.c,v 1.111.2.2.2.14.2.7 2008/01/28 23:07:12 tony2001 Exp $ */
 
 /*
  * HTML entity resources:
@@ -949,6 +949,7 @@
case cs_cp1251:
case cs_8859_5:
case cs_cp866:
+   case cs_koi8r:
replacement[0] = k;
replacement[1] = '\0';
replacement_len = 1;

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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqlnd config.w32 config9.m4 mysqlnd.c mysqlnd.h

2008-01-28 Thread Andrey Hristov

andrey  Mon Jan 28 23:23:08 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mysqlndconfig.w32 config9.m4 mysqlnd.c mysqlnd.h 
  Log:
  Moving extension specific code to php_mysqlnd.c as the old rule is.
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/config.w32?r1=1.4.2.4r2=1.4.2.5diff_format=u
Index: php-src/ext/mysqlnd/config.w32
diff -u php-src/ext/mysqlnd/config.w32:1.4.2.4 
php-src/ext/mysqlnd/config.w32:1.4.2.5
--- php-src/ext/mysqlnd/config.w32:1.4.2.4  Mon Jan 28 22:50:06 2008
+++ php-src/ext/mysqlnd/config.w32  Mon Jan 28 23:23:08 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.4.2.4 2008/01/28 22:50:06 andrey Exp $
+// $Id: config.w32,v 1.4.2.5 2008/01/28 23:23:08 andrey Exp $
 // vim:ft=javascript
 
 if (CHECK_LIB(ws2_32.lib, mysqlnd)) {
@@ -15,6 +15,7 @@
mysqlnd_result.c  +
mysqlnd_result_meta.c  +
mysqlnd_statistics.c  +
-   mysqlnd_wireprotocol.c;
+   mysqlnd_wireprotocol.c +
+   php_mysqlnd.c;
EXTENSION(mysqlnd, mysqlnd_source, false);
 }
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/config9.m4?r1=1.3.2.4r2=1.3.2.5diff_format=u
Index: php-src/ext/mysqlnd/config9.m4
diff -u php-src/ext/mysqlnd/config9.m4:1.3.2.4 
php-src/ext/mysqlnd/config9.m4:1.3.2.5
--- php-src/ext/mysqlnd/config9.m4:1.3.2.4  Mon Jan 28 22:50:06 2008
+++ php-src/ext/mysqlnd/config9.m4  Mon Jan 28 23:23:08 2008
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config9.m4,v 1.3.2.4 2008/01/28 22:50:06 andrey Exp $
+dnl $Id: config9.m4,v 1.3.2.5 2008/01/28 23:23:08 andrey Exp $
 dnl config.m4 for mysqlnd driver
 
 dnl If some extension uses mysqlnd it will get compiled in PHP core
@@ -8,7 +8,7 @@
mysqlnd_ps.c mysqlnd_loaddata.c mysqlnd_palloc.c \
mysqlnd_ps_codec.c mysqlnd_statistics.c mysqlnd_qcache.c\
   mysqlnd_result.c mysqlnd_result_meta.c 
mysqlnd_debug.c\
-  mysqlnd_block_alloc.c
+  mysqlnd_block_alloc.c php_mysqlnd.c
 
   PHP_NEW_EXTENSION(mysqlnd, $mysqlnd_sources, no)
   PHP_ADD_BUILD_DIR([ext/mysqlnd], 1)
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd.c?r1=1.5.2.10r2=1.5.2.11diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd.c
diff -u php-src/ext/mysqlnd/mysqlnd.c:1.5.2.10 
php-src/ext/mysqlnd/mysqlnd.c:1.5.2.11
--- php-src/ext/mysqlnd/mysqlnd.c:1.5.2.10  Mon Jan 28 22:50:06 2008
+++ php-src/ext/mysqlnd/mysqlnd.c   Mon Jan 28 23:23:08 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: mysqlnd.c,v 1.5.2.10 2008/01/28 22:50:06 andrey Exp $ */
+/* $Id: mysqlnd.c,v 1.5.2.11 2008/01/28 23:23:08 andrey Exp $ */
 #include php.h
 #include mysqlnd.h
 #include mysqlnd_wireprotocol.h
@@ -28,10 +28,8 @@
 #include mysqlnd_charset.h
 #include mysqlnd_debug.h
 #include mysqlnd_block_alloc.h
-#include php_ini.h
 #include ext/standard/basic_functions.h
 #include ext/standard/php_lcg.h
-#include ext/standard/info.h
 
 /* the server doesn't support 4byte utf8, but let's make it forward compatible 
*/
 #define MYSQLND_MAX_ALLOWED_USER_LEN   256  /* 64 char * 4byte */
@@ -129,7 +127,6 @@
 
 
 /* {{{ mysqlnd_library_init */
-static
 void mysqlnd_library_init(TSRMLS_D)
 {
if (mysqlnd_library_initted == FALSE) {
@@ -146,7 +143,6 @@
 
 
 /* {{{ mysqlnd_library_end */
-static
 void mysqlnd_library_end(TSRMLS_D)
 {
if (mysqlnd_library_initted == TRUE) {
@@ -2038,223 +2034,6 @@
 /* }}} */
 
 
-/* {{{ mysqlnd_functions[]
- *
- * Every user visible function must have an entry in mysqlnd_functions[].
- */
-static zend_function_entry mysqlnd_functions[] = {
-   {NULL, NULL, NULL}  /* Must be the last line in mysqlnd_functions[] 
*/
-};
-/* }}} */
-
-
-/* {{{ mysqlnd_minfo_print_hash */
-#if PHP_MAJOR_VERSION = 6
-PHPAPI void mysqlnd_minfo_print_hash(zval *values)
-{
-   zval **values_entry;
-   HashPosition pos_values;
-
-   zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(values), pos_values);
-   while (zend_hash_get_current_data_ex(Z_ARRVAL_P(values),
-   
(void **)values_entry, pos_values) == SUCCESS) {
-   TSRMLS_FETCH();
-   zstrstring_key;
-   uintstring_key_len;
-   ulong   num_key;
-   char*s = NULL;
-
-   zend_hash_get_current_key_ex(Z_ARRVAL_P(values), string_key, 
string_key_len, num_key, 0, pos_values);
-
-   convert_to_string(*values_entry);
-
-   if (UG(unicode)) {
-   int s_len;
-   if 
(zend_unicode_to_string(ZEND_U_CONVERTER(UG(runtime_encoding_conv)),
-  s, 
s_len, string_key.u, string_key_len TSRMLS_CC) == SUCCESS) {
-

[PHP-CVS] cvs: php-src /ext/mysqlnd config.w32 config9.m4 mysqlnd.c mysqlnd.h

2008-01-28 Thread Andrey Hristov

andrey  Mon Jan 28 23:24:05 2008 UTC

  Modified files:  
/php-src/ext/mysqlndconfig.w32 config9.m4 mysqlnd.c mysqlnd.h 
  Log:
  Moving extension specific code to php_mysqlnd.c as the old rule is.
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/config.w32?r1=1.7r2=1.8diff_format=u
Index: php-src/ext/mysqlnd/config.w32
diff -u php-src/ext/mysqlnd/config.w32:1.7 php-src/ext/mysqlnd/config.w32:1.8
--- php-src/ext/mysqlnd/config.w32:1.7  Mon Jan 28 22:54:21 2008
+++ php-src/ext/mysqlnd/config.w32  Mon Jan 28 23:24:05 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.7 2008/01/28 22:54:21 andrey Exp $
+// $Id: config.w32,v 1.8 2008/01/28 23:24:05 andrey Exp $
 // vim:ft=javascript
 
 if (CHECK_LIB(ws2_32.lib, mysqlnd)) {
@@ -15,6 +15,7 @@
mysqlnd_result.c  +
mysqlnd_result_meta.c  +
mysqlnd_statistics.c  +
-   mysqlnd_wireprotocol.c;
+   mysqlnd_wireprotocol.c +
+   php_mysqlnd.c;
EXTENSION(mysqlnd, mysqlnd_source, false);
 }
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/config9.m4?r1=1.5r2=1.6diff_format=u
Index: php-src/ext/mysqlnd/config9.m4
diff -u php-src/ext/mysqlnd/config9.m4:1.5 php-src/ext/mysqlnd/config9.m4:1.6
--- php-src/ext/mysqlnd/config9.m4:1.5  Mon Jan 28 22:54:21 2008
+++ php-src/ext/mysqlnd/config9.m4  Mon Jan 28 23:24:05 2008
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config9.m4,v 1.5 2008/01/28 22:54:21 andrey Exp $
+dnl $Id: config9.m4,v 1.6 2008/01/28 23:24:05 andrey Exp $
 dnl config.m4 for mysqlnd driver
 
 dnl If some extension uses mysqlnd it will get compiled in PHP core
@@ -8,7 +8,7 @@
mysqlnd_ps.c mysqlnd_loaddata.c mysqlnd_palloc.c \
mysqlnd_ps_codec.c mysqlnd_statistics.c mysqlnd_qcache.c\
   mysqlnd_result.c mysqlnd_result_meta.c 
mysqlnd_debug.c\
-  mysqlnd_block_alloc.c
+  mysqlnd_block_alloc.c php_mysqlnd.c
 
   PHP_NEW_EXTENSION(mysqlnd, $mysqlnd_sources, no)
   PHP_ADD_BUILD_DIR([ext/mysqlnd], 1)
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd.c?r1=1.13r2=1.14diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd.c
diff -u php-src/ext/mysqlnd/mysqlnd.c:1.13 php-src/ext/mysqlnd/mysqlnd.c:1.14
--- php-src/ext/mysqlnd/mysqlnd.c:1.13  Mon Jan 28 22:54:21 2008
+++ php-src/ext/mysqlnd/mysqlnd.c   Mon Jan 28 23:24:05 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: mysqlnd.c,v 1.13 2008/01/28 22:54:21 andrey Exp $ */
+/* $Id: mysqlnd.c,v 1.14 2008/01/28 23:24:05 andrey Exp $ */
 #include php.h
 #include mysqlnd.h
 #include mysqlnd_wireprotocol.h
@@ -28,10 +28,8 @@
 #include mysqlnd_charset.h
 #include mysqlnd_debug.h
 #include mysqlnd_block_alloc.h
-#include php_ini.h
 #include ext/standard/basic_functions.h
 #include ext/standard/php_lcg.h
-#include ext/standard/info.h
 
 /* the server doesn't support 4byte utf8, but let's make it forward compatible 
*/
 #define MYSQLND_MAX_ALLOWED_USER_LEN   256  /* 64 char * 4byte */
@@ -129,7 +127,6 @@
 
 
 /* {{{ mysqlnd_library_init */
-static
 void mysqlnd_library_init(TSRMLS_D)
 {
if (mysqlnd_library_initted == FALSE) {
@@ -146,7 +143,6 @@
 
 
 /* {{{ mysqlnd_library_end */
-static
 void mysqlnd_library_end(TSRMLS_D)
 {
if (mysqlnd_library_initted == TRUE) {
@@ -2038,223 +2034,6 @@
 /* }}} */
 
 
-/* {{{ mysqlnd_functions[]
- *
- * Every user visible function must have an entry in mysqlnd_functions[].
- */
-static zend_function_entry mysqlnd_functions[] = {
-   {NULL, NULL, NULL}  /* Must be the last line in mysqlnd_functions[] 
*/
-};
-/* }}} */
-
-
-/* {{{ mysqlnd_minfo_print_hash */
-#if PHP_MAJOR_VERSION = 6
-PHPAPI void mysqlnd_minfo_print_hash(zval *values)
-{
-   zval **values_entry;
-   HashPosition pos_values;
-
-   zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(values), pos_values);
-   while (zend_hash_get_current_data_ex(Z_ARRVAL_P(values),
-   
(void **)values_entry, pos_values) == SUCCESS) {
-   TSRMLS_FETCH();
-   zstrstring_key;
-   uintstring_key_len;
-   ulong   num_key;
-   char*s = NULL;
-
-   zend_hash_get_current_key_ex(Z_ARRVAL_P(values), string_key, 
string_key_len, num_key, 0, pos_values);
-
-   convert_to_string(*values_entry);
-
-   if (UG(unicode)) {
-   int s_len;
-   if 
(zend_unicode_to_string(ZEND_U_CONVERTER(UG(runtime_encoding_conv)),
-  s, 
s_len, string_key.u, string_key_len TSRMLS_CC) == SUCCESS) {
-   php_info_print_table_row(2, s, 
Z_STRVAL_PP(values_entry));
-   }
-   if (s)

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

2008-01-28 Thread Derick Rethans

derick  Mon Jan 28 20:36:04 2008 UTC

  Modified files:  
/php-src/ext/date   php_date.c 
  Log:
  - MF53: Added missing folding tags.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.160r2=1.161diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.160 php-src/ext/date/php_date.c:1.161
--- php-src/ext/date/php_date.c:1.160   Mon Jan 28 20:29:40 2008
+++ php-src/ext/date/php_date.c Mon Jan 28 20:36:04 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_date.c,v 1.160 2008/01/28 20:29:40 derick Exp $ */
+/* $Id: php_date.c,v 1.161 2008/01/28 20:36:04 derick Exp $ */
 
 #include php.h
 #include php_streams.h
@@ -2159,6 +2159,7 @@
parsed_time = timelib_parse_from_format(format, date, date_len, error, 
DATE_TIMEZONEDB);
php_date_do_return_parsed_time(INTERNAL_FUNCTION_PARAM_PASSTHRU, 
parsed_time, error);
 }
+/* }}} */
 
 /* {{{ proto string date_format(DateTime object, string format)
Returns date formatted according to given format

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

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

2008-01-28 Thread Antony Dovgal

tony2001Tue Jan 29 00:39:27 2008 UTC

  Modified files:  
/php-src/ext/standard   array.c 
  Log:
  fix #43596 (array_slice(): $length arg ignored when it is 0)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.438r2=1.439diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.438 php-src/ext/standard/array.c:1.439
--- php-src/ext/standard/array.c:1.438  Fri Jan 25 15:52:00 2008
+++ php-src/ext/standard/array.cTue Jan 29 00:39:26 2008
@@ -21,7 +21,7 @@
+--+
 */
 
-/* $Id: array.c,v 1.438 2008/01/25 15:52:00 rrichards Exp $ */
+/* $Id: array.c,v 1.439 2008/01/29 00:39:26 tony2001 Exp $ */
 
 #include php.h
 #include php_ini.h
@@ -2296,24 +2296,28 @@
zval *input,/* Input array */
**entry;/* An array entry */
long offset,/* Offset to get elements from */
-length = 0;/* How many elements to get */
+length = 0;
zend_bool preserve_keys = 0; /* Whether to preserve keys while copying 
to the new array or not */
int  num_in,/* Number of elements in the 
input array */
 pos;   /* Current position in the 
array */
+   zval*z_length;  /* How many elements to get */
zstr string_key;
uint string_key_len;
ulong num_key;
HashPosition hpos;
 
-   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, al|lb, input, 
offset, length, preserve_keys) == FAILURE) {
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, al|z/b, input, 
offset, z_length, preserve_keys) == FAILURE) {
return;
}
 
/* Get number of entries in the input hash */
num_in = zend_hash_num_elements(Z_ARRVAL_P(input));
 
-   /* We want all entries from offset to the end if length is not passed 
or length is 0 */
-   if (length == 0) {
+   /* We want all entries from offset to the end if length is not passed 
or length is null */
+   if (ZEND_NUM_ARGS() = 3  Z_TYPE_P(z_length) != IS_NULL) {
+   convert_to_long(z_length);
+   length = Z_LVAL_P(z_length);
+   } else {
length = num_in;
}
 

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

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

2008-01-28 Thread Antony Dovgal

tony2001Tue Jan 29 00:39:46 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard   array.c 
  Log:
  MFH: fix #43596 (array_slice(): $length arg ignored when it is 0)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.37.2.17r2=1.308.2.21.2.37.2.18diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.308.2.21.2.37.2.17 
php-src/ext/standard/array.c:1.308.2.21.2.37.2.18
--- php-src/ext/standard/array.c:1.308.2.21.2.37.2.17   Fri Jan 25 15:52:48 2008
+++ php-src/ext/standard/array.cTue Jan 29 00:39:46 2008
@@ -21,7 +21,7 @@
+--+
 */
 
-/* $Id: array.c,v 1.308.2.21.2.37.2.17 2008/01/25 15:52:48 rrichards Exp $ */
+/* $Id: array.c,v 1.308.2.21.2.37.2.18 2008/01/29 00:39:46 tony2001 Exp $ */
 
 #include php.h
 #include php_ini.h
@@ -2113,12 +2113,13 @@
zend_bool preserve_keys = 0; /* Whether to preserve keys while copying 
to the new array or not */
int  num_in,/* Number of elements in the 
input array */
 pos;   /* Current position in the 
array */
+   zval*z_length;
char *string_key;
uint string_key_len;
ulong num_key;
HashPosition hpos;
 
-   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, al|lb, input, 
offset, length, preserve_keys) == FAILURE) {
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, al|z/b, input, 
offset, z_length, preserve_keys) == FAILURE) {
return;
}
 
@@ -2126,7 +2127,10 @@
num_in = zend_hash_num_elements(Z_ARRVAL_P(input));
 
/* We want all entries from offset to the end if length is not passed 
or is null */
-   if (length == 0) {
+   if (ZEND_NUM_ARGS() = 3  Z_TYPE_P(z_length) != IS_NULL) {
+   convert_to_long(z_length);
+   length = Z_LVAL_P(z_length);
+   } else {
length = num_in;
}
 

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

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

2008-01-28 Thread Ilia Alshanetsky

iliaa   Tue Jan 29 01:17:30 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/pdo_pgsql  pgsql_statement.c 
  Log:
  
  Simplify code
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_pgsql/pgsql_statement.c?r1=1.31.2.12.2.7.2.3r2=1.31.2.12.2.7.2.4diff_format=u
Index: php-src/ext/pdo_pgsql/pgsql_statement.c
diff -u php-src/ext/pdo_pgsql/pgsql_statement.c:1.31.2.12.2.7.2.3 
php-src/ext/pdo_pgsql/pgsql_statement.c:1.31.2.12.2.7.2.4
--- php-src/ext/pdo_pgsql/pgsql_statement.c:1.31.2.12.2.7.2.3   Mon Dec 31 
07:17:12 2007
+++ php-src/ext/pdo_pgsql/pgsql_statement.c Tue Jan 29 01:17:30 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: pgsql_statement.c,v 1.31.2.12.2.7.2.3 2007/12/31 07:17:12 sebastian 
Exp $ */
+/* $Id: pgsql_statement.c,v 1.31.2.12.2.7.2.4 2008/01/29 01:17:30 iliaa Exp $ 
*/
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -631,18 +631,16 @@
/* Failed to get system catalogue, but return success
 * with the data we have collected so far
 */
-   PQclear(res);
-   return 1;
+   goto done;
}
 
/* We want exactly one row returned */
if (1 != PQntuples(res)) {
-   PQclear(res);
-   return 1;
+   goto done;
}
 
add_assoc_string(return_value, native_type, PQgetvalue(res, 0, 0), 1);
-
+done:
PQclear(res);   
return 1;
 }

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

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

2008-01-28 Thread David Coallier

davidc  Tue Jan 29 01:44:38 2008 UTC

  Modified files:  
/php-src/ext/standard   string.c 
  Log:
  - Good proto message and description of function
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.665r2=1.666diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.665 php-src/ext/standard/string.c:1.666
--- php-src/ext/standard/string.c:1.665 Mon Jan 21 14:37:19 2008
+++ php-src/ext/standard/string.c   Tue Jan 29 01:44:38 2008
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: string.c,v 1.665 2008/01/21 14:37:19 tony2001 Exp $ */
+/* $Id: string.c,v 1.666 2008/01/29 01:44:38 davidc Exp $ */
 
 /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
 
@@ -3889,8 +3889,8 @@
 }
 /* }}} */
 
-/* {{{ proto string ucfirst(string str) U
-   Makes a string's first character uppercase */
+/* {{{ proto string lcfirst(string str) U
+   Makes a string's first character lowercase */
 PHP_FUNCTION(lcfirst)
 {
zstr   str;

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

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

2008-01-28 Thread Sebastian Bergmann

sebastian   Tue Jan 29 07:51:40 2008 UTC

  Modified files:  
/php-src/ext/xslxsltprocessor.c 
  Log:
  Add Reflection API metadata for XSLTProcessor.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/xsltprocessor.c?r1=1.61r2=1.62diff_format=u
Index: php-src/ext/xsl/xsltprocessor.c
diff -u php-src/ext/xsl/xsltprocessor.c:1.61 
php-src/ext/xsl/xsltprocessor.c:1.62
--- php-src/ext/xsl/xsltprocessor.c:1.61Mon Dec 31 07:12:17 2007
+++ php-src/ext/xsl/xsltprocessor.c Tue Jan 29 07:51:40 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: xsltprocessor.c,v 1.61 2007/12/31 07:12:17 sebastian Exp $ */
+/* $Id: xsltprocessor.c,v 1.62 2008/01/29 07:51:40 sebastian Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -27,6 +27,61 @@
 #include php_xsl.h
 #include ext/libxml/php_libxml.h
 
+/* {{{ arginfo */
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_import_stylesheet, 0, 0, 1)
+   ZEND_ARG_OBJ_INFO(0, doc, DOMDocument, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_transform_to_doc, 0, 0, 1)
+   ZEND_ARG_OBJ_INFO(0, doc, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_transform_to_uri, 0, 0, 2)
+   ZEND_ARG_OBJ_INFO(0, doc, DOMDocument, 0)
+   ZEND_ARG_INFO(0, uri)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_transform_to_xml, 0, 0, 1)
+   ZEND_ARG_OBJ_INFO(0, doc, DOMDocument, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_set_parameter, 0, 0, 2)
+   ZEND_ARG_INFO(0, namespace)
+   ZEND_ARG_INFO(0, name)
+   ZEND_ARG_INFO(0, value)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_get_parameter, 0, 0, 2)
+   ZEND_ARG_INFO(0, namespace)
+   ZEND_ARG_INFO(0, name)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_remove_parameter, 0, 0, 2)
+   ZEND_ARG_INFO(0, namespace)
+   ZEND_ARG_INFO(0, name)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_has_exslt_support, 0, 0, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_register_php_functions, 0, 0, 
0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_set_profiling, 0, 0, 1)
+   ZEND_ARG_INFO(0, filename)
+ZEND_END_ARG_INFO();
+/* }}} */
+
 /*
 * class xsl_xsltprocessor 
 *
@@ -35,16 +90,16 @@
 */
 
 const zend_function_entry php_xsl_xsltprocessor_class_functions[] = {
-   PHP_FALIAS(importStylesheet, xsl_xsltprocessor_import_stylesheet, NULL)
-   PHP_FALIAS(transformToDoc, xsl_xsltprocessor_transform_to_doc, NULL)
-   PHP_FALIAS(transformToUri, xsl_xsltprocessor_transform_to_uri, NULL)
-   PHP_FALIAS(transformToXml, xsl_xsltprocessor_transform_to_xml, NULL)
-   PHP_FALIAS(setParameter, xsl_xsltprocessor_set_parameter, NULL)
-   PHP_FALIAS(getParameter, xsl_xsltprocessor_get_parameter, NULL)
-   PHP_FALIAS(removeParameter, xsl_xsltprocessor_remove_parameter, NULL)
-   PHP_FALIAS(hasExsltSupport, xsl_xsltprocessor_has_exslt_support, NULL)
-   PHP_FALIAS(registerPHPFunctions, 
xsl_xsltprocessor_register_php_functions, NULL)
-   PHP_FALIAS(setProfiling, xsl_xsltprocessor_set_profiling, NULL)
+   PHP_FALIAS(importStylesheet, xsl_xsltprocessor_import_stylesheet, 
arginfo_xsl_xsltprocessor_import_stylesheet)
+   PHP_FALIAS(transformToDoc, xsl_xsltprocessor_transform_to_doc, 
arginfo_xsl_xsltprocessor_transform_to_doc)
+   PHP_FALIAS(transformToUri, xsl_xsltprocessor_transform_to_uri, 
arginfo_xsl_xsltprocessor_transform_to_uri)
+   PHP_FALIAS(transformToXml, xsl_xsltprocessor_transform_to_xml, 
arginfo_xsl_xsltprocessor_transform_to_xml)
+   PHP_FALIAS(setParameter, xsl_xsltprocessor_set_parameter, 
arginfo_xsl_xsltprocessor_set_parameter)
+   PHP_FALIAS(getParameter, xsl_xsltprocessor_get_parameter, 
arginfo_xsl_xsltprocessor_get_parameter)
+   PHP_FALIAS(removeParameter, xsl_xsltprocessor_remove_parameter, 
arginfo_xsl_xsltprocessor_remove_parameter)
+   PHP_FALIAS(hasExsltSupport, xsl_xsltprocessor_has_exslt_support, 
arginfo_xsl_xsltprocessor_has_exslt_support)
+   PHP_FALIAS(registerPHPFunctions, 
xsl_xsltprocessor_register_php_functions, 
arginfo_xsl_xsltprocessor_register_php_functions)
+   PHP_FALIAS(setProfiling, xsl_xsltprocessor_set_profiling, 
arginfo_xsl_xsltprocessor_set_profiling)
{NULL, NULL, NULL}
 };
 

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

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

2008-01-28 Thread Sebastian Bergmann

sebastian   Tue Jan 29 07:51:43 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/xslxsltprocessor.c 
  Log:
  MFH: Add Reflection API metadata for XSLTProcessor.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/xsltprocessor.c?r1=1.39.2.2.2.9.2.5r2=1.39.2.2.2.9.2.6diff_format=u
Index: php-src/ext/xsl/xsltprocessor.c
diff -u php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.9.2.5 
php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.9.2.6
--- php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.9.2.5Mon Dec 31 07:17:16 2007
+++ php-src/ext/xsl/xsltprocessor.c Tue Jan 29 07:51:43 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: xsltprocessor.c,v 1.39.2.2.2.9.2.5 2007/12/31 07:17:16 sebastian Exp $ 
*/
+/* $Id: xsltprocessor.c,v 1.39.2.2.2.9.2.6 2008/01/29 07:51:43 sebastian Exp $ 
*/
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -27,6 +27,61 @@
 #include php_xsl.h
 #include ext/libxml/php_libxml.h
 
+/* {{{ arginfo */
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_import_stylesheet, 0, 0, 1)
+   ZEND_ARG_OBJ_INFO(0, doc, DOMDocument, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_transform_to_doc, 0, 0, 1)
+   ZEND_ARG_OBJ_INFO(0, doc, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_transform_to_uri, 0, 0, 2)
+   ZEND_ARG_OBJ_INFO(0, doc, DOMDocument, 0)
+   ZEND_ARG_INFO(0, uri)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_transform_to_xml, 0, 0, 1)
+   ZEND_ARG_OBJ_INFO(0, doc, DOMDocument, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_set_parameter, 0, 0, 2)
+   ZEND_ARG_INFO(0, namespace)
+   ZEND_ARG_INFO(0, name)
+   ZEND_ARG_INFO(0, value)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_get_parameter, 0, 0, 2)
+   ZEND_ARG_INFO(0, namespace)
+   ZEND_ARG_INFO(0, name)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_remove_parameter, 0, 0, 2)
+   ZEND_ARG_INFO(0, namespace)
+   ZEND_ARG_INFO(0, name)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_has_exslt_support, 0, 0, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_register_php_functions, 0, 0, 
0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_set_profiling, 0, 0, 1)
+   ZEND_ARG_INFO(0, filename)
+ZEND_END_ARG_INFO();
+/* }}} */
+
 /*
 * class xsl_xsltprocessor 
 *
@@ -35,16 +90,16 @@
 */
 
 const zend_function_entry php_xsl_xsltprocessor_class_functions[] = {
-   PHP_FALIAS(importStylesheet, xsl_xsltprocessor_import_stylesheet, NULL)
-   PHP_FALIAS(transformToDoc, xsl_xsltprocessor_transform_to_doc, NULL)
-   PHP_FALIAS(transformToUri, xsl_xsltprocessor_transform_to_uri, NULL)
-   PHP_FALIAS(transformToXml, xsl_xsltprocessor_transform_to_xml, NULL)
-   PHP_FALIAS(setParameter, xsl_xsltprocessor_set_parameter, NULL)
-   PHP_FALIAS(getParameter, xsl_xsltprocessor_get_parameter, NULL)
-   PHP_FALIAS(removeParameter, xsl_xsltprocessor_remove_parameter, NULL)
-   PHP_FALIAS(hasExsltSupport, xsl_xsltprocessor_has_exslt_support, NULL)
-   PHP_FALIAS(registerPHPFunctions, 
xsl_xsltprocessor_register_php_functions, NULL)
-   PHP_FALIAS(setProfiling, xsl_xsltprocessor_set_profiling, NULL)
+   PHP_FALIAS(importStylesheet, xsl_xsltprocessor_import_stylesheet, 
arginfo_xsl_xsltprocessor_import_stylesheet)
+   PHP_FALIAS(transformToDoc, xsl_xsltprocessor_transform_to_doc, 
arginfo_xsl_xsltprocessor_transform_to_doc)
+   PHP_FALIAS(transformToUri, xsl_xsltprocessor_transform_to_uri, 
arginfo_xsl_xsltprocessor_transform_to_uri)
+   PHP_FALIAS(transformToXml, xsl_xsltprocessor_transform_to_xml, 
arginfo_xsl_xsltprocessor_transform_to_xml)
+   PHP_FALIAS(setParameter, xsl_xsltprocessor_set_parameter, 
arginfo_xsl_xsltprocessor_set_parameter)
+   PHP_FALIAS(getParameter, xsl_xsltprocessor_get_parameter, 
arginfo_xsl_xsltprocessor_get_parameter)
+   PHP_FALIAS(removeParameter, xsl_xsltprocessor_remove_parameter, 
arginfo_xsl_xsltprocessor_remove_parameter)
+   PHP_FALIAS(hasExsltSupport, xsl_xsltprocessor_has_exslt_support, 
arginfo_xsl_xsltprocessor_has_exslt_support)
+   PHP_FALIAS(registerPHPFunctions, 
xsl_xsltprocessor_register_php_functions, 
arginfo_xsl_xsltprocessor_register_php_functions)
+   PHP_FALIAS(setProfiling, xsl_xsltprocessor_set_profiling, 
arginfo_xsl_xsltprocessor_set_profiling)
{NULL, NULL, NULL}
 };
 

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

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

2008-01-28 Thread Sebastian Bergmann

sebastian   Tue Jan 29 07:51:46 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/xslxsltprocessor.c 
  Log:
  MFH: Add Reflection API metadata for XSLTProcessor.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/xsltprocessor.c?r1=1.39.2.2.2.11r2=1.39.2.2.2.12diff_format=u
Index: php-src/ext/xsl/xsltprocessor.c
diff -u php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.11 
php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.12
--- php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.11   Mon Dec 31 07:20:14 2007
+++ php-src/ext/xsl/xsltprocessor.c Tue Jan 29 07:51:46 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: xsltprocessor.c,v 1.39.2.2.2.11 2007/12/31 07:20:14 sebastian Exp $ */
+/* $Id: xsltprocessor.c,v 1.39.2.2.2.12 2008/01/29 07:51:46 sebastian Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -27,6 +27,56 @@
 #include php_xsl.h
 #include ext/libxml/php_libxml.h
 
+/* {{{ arginfo */
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_import_stylesheet, 0, 0, 1)
+   ZEND_ARG_OBJ_INFO(0, doc, DOMDocument, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_transform_to_doc, 0, 0, 1)
+   ZEND_ARG_OBJ_INFO(0, doc, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_transform_to_uri, 0, 0, 2)
+   ZEND_ARG_OBJ_INFO(0, doc, DOMDocument, 0)
+   ZEND_ARG_INFO(0, uri)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_transform_to_xml, 0, 0, 1)
+   ZEND_ARG_OBJ_INFO(0, doc, DOMDocument, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_set_parameter, 0, 0, 2)
+   ZEND_ARG_INFO(0, namespace)
+   ZEND_ARG_INFO(0, name)
+   ZEND_ARG_INFO(0, value)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_get_parameter, 0, 0, 2)
+   ZEND_ARG_INFO(0, namespace)
+   ZEND_ARG_INFO(0, name)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_remove_parameter, 0, 0, 2)
+   ZEND_ARG_INFO(0, namespace)
+   ZEND_ARG_INFO(0, name)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_has_exslt_support, 0, 0, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_register_php_functions, 0, 0, 
0)
+ZEND_END_ARG_INFO();
+/* }}} */
+
 /*
 * class xsl_xsltprocessor 
 *
@@ -35,15 +85,15 @@
 */
 
 zend_function_entry php_xsl_xsltprocessor_class_functions[] = {
-   PHP_FALIAS(importStylesheet, xsl_xsltprocessor_import_stylesheet, NULL)
-   PHP_FALIAS(transformToDoc, xsl_xsltprocessor_transform_to_doc, NULL)
-   PHP_FALIAS(transformToUri, xsl_xsltprocessor_transform_to_uri, NULL)
-   PHP_FALIAS(transformToXml, xsl_xsltprocessor_transform_to_xml, NULL)
-   PHP_FALIAS(setParameter, xsl_xsltprocessor_set_parameter, NULL)
-   PHP_FALIAS(getParameter, xsl_xsltprocessor_get_parameter, NULL)
-   PHP_FALIAS(removeParameter, xsl_xsltprocessor_remove_parameter, NULL)
-   PHP_FALIAS(hasExsltSupport, xsl_xsltprocessor_has_exslt_support, NULL)
-   PHP_FALIAS(registerPHPFunctions, 
xsl_xsltprocessor_register_php_functions, NULL)
+   PHP_FALIAS(importStylesheet, xsl_xsltprocessor_import_stylesheet, 
arginfo_xsl_xsltprocessor_import_stylesheet)
+   PHP_FALIAS(transformToDoc, xsl_xsltprocessor_transform_to_doc, 
arginfo_xsl_xsltprocessor_transform_to_doc)
+   PHP_FALIAS(transformToUri, xsl_xsltprocessor_transform_to_uri, 
arginfo_xsl_xsltprocessor_transform_to_uri)
+   PHP_FALIAS(transformToXml, xsl_xsltprocessor_transform_to_xml, 
arginfo_xsl_xsltprocessor_transform_to_xml)
+   PHP_FALIAS(setParameter, xsl_xsltprocessor_set_parameter, 
arginfo_xsl_xsltprocessor_set_parameter)
+   PHP_FALIAS(getParameter, xsl_xsltprocessor_get_parameter, 
arginfo_xsl_xsltprocessor_get_parameter)
+   PHP_FALIAS(removeParameter, xsl_xsltprocessor_remove_parameter, 
arginfo_xsl_xsltprocessor_remove_parameter)
+   PHP_FALIAS(hasExsltSupport, xsl_xsltprocessor_has_exslt_support, 
arginfo_xsl_xsltprocessor_has_exslt_support)
+   PHP_FALIAS(registerPHPFunctions, 
xsl_xsltprocessor_register_php_functions, 
arginfo_xsl_xsltprocessor_register_php_functions)
{NULL, NULL, NULL}
 };
 

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

39 matches

Mail list logo