Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/pdo_firebird firebird_driver.c

2009-04-21 Thread Johannes Schlüter
On Thu, 2009-04-16 at 22:14 +, Ilia Alshanetsky wrote: 
>  #include "php.h"
> +#ifdef ZEND_ENGINE_2
> +# include "zend_exceptions.h"
> +#else

Not that it is a big issue but do we really need PHP 4 compatibiity in
the code? :-)

johannes


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

2009-04-21 Thread Hannes Magnusson
bjori   Tue Apr 21 18:08:34 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/ldap   ldap.c 
  Log:
  MFH: adjust reflection info
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/ldap.c?r1=1.161.2.3.2.11.2.24&r2=1.161.2.3.2.11.2.25&diff_format=u
Index: php-src/ext/ldap/ldap.c
diff -u php-src/ext/ldap/ldap.c:1.161.2.3.2.11.2.24 
php-src/ext/ldap/ldap.c:1.161.2.3.2.11.2.25
--- php-src/ext/ldap/ldap.c:1.161.2.3.2.11.2.24 Tue Apr 21 12:26:19 2009
+++ php-src/ext/ldap/ldap.c Tue Apr 21 18:08:34 2009
@@ -23,7 +23,7 @@
+--+
  */
  
-/* $Id: ldap.c,v 1.161.2.3.2.11.2.24 2009/04/21 12:26:19 iliaa Exp $ */
+/* $Id: ldap.c,v 1.161.2.3.2.11.2.25 2009/04/21 18:08:34 bjori Exp $ */
 #define IS_EXT_MODULE
 
 #ifdef HAVE_CONFIG_H
@@ -224,7 +224,7 @@
 
php_info_print_table_start();
php_info_print_table_row(2, "LDAP Support", "enabled");
-   php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 
1.161.2.3.2.11.2.24 2009/04/21 12:26:19 iliaa Exp $");
+   php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 
1.161.2.3.2.11.2.25 2009/04/21 18:08:34 bjori Exp $");
 
if (LDAPG(max_links) == -1) {
snprintf(tmp, 31, "%ld/unlimited", LDAPG(num_links));
@@ -2208,6 +2208,11 @@
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_connect, 0, 0, 0)
ZEND_ARG_INFO(0, hostname)
ZEND_ARG_INFO(0, port)
+#ifdef HAVE_ORALDAP
+   ZEND_ARG_INFO(0, wallet)
+   ZEND_ARG_INFO(0, wallet_passwd)
+   ZEND_ARG_INFO(0, authmode)
+#endif
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_resource, 0, 0, 1)



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



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

2009-04-21 Thread Hannes Magnusson
bjori   Tue Apr 21 18:07:42 2009 UTC

  Modified files:  
/php-src/ext/ldap   ldap.c 
  Log:
  Adjust reflection info
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/ldap.c?r1=1.197&r2=1.198&diff_format=u
Index: php-src/ext/ldap/ldap.c
diff -u php-src/ext/ldap/ldap.c:1.197 php-src/ext/ldap/ldap.c:1.198
--- php-src/ext/ldap/ldap.c:1.197   Tue Apr 21 12:26:33 2009
+++ php-src/ext/ldap/ldap.c Tue Apr 21 18:07:42 2009
@@ -23,7 +23,7 @@
+--+
  */
  
-/* $Id: ldap.c,v 1.197 2009/04/21 12:26:33 iliaa Exp $ */
+/* $Id: ldap.c,v 1.198 2009/04/21 18:07:42 bjori Exp $ */
 #define IS_EXT_MODULE
 
 #ifdef HAVE_CONFIG_H
@@ -235,7 +235,7 @@
 
php_info_print_table_start();
php_info_print_table_row(2, "LDAP Support", "enabled");
-   php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.197 
2009/04/21 12:26:33 iliaa Exp $");
+   php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.198 
2009/04/21 18:07:42 bjori Exp $");
 
if (LDAPG(max_links) == -1) {
snprintf(tmp, 31, "%ld/unlimited", LDAPG(num_links));
@@ -2251,6 +2251,11 @@
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_connect, 0, 0, 0)
ZEND_ARG_INFO(0, hostname)
ZEND_ARG_INFO(0, port)
+#ifdef HAVE_ORALDAP
+   ZEND_ARG_INFO(0, wallet)
+   ZEND_ARG_INFO(0, wallet_passwd)
+   ZEND_ARG_INFO(0, authmode)
+#endif
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_resource, 0, 0, 1)



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



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

2009-04-21 Thread Ilia Alshanetsky
iliaa   Tue Apr 21 12:26:33 2009 UTC

  Modified files:  
/php-src/ext/ldap   ldap.c 
  Log:
  
  MFB: Adjusted prototype
  
http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/ldap.c?r1=1.196&r2=1.197&diff_format=u
Index: php-src/ext/ldap/ldap.c
diff -u php-src/ext/ldap/ldap.c:1.196 php-src/ext/ldap/ldap.c:1.197
--- php-src/ext/ldap/ldap.c:1.196   Sun Mar 29 18:44:45 2009
+++ php-src/ext/ldap/ldap.c Tue Apr 21 12:26:33 2009
@@ -23,7 +23,7 @@
+--+
  */
  
-/* $Id: ldap.c,v 1.196 2009/03/29 18:44:45 venaas Exp $ */
+/* $Id: ldap.c,v 1.197 2009/04/21 12:26:33 iliaa Exp $ */
 #define IS_EXT_MODULE
 
 #ifdef HAVE_CONFIG_H
@@ -235,7 +235,7 @@
 
php_info_print_table_start();
php_info_print_table_row(2, "LDAP Support", "enabled");
-   php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.196 
2009/03/29 18:44:45 venaas Exp $");
+   php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.197 
2009/04/21 12:26:33 iliaa Exp $");
 
if (LDAPG(max_links) == -1) {
snprintf(tmp, 31, "%ld/unlimited", LDAPG(num_links));
@@ -286,7 +286,7 @@
 }
 /* }}} */
 
-/* {{{ proto resource ldap_connect([string host [, int port]])
+/* {{{ proto resource ldap_connect([string host [, int port [, string wallet 
[, string wallet_passwd [, int authmode])
Connect to an LDAP server */
 PHP_FUNCTION(ldap_connect)
 {



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

2009-04-21 Thread Ilia Alshanetsky
iliaa   Tue Apr 21 12:26:20 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/ldap   ldap.c 
  Log:
  
  Adjusted prototype
  
http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/ldap.c?r1=1.161.2.3.2.11.2.23&r2=1.161.2.3.2.11.2.24&diff_format=u
Index: php-src/ext/ldap/ldap.c
diff -u php-src/ext/ldap/ldap.c:1.161.2.3.2.11.2.23 
php-src/ext/ldap/ldap.c:1.161.2.3.2.11.2.24
--- php-src/ext/ldap/ldap.c:1.161.2.3.2.11.2.23 Wed Dec 31 11:15:38 2008
+++ php-src/ext/ldap/ldap.c Tue Apr 21 12:26:19 2009
@@ -23,7 +23,7 @@
+--+
  */
  
-/* $Id: ldap.c,v 1.161.2.3.2.11.2.23 2008/12/31 11:15:38 sebastian Exp $ */
+/* $Id: ldap.c,v 1.161.2.3.2.11.2.24 2009/04/21 12:26:19 iliaa Exp $ */
 #define IS_EXT_MODULE
 
 #ifdef HAVE_CONFIG_H
@@ -224,7 +224,7 @@
 
php_info_print_table_start();
php_info_print_table_row(2, "LDAP Support", "enabled");
-   php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 
1.161.2.3.2.11.2.23 2008/12/31 11:15:38 sebastian Exp $");
+   php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 
1.161.2.3.2.11.2.24 2009/04/21 12:26:19 iliaa Exp $");
 
if (LDAPG(max_links) == -1) {
snprintf(tmp, 31, "%ld/unlimited", LDAPG(num_links));
@@ -275,7 +275,7 @@
 }
 /* }}} */
 
-/* {{{ proto resource ldap_connect([string host [, int port]])
+/* {{{ proto resource ldap_connect([string host [, int port [, string wallet 
[, string wallet_passwd [, int authmode])
Connect to an LDAP server */
 PHP_FUNCTION(ldap_connect)
 {



-- 
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/standard strnatcmp.c var_unserializer.c /ext/standard/tests/array bug44929.phpt

2009-04-21 Thread Dmitry Stogov

Hi Rasmus,

The ext/standard/tests/array/natcasesort_variation3.phpt still fails.

The problematic code:



Emits:

array(3) {
  [0]=>
  float(0.0001)
  [2]=>
  float(0.09)
  [1]=>
  float(0.0021)
}

The float 0.09 is greater than 0.0021, but 9 is less than 21.
I'm not sure that should be fixed, the code or the test.
Probably natsort() shouldn't care about float numbers at all.

Thanks. Dmitry.

Rasmus Lerdorf wrote:

Hannes Magnusson wrote:

On Wed, Apr 8, 2009 at 20:10, Rasmus Lerdorf  wrote:

rasmus  Wed Apr  8 18:10:46 2009 UTC

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

 Modified files:
   /php-src/ext/standard   strnatcmp.c var_unserializer.c
 Log:
 Fixed bug #44929 - Better handling of leading zeros

This commit breaks float sorting, see
ext/standard/tests/array/natcasesort_variation3.phpt


Hrm..  I ran 'make test' several times.  That test passed here.  I'll
take a closer look.

-Rasmus



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



[PHP-CVS] cvs: php-src /ext/standard/tests/file filetype_variation2.phpt

2009-04-21 Thread andy wharmby
wharmby Tue Apr 21 08:53:27 2009 UTC

  Modified files:  
/php-src/ext/standard/tests/filefiletype_variation2.phpt 
  Log:
  Fix test
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/filetype_variation2.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/standard/tests/file/filetype_variation2.phpt
diff -u php-src/ext/standard/tests/file/filetype_variation2.phpt:1.4 
php-src/ext/standard/tests/file/filetype_variation2.phpt:1.5
--- php-src/ext/standard/tests/file/filetype_variation2.phpt:1.4Wed Apr 
15 20:56:49 2009
+++ php-src/ext/standard/tests/file/filetype_variation2.phptTue Apr 21 
08:53:27 2009
@@ -9,6 +9,7 @@
 }
 if (!file_exists("/dev/console")) {
 die('skip /dev/console not available');
+}
 ?>
 --FILE--
 http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



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

2009-04-21 Thread andy wharmby
wharmby Tue Apr 21 08:53:26 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard/tests/filefiletype_variation2.phpt 
  Log:
  Fix test
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/filetype_variation2.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/file/filetype_variation2.phpt
diff -u php-src/ext/standard/tests/file/filetype_variation2.phpt:1.1.2.2 
php-src/ext/standard/tests/file/filetype_variation2.phpt:1.1.2.3
--- php-src/ext/standard/tests/file/filetype_variation2.phpt:1.1.2.2Wed Apr 
15 20:57:26 2009
+++ php-src/ext/standard/tests/file/filetype_variation2.phptTue Apr 21 
08:53:26 2009
@@ -9,6 +9,7 @@
 }
 if (!file_exists("/dev/console")) {
 die('skip /dev/console not available');
+}
 ?>
 --FILE--
 http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



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

2009-04-21 Thread andy wharmby
wharmby Tue Apr 21 08:53:25 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard/tests/filefiletype_variation2.phpt 
  Log:
  Fix test
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/filetype_variation2.phpt?r1=1.1.4.4&r2=1.1.4.5&diff_format=u
Index: php-src/ext/standard/tests/file/filetype_variation2.phpt
diff -u php-src/ext/standard/tests/file/filetype_variation2.phpt:1.1.4.4 
php-src/ext/standard/tests/file/filetype_variation2.phpt:1.1.4.5
--- php-src/ext/standard/tests/file/filetype_variation2.phpt:1.1.4.4Wed Apr 
15 20:56:58 2009
+++ php-src/ext/standard/tests/file/filetype_variation2.phptTue Apr 21 
08:53:25 2009
@@ -9,6 +9,7 @@
 }
 if (!file_exists("/dev/console")) {
 die('skip /dev/console not available');
+}
 ?>
 --FILE--
 http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: CVSROOT / avail

2009-04-21 Thread Pierre-Alain Joye
pajoye  Tue Apr 21 07:32:05 2009 UTC

  Modified files:  
/CVSROOTavail 
  Log:
  - give sebs karma for php-src (phpt)
  
http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1517&r2=1.1518&diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1517 CVSROOT/avail:1.1518
--- CVSROOT/avail:1.1517Thu Apr 16 09:57:08 2009
+++ CVSROOT/avail   Tue Apr 21 07:32:05 2009
@@ -17,7 +17,7 @@
 # The PHP Developers have full access to the full source trees for
 # PHP, as well as the documentation.
 
-avail|mbeccati,dkelsey,ilewis,mkoppanen,lstrojny,dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,ericstewart,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,!
 
tony2001,johannes,dbs,skoduru,nrathna,jesus,gopalv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe,robinf,jmessa,philip,sixd,gwynne,ant,kalle,mattwil,sfox,hnangelo,ohill,indeyets,felixdv,mich4ld,lbarnaud,cseiler,sean,tabe|phpfi,php3,php-src,pecl,non-pecl,spl,phpdoc,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-ca,phpdoc-no,phd,docweb,doc-editor
+avail|mbeccati,dkelsey,ilewis,mkoppanen,lstrojny,dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,ericstewart,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,!
 
tony2001,johannes,dbs,skoduru,nrathna,jesus,gopalv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe,robinf,jmessa,philip,sixd,gwynne,ant,kalle,mattwil,sfox,hnangelo,ohill,indeyets,felixdv,mich4ld,lbarnaud,cseiler,sean,tabe,sebs|phpfi,php3,php-src,pecl,non-pecl,spl,phpdoc,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-ca,phpdoc-no,phd,docweb,doc-editor
 
 # Some people have access to tests in the Engine
 
avail|ilewis,magnus,michael,zoe,jmessa,sfox,tomerc,felixdv|Zend/tests,ZendEngine2/tests



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