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

2008-07-07 Thread changelog 
changelog   Tue Jul  8 01:32:01 2008 UTC

  Modified files:  
/php-srcChangeLog 
  Log:
  ChangeLog update
  http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3100r2=1.3101diff_format=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.3100 php-src/ChangeLog:1.3101
--- php-src/ChangeLog:1.3100Mon Jul  7 01:31:50 2008
+++ php-src/ChangeLog   Tue Jul  8 01:32:01 2008
@@ -1,3 +1,355 @@
+2008-07-07  David Soria Parra  [EMAIL PROTECTED]
+
+* (PHP_5_3)
+  ext/exif/tests/exif007.phpt
+  ext/exif/tests/exif008.phpt
+  ext/exif/tests/exif009.phpt
+  ext/exif/tests/exif010.phpt
+  ext/exif/tests/exif011.phpt
+  ext/exif/tests/exif012.phpt
+  ext/exif/tests/exif013.phpt
+  ext/exif/tests/exif014.phpt
+  ext/exif/tests/exif015.phpt
+  ext/exif/tests/exif016.phpt
+  ext/exif/tests/exif017.phpt
+  ext/exif/tests/exif018.phpt
+  ext/exif/tests/exif020.phpt
+  ext/exif/tests/exif021.phpt
+  ext/exif/tests/exif022.phpt
+  ext/exif/tests/exif023.phpt
+  ext/exif/tests/exif024.phpt
+  ext/exif/tests/exif025.phpt
+  ext/exif/tests/exif026.phpt
+  ext/exif/tests/exif027.phpt
+  ext/exif/tests/image007.jpg
+  ext/exif/tests/image008.jpg
+  ext/exif/tests/image009.jpg
+  ext/exif/tests/image010.jpg
+  ext/exif/tests/image011.jpg
+  ext/exif/tests/image012.jpg
+  ext/exif/tests/image013.jpg
+  ext/exif/tests/image014.jpg
+  ext/exif/tests/image015.jpg
+  ext/exif/tests/image016.tiff
+  ext/exif/tests/image017.tiff
+  ext/exif/tests/image018.tiff
+  ext/exif/tests/image020.tiff
+  ext/exif/tests/image021.tiff
+  ext/exif/tests/image022.tiff
+  ext/exif/tests/image023.tiff
+  ext/exif/tests/image024.jpg
+  ext/exif/tests/image025.jpg
+  ext/exif/tests/image026.tiff
+  ext/exif/tests/image027.tiff:
+  Exif tests from Eric Steward. Testfest task 82.
+
+* ext/exif/tests/exif007.phpt
+  ext/exif/tests/exif007.phpt
+  ext/exif/tests/exif008.phpt
+  ext/exif/tests/exif008.phpt
+  ext/exif/tests/exif009.phpt
+  ext/exif/tests/exif009.phpt
+  ext/exif/tests/exif010.phpt
+  ext/exif/tests/exif010.phpt
+  ext/exif/tests/exif011.phpt
+  ext/exif/tests/exif011.phpt
+  ext/exif/tests/exif012.phpt
+  ext/exif/tests/exif012.phpt
+  ext/exif/tests/exif013.phpt
+  ext/exif/tests/exif013.phpt
+  ext/exif/tests/exif014.phpt
+  ext/exif/tests/exif014.phpt
+  ext/exif/tests/exif015.phpt
+  ext/exif/tests/exif015.phpt
+  ext/exif/tests/exif016.phpt
+  ext/exif/tests/exif016.phpt
+  ext/exif/tests/exif017.phpt
+  ext/exif/tests/exif017.phpt
+  ext/exif/tests/exif018.phpt
+  ext/exif/tests/exif018.phpt
+  ext/exif/tests/exif020.phpt
+  ext/exif/tests/exif020.phpt
+  ext/exif/tests/exif021.phpt
+  ext/exif/tests/exif021.phpt
+  ext/exif/tests/exif022.phpt
+  ext/exif/tests/exif022.phpt
+  ext/exif/tests/exif023.phpt
+  ext/exif/tests/exif023.phpt
+  ext/exif/tests/exif024.phpt
+  ext/exif/tests/exif024.phpt
+  ext/exif/tests/exif025.phpt
+  ext/exif/tests/exif025.phpt
+  ext/exif/tests/exif026.phpt
+  ext/exif/tests/exif026.phpt
+  ext/exif/tests/exif027.phpt
+  ext/exif/tests/exif027.phpt
+  ext/exif/tests/image007.jpg
+  ext/exif/tests/image007.jpg
+  ext/exif/tests/image008.jpg
+  ext/exif/tests/image008.jpg
+  ext/exif/tests/image009.jpg
+  ext/exif/tests/image009.jpg
+  ext/exif/tests/image010.jpg
+  ext/exif/tests/image010.jpg
+  ext/exif/tests/image011.jpg
+  ext/exif/tests/image011.jpg
+  ext/exif/tests/image012.jpg
+  ext/exif/tests/image012.jpg
+  ext/exif/tests/image013.jpg
+  ext/exif/tests/image013.jpg
+  ext/exif/tests/image014.jpg
+  ext/exif/tests/image014.jpg
+  ext/exif/tests/image015.jpg
+  ext/exif/tests/image015.jpg
+  ext/exif/tests/image016.tiff
+  ext/exif/tests/image016.tiff
+  ext/exif/tests/image017.tiff
+  ext/exif/tests/image017.tiff
+  ext/exif/tests/image018.tiff
+  ext/exif/tests/image018.tiff
+  ext/exif/tests/image020.tiff
+  ext/exif/tests/image020.tiff
+  ext/exif/tests/image021.tiff
+  ext/exif/tests/image021.tiff
+  ext/exif/tests/image022.tiff
+  ext/exif/tests/image022.tiff
+  ext/exif/tests/image023.tiff
+  ext/exif/tests/image023.tiff
+  ext/exif/tests/image024.jpg
+  ext/exif/tests/image024.jpg
+  ext/exif/tests/image025.jpg
+  ext/exif/tests/image025.jpg
+  ext/exif/tests/image026.tiff
+  ext/exif/tests/image026.tiff
+  ext/exif/tests/image027.tiff
+  ext/exif/tests/image027.tiff:
+  
+  Exif tests from Eric Steward. Testfest task 82.
+
+2008-07-07  Scott MacVicar  [EMAIL PROTECTED]
+
+* (PHP_5_3)
+  ZendEngine2/zend_ini.c:
+  Tweak last commit, should always return NULL

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

2008-07-07 Thread changelog 
changelog   Tue Jul  8 01:32:04 2008 UTC

  Modified files:  
/ZendEngine2ChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1331r2=1.1332diff_format=u
Index: ZendEngine2/ChangeLog
diff -u ZendEngine2/ChangeLog:1.1331 ZendEngine2/ChangeLog:1.1332
--- ZendEngine2/ChangeLog:1.1331Mon Jul  7 01:31:55 2008
+++ ZendEngine2/ChangeLog   Tue Jul  8 01:32:04 2008
@@ -1,3 +1,35 @@
+2008-07-07  Scott MacVicar  [EMAIL PROTECTED]
+
+* (PHP_5_3)
+  zend_ini.c:
+  Tweak last commit, should always return NULL when an entry doesn't exist.
+
+* zend_ini.c
+  zend_ini.c
+  zend_ini.h
+  zend_ini.h:
+  Add zend_ini_string_ex so that the you can differentiate between NULL as 
a
+  value and its absence, this is important for ini_get. Related to bug
+  #42657 and #43348
+
+2008-07-07  Felipe Pena  [EMAIL PROTECTED]
+
+* zend_arg_defs.c
+  zend_modules.h:
+  MFB:
+  - Removed zend_arg_defs.c
+The first_arg_force_ref, second_arg_force_ref, third_arg_force_ref,
+ fourth_arg_force_ref, fifth_arg_force_ref and all_args_by_ref are not
+  more used.
+
+* (PHP_5_3)
+  zend_arg_defs.c
+  zend_modules.h:
+  - Removed zend_arg_defs.c
+The first_arg_force_ref, second_arg_force_ref, third_arg_force_ref,
+ fourth_arg_force_ref, fifth_arg_force_ref and all_args_by_ref are not
+  more used.
+
 2008-07-06  Nuno Lopes  [EMAIL PROTECTED]
 
 * zend_language_scanner.c
@@ -24450,7 +24482,7 @@
 2003-06-10  Jani Taskinen  [EMAIL PROTECTED]
 
 * zend_multiply.h:
-  - Missing $Id: ChangeLog,v 1.1331 2008/07/07 01:31:55 changelog Exp $ tag
+  - Missing $Id: ChangeLog,v 1.1332 2008/07/08 01:32:04 changelog Exp $ tag
 
 2003-06-10  James Cox  [EMAIL PROTECTED]
 
@@ -26174,7 +26206,7 @@
   zend_types.h
   zend_variables.c
   zend_variables.h:
-  - Added some missing CVS $Id: ChangeLog,v 1.1331 2008/07/07 01:31:55 
changelog Exp $ tags, headers and footers.
+  - Added some missing CVS $Id: ChangeLog,v 1.1332 2008/07/08 01:32:04 
changelog Exp $ tags, headers and footers.
 
 2003-01-30  Ilia Alshanetsky  [EMAIL PROTECTED]

Re: [PHP-CVS] cvs: php-src(PHP_5_3) /win32/build config.w32 confutils.js

2008-07-07 Thread Pierre Joye 
On Mon, Jul 7, 2008 at 3:23 AM, Steph Fox [EMAIL PROTECTED] wrote:
 sfoxMon Jul  7 01:23:56 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/win32/buildconfig.w32 confutils.js
  Log:
  - Fix up some bits and pieces.

For examples? Log message helps to see what has been changed, please be verbose.

  - Head towards making it possible for all platforms to have compiler info in 
 phpinfo() output.

It is already in php info:

phpinfo()
PHP Version = 5.3.0-dev

System = Windows NT PIERREXP64 5.2 build 3790
Build Date = Jul  6 2008 11:50:59
Configure Command = cscript /nologo configure.js
--enable-snapshot-build --with-php-build=..\deps
--with-gd=shared --disable-phar --with-mysqli --disable-apc
--without-maxdb
Windows Compiler and Version = MSVC6

What is missing is the non windows platform part. As far as I remember
someone is already working on it and will add this info as well.


  - Make it possible to switch off configure summary (--without-summary).

Talking about asking before committing, please do it next time (as I
do). The idea is the other way round, to drop the noise or get it if
enabled.

 http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.40.2.8.2.10.2.20r2=1.40.2.8.2.10.2.21diff_format=u
 Index: php-src/win32/build/config.w32

 +var VC_VERSIONS = new Array();
 +VC_VERSIONS[1200] = 'MSVC6 (Visual C++ 6.0)';
 +VC_VERSIONS[1300] = 'MSVC7 (Visual C++ 2002)';
 +VC_VERSIONS[1310] = 'MSVC7.1 (Visual C++ 2003)';
 +VC_VERSIONS[1400] = 'MSVC8 (Visual C++ 2005)';
 +VC_VERSIONS[1500] = 'MSVC9 (Visual C++ 2008)';
 +
  // Which version of the compiler do we have?
 -VCVERS = probe_binary(CL);
 -VCVERS = VCVERS.substr(0, 2) + VCVERS.substr(3, 2);
 -STDOUT.WriteLine(Detected MS compiler version  + VCVERS);
 -
 -// 1200 is VC6
 -// 1300 is vs.net 2002
 -// 1310 is vs.net 2003
 -// 1400 is vs.net 2005
 -// 1500 is vs.net 2008
 +VCVERS = probe_binary(CL).substr(0, 5).replace('.', '');
 +STDOUT.WriteLine(  Detected compiler  + VC_VERSIONS[VCVERS]);
 +AC_DEFINE('COMPILER', VC_VERSIONS[VCVERS], Detected compiler version);

snip
 http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.8.2.19r2=1.60.2.1.2.8.2.20diff_format=u
 Index: php-src/win32/build/confutils.js
 diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8.2.19 
 php-src/win32/build/confutils.js:1.60.2.1.2.8.2.20
 --- php-src/win32/build/confutils.js:1.60.2.1.2.8.2.19  Sat Jul  5 19:53:04 
 2008
 +++ php-src/win32/build/confutils.jsMon Jul  7 01:23:56 2008
 @@ -17,7 +17,7 @@
   +--+
  */

 -// $Id: confutils.js,v 1.60.2.1.2.8.2.19 2008/07/05 19:53:04 pajoye Exp $
 +// $Id: confutils.js,v 1.60.2.1.2.8.2.20 2008/07/07 01:23:56 sfox Exp $

  var STDOUT = WScript.StdOut;
  var STDERR = WScript.StdErr;
 @@ -30,13 +30,6 @@
  var extensions_enabled = new Array();
  var sapi_enabled = new Array();

 -var VC_VERSIONS = new Array();
 -VC_VERSIONS[1200] = 'VC6';
 -VC_VERSIONS[1300] = 'Visual C++ 2002';
 -VC_VERSIONS[1310] = 'Visual C++ 2003';
 -VC_VERSIONS[1400] = 'Visual C++ 2005';
 -VC_VERSIONS[1500] = 'Visual C++ 2008';

Please leave the declaration here, it is in the top of the configure
script where other globals are declared.


Cheers,
-- 
Pierre

http://blog.thepimp.net | http://www.libgd.org

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

[PHP-CVS] cvs: php-src /ext/gd config.w32 gd.c

2008-07-07 Thread Pierre-Alain Joye 
pajoye  Mon Jul  7 08:36:04 2008 UTC

  Modified files:  
/php-src/ext/gd config.w32 gd.c 
  Log:
  - restore wrongly removed vars
  - test if zlib is shared or not (possible conflict)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.w32?r1=1.25r2=1.26diff_format=u
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.25 php-src/ext/gd/config.w32:1.26
--- php-src/ext/gd/config.w32:1.25  Sun Jul  6 17:06:43 2008
+++ php-src/ext/gd/config.w32   Mon Jul  7 08:36:04 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.25 2008/07/06 17:06:43 pajoye Exp $
+// $Id: config.w32,v 1.26 2008/07/07 08:36:04 pajoye Exp $
 // vim:ft=javascript
 
 ARG_WITH(gd, Bundled GD support, yes,shared);
@@ -8,12 +8,12 @@
if (CHECK_LIB(libjpeg.lib, gd, PHP_GD) 
(CHECK_LIB(freetype.lib, gd, PHP_GD) || 
CHECK_LIB(freetype2.lib, gd, PHP_GD) ) 
(CHECK_LIB(libpng_a.lib, gd, PHP_GD) || 
CHECK_LIB(libpng.lib, gd, PHP_GD) ) 
-   (CHECK_LIB(zlib_a.lib, gd, PHP_GD) || CHECK_LIB(zlib.lib, 
gd, PHP_GD) ) 
(CHECK_LIB(libiconv_a.lib, gd, PHP_GD) || 
CHECK_LIB(libiconv.lib, gd, PHP_GD) ) 
CHECK_HEADER_ADD_INCLUDE(gd.h, CFLAGS_GD, PHP_GD + 
;ext\\gd\\libgd) 
(CHECK_LIB(libiconv_a.lib, iconv, PHP_ICONV) || 
CHECK_LIB(libiconv.lib, iconv, PHP_ICONV) ||
 CHECK_LIB(iconv_a.lib, iconv, PHP_ICONV) || 
CHECK_LIB(iconv.lib, iconv, PHP_ICONV)) 
-   CHECK_HEADER_ADD_INCLUDE(iconv.h, CFLAGS_ICONV, PHP_ICONV)
+   CHECK_HEADER_ADD_INCLUDE(iconv.h, CFLAGS_ICONV, PHP_ICONV) 

+   ((!PHP_ZLIB_SHARED) || CHECK_LIB(zlib_a.lib, gd, PHP_GD))
) {
if (PHP_T1LIB != no) {
if (CHECK_LIB(T1_StaticMD.lib, gd, PHP_GD) 
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.387r2=1.388diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.387 php-src/ext/gd/gd.c:1.388
--- php-src/ext/gd/gd.c:1.387   Sun Jul  6 17:06:43 2008
+++ php-src/ext/gd/gd.c Mon Jul  7 08:36:04 2008
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: gd.c,v 1.387 2008/07/06 17:06:43 pajoye Exp $ */
+/* $Id: gd.c,v 1.388 2008/07/07 08:36:04 pajoye Exp $ */
 
 /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -1906,6 +1906,8 @@
HDC memDC;
HBITMAP memBM;
HBITMAP hOld;
+   HINSTANCE handle;
+   long lwindow_handle;
typedef BOOL (WINAPI *tPrintWindow)(HWND, HDC,UINT);
tPrintWindow pPrintWindow = 0;
gdImagePtr im;



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

[PHP-CVS] cvs: php-src /ext/gd config.w32 gd.c

2008-07-07 Thread Pierre-Alain Joye 
pajoye  Mon Jul  7 08:40:04 2008 UTC

  Modified files:  
/php-src/ext/gd config.w32 gd.c 
  Log:
  - add support for old named zlib (no _a or dynamic) 
  - nuke the right unused vars
  
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.w32?r1=1.26r2=1.27diff_format=u
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.26 php-src/ext/gd/config.w32:1.27
--- php-src/ext/gd/config.w32:1.26  Mon Jul  7 08:36:04 2008
+++ php-src/ext/gd/config.w32   Mon Jul  7 08:40:04 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.26 2008/07/07 08:36:04 pajoye Exp $
+// $Id: config.w32,v 1.27 2008/07/07 08:40:04 pajoye Exp $
 // vim:ft=javascript
 
 ARG_WITH(gd, Bundled GD support, yes,shared);
@@ -13,7 +13,7 @@
(CHECK_LIB(libiconv_a.lib, iconv, PHP_ICONV) || 
CHECK_LIB(libiconv.lib, iconv, PHP_ICONV) ||
 CHECK_LIB(iconv_a.lib, iconv, PHP_ICONV) || 
CHECK_LIB(iconv.lib, iconv, PHP_ICONV)) 
CHECK_HEADER_ADD_INCLUDE(iconv.h, CFLAGS_ICONV, PHP_ICONV) 

-   ((!PHP_ZLIB_SHARED) || CHECK_LIB(zlib_a.lib, gd, PHP_GD))
+   ((!PHP_ZLIB_SHARED) || CHECK_LIB(zlib_a.lib, gd, PHP_GD) || 
 CHECK_LIB(zlib.lib, gd, PHP_GD))
) {
if (PHP_T1LIB != no) {
if (CHECK_LIB(T1_StaticMD.lib, gd, PHP_GD) 
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.388r2=1.389diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.388 php-src/ext/gd/gd.c:1.389
--- php-src/ext/gd/gd.c:1.388   Mon Jul  7 08:36:04 2008
+++ php-src/ext/gd/gd.c Mon Jul  7 08:40:04 2008
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: gd.c,v 1.388 2008/07/07 08:36:04 pajoye Exp $ */
+/* $Id: gd.c,v 1.389 2008/07/07 08:40:04 pajoye Exp $ */
 
 /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -1994,8 +1994,6 @@
HDC memDC;
HBITMAP memBM;
HBITMAP hOld;
-   HINSTANCE handle;
-   long lwindow_handle;
typedef BOOL (WINAPI *tPrintWindow)(HWND, HDC,UINT);
tPrintWindow pPrintWindow = 0;
gdImagePtr im;



-- 
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/gd config.w32

2008-07-07 Thread Pierre-Alain Joye 
pajoye  Mon Jul  7 08:41:10 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/gd config.w32 
  Log:
  - test for ZLIB_SHARED (possible conflict)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.w32?r1=1.10.4.4.2.1r2=1.10.4.4.2.2diff_format=u
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.10.4.4.2.1 
php-src/ext/gd/config.w32:1.10.4.4.2.2
--- php-src/ext/gd/config.w32:1.10.4.4.2.1  Sun Jul  6 17:07:26 2008
+++ php-src/ext/gd/config.w32   Mon Jul  7 08:41:10 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.10.4.4.2.1 2008/07/06 17:07:26 pajoye Exp $
+// $Id: config.w32,v 1.10.4.4.2.2 2008/07/07 08:41:10 pajoye Exp $
 // vim:ft=javascript
 
 ARG_WITH(gd, Bundled GD support, yes,shared);
@@ -8,12 +8,12 @@
if (CHECK_LIB(libjpeg.lib, gd, PHP_GD) 
(CHECK_LIB(freetype.lib, gd, PHP_GD) || 
CHECK_LIB(freetype2.lib, gd, PHP_GD) ) 
(CHECK_LIB(libpng_a.lib, gd, PHP_GD) || 
CHECK_LIB(libpng.lib, gd, PHP_GD) ) 
-   (CHECK_LIB(zlib_a.lib, gd, PHP_GD) || CHECK_LIB(zlib.lib, 
gd, PHP_GD) ) 
(CHECK_LIB(libiconv_a.lib, gd, PHP_GD) || 
CHECK_LIB(libiconv.lib, gd, PHP_GD) ) 
CHECK_HEADER_ADD_INCLUDE(gd.h, CFLAGS_GD, PHP_GD + 
;ext\\gd\\libgd) 
(CHECK_LIB(libiconv_a.lib, iconv, PHP_ICONV) || 
CHECK_LIB(libiconv.lib, iconv, PHP_ICONV) ||
 CHECK_LIB(iconv_a.lib, iconv, PHP_ICONV) || 
CHECK_LIB(iconv.lib, iconv, PHP_ICONV)) 
-   CHECK_HEADER_ADD_INCLUDE(iconv.h, CFLAGS_ICONV, PHP_ICONV)
+   CHECK_HEADER_ADD_INCLUDE(iconv.h, CFLAGS_ICONV, PHP_ICONV) 

+   ((!PHP_ZLIB_SHARED) || CHECK_LIB(zlib_a.lib, gd, PHP_GD) || 
 CHECK_LIB(zlib.lib, gd, PHP_GD))
) {
if (PHP_T1LIB != no) {
if (CHECK_LIB(T1_StaticMD.lib, gd, PHP_GD) 
@@ -25,10 +25,6 @@
}
}
 
-   if (PHP_ZLIB == no || PHP_ZLIB_SHARED) {
-   CHECK_LIB(zlib.lib, gd, PHP_GD);
-   }
-
CHECK_LIB(User32.lib, gd, PHP_GD);
CHECK_LIB(Gdi32.lib, gd, PHP_GD);
 



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

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

2008-07-07 Thread Alexey Zakhlestin 
indeyetsMon Jul  7 09:47:03 2008 UTC

  Modified files:  
/php-src/ext/mbstring   mbstring.c 
  Log:
  MFB: added arginfo (fixes #45388)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.277r2=1.278diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.277 
php-src/ext/mbstring/mbstring.c:1.278
--- php-src/ext/mbstring/mbstring.c:1.277   Fri Jun 13 14:47:48 2008
+++ php-src/ext/mbstring/mbstring.c Mon Jul  7 09:47:02 2008
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: mbstring.c,v 1.277 2008/06/13 14:47:48 hirokawa Exp $ */
+/* $Id: mbstring.c,v 1.278 2008/07/07 09:47:02 indeyets Exp $ */
 
 /*
  * PHP 4 Multibyte String module mbstring
@@ -169,6 +169,26 @@
ZEND_ARG_PASS_INFO(0)
ZEND_END_ARG_INFO()
 
+static
+   ZEND_BEGIN_ARG_INFO_EX(mb_parse_str_arginfo, 0, 0, 1)
+   ZEND_ARG_INFO(0, encoded_string)
+   ZEND_ARG_ARRAY_INFO(1, result, 1)
+   ZEND_END_ARG_INFO()
+
+static
+   ZEND_BEGIN_ARG_INFO_EX(mb_convert_variables_arginfo, 1, 0, 3)
+   ZEND_ARG_INFO(0, to_encoding)
+   ZEND_ARG_INFO(0, from_encoding)
+   ZEND_ARG_INFO(1, vars)
+   ZEND_END_ARG_INFO()
+
+static
+   ZEND_BEGIN_ARG_INFO_EX(mb_ereg_arginfo, 0, 0, 2)
+   ZEND_ARG_INFO(0, pattern)
+   ZEND_ARG_INFO(0, string)
+   ZEND_ARG_INFO(1, regs)
+   ZEND_END_ARG_INFO()
+
 /* {{{ mb_overload_def mb_ovld[] */
 static const struct mb_overload_def mb_ovld[] = {
{MB_OVERLOAD_MAIL, mail, mb_send_mail, mb_orig_mail},
@@ -206,7 +226,7 @@
PHP_FE(mb_http_output,  NULL)
PHP_FE(mb_detect_order, NULL)
PHP_FE(mb_substitute_character, NULL)
-   PHP_FE(mb_parse_str,second_arg_force_ref)
+   PHP_FE(mb_parse_str,mb_parse_str_arginfo)
PHP_FE(mb_output_handler,   NULL)
PHP_FE(mb_preferred_mime_name,  NULL)
PHP_FE(mb_strlen,   NULL)
@@ -231,7 +251,7 @@
PHP_FE(mb_convert_kana, NULL)
PHP_FE(mb_encode_mimeheader,NULL)
PHP_FE(mb_decode_mimeheader,NULL)
-   PHP_FE(mb_convert_variables,third_and_rest_force_ref)
+   PHP_FE(mb_convert_variables,mb_convert_variables_arginfo)
PHP_FE(mb_encode_numericentity, NULL)
PHP_FE(mb_decode_numericentity, NULL)
PHP_FE(mb_send_mail,NULL)



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

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

2008-07-07 Thread Alexey Zakhlestin 
indeyetsMon Jul  7 09:57:12 2008 UTC

  Modified files:  
/php-src/ext/mbstring   mbstring.c 
  Log:
  MFB: updated to the new parameter-parsing api
  http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.278r2=1.279diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.278 
php-src/ext/mbstring/mbstring.c:1.279
--- php-src/ext/mbstring/mbstring.c:1.278   Mon Jul  7 09:47:02 2008
+++ php-src/ext/mbstring/mbstring.c Mon Jul  7 09:57:12 2008
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: mbstring.c,v 1.278 2008/07/07 09:47:02 indeyets Exp $ */
+/* $Id: mbstring.c,v 1.279 2008/07/07 09:57:12 indeyets Exp $ */
 
 /*
  * PHP 4 Multibyte String module mbstring
@@ -1292,12 +1292,17 @@
Sets the current detect_order or Return the current detect_order as a array 
*/
 PHP_FUNCTION(mb_detect_order)
 {
-   zval **arg1;
+   size_t argc = ZEND_NUM_ARGS();
+   zval *arg1;
int n, size;
enum mbfl_no_encoding *list, *entry;
char *name;
 
-   if (ZEND_NUM_ARGS() == 0) {
+   if (zend_parse_parameters(argc TSRMLS_CC, |z, arg1) == FAILURE) {
+   return;
+   }
+
+   if (argc == 0) {
array_init(return_value);
entry = MBSTRG(current_detect_order_list);
n = MBSTRG(current_detect_order_list_size);
@@ -1309,12 +1314,12 @@
entry++;
n--;
}
-   } else if (ZEND_NUM_ARGS() == 1  zend_get_parameters_ex(1, arg1) != 
FAILURE) {
+   } else {
list = NULL;
size = 0;
-   switch (Z_TYPE_PP(arg1)) {
+   switch (Z_TYPE_P(arg1)) {
case IS_ARRAY:
-   if (!php_mb_parse_encoding_array(*arg1, list, size, 0 
TSRMLS_CC)) {
+   if (!php_mb_parse_encoding_array(arg1, list, size, 0 
TSRMLS_CC)) {
if (list) {
efree(list);
}
@@ -1322,8 +1327,8 @@
}
break;
default:
-   convert_to_string_ex(arg1);
-   if (!php_mb_parse_encoding_list(Z_STRVAL_PP(arg1), 
Z_STRLEN_PP(arg1), list, size, 0 TSRMLS_CC)) {
+   convert_to_string_ex(arg1);
+   if (!php_mb_parse_encoding_list(Z_STRVAL_P(arg1), 
Z_STRLEN_P(arg1), list, size, 0 TSRMLS_CC)) {
if (list) {
efree(list);
}
@@ -1331,18 +1336,17 @@
}
break;
}
+
if (list == NULL) {
-   RETVAL_FALSE;
-   } else {
-   if (MBSTRG(current_detect_order_list)) {
-   efree(MBSTRG(current_detect_order_list));
-   }
-   MBSTRG(current_detect_order_list) = list;
-   MBSTRG(current_detect_order_list_size) = size;
-   RETVAL_TRUE;
+   RETURN_FALSE;
}
-   } else {
-   WRONG_PARAM_COUNT;
+
+   if (MBSTRG(current_detect_order_list)) {
+   efree(MBSTRG(current_detect_order_list));
+   }
+   MBSTRG(current_detect_order_list) = list;
+   MBSTRG(current_detect_order_list_size) = size;
+   RETURN_TRUE;
}
 }
 /* }}} */
@@ -1351,52 +1355,56 @@
Sets the current substitute_character or returns the current 
substitute_character */
 PHP_FUNCTION(mb_substitute_character)
 {
-   zval **arg1;
+   zval *arg1;
+
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |z, arg1) == 
FAILURE) {
+   return;
+   }
 
if (ZEND_NUM_ARGS() == 0) {
if (MBSTRG(current_filter_illegal_mode) == 
MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE) {
-   RETVAL_STRING(none, 1);
+   RETURN_STRING(none, 1);
} else if (MBSTRG(current_filter_illegal_mode) == 
MBFL_OUTPUTFILTER_ILLEGAL_MODE_LONG) {
-   RETVAL_STRING(long, 1);
+   RETURN_STRING(long, 1);
} else if (MBSTRG(current_filter_illegal_mode) == 
MBFL_OUTPUTFILTER_ILLEGAL_MODE_ENTITY) {
-   RETVAL_STRING(entity, 1);
+   RETURN_STRING(entity, 1);
} else {
-   RETVAL_LONG(MBSTRG(current_filter_illegal_substchar));
+   RETURN_LONG(MBSTRG(current_filter_illegal_substchar));
}
-   } else if (ZEND_NUM_ARGS() == 1  zend_get_parameters_ex(1, arg1) != 
FAILURE) {
+   } else {

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

2008-07-07 Thread Alexey Zakhlestin 
indeyetsMon Jul  7 10:00:31 2008 UTC

  Modified files:  
/php-src/ext/mbstring   mbstring.c 
  Log:
  MFB: string length - int
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.279r2=1.280diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.279 
php-src/ext/mbstring/mbstring.c:1.280
--- php-src/ext/mbstring/mbstring.c:1.279   Mon Jul  7 09:57:12 2008
+++ php-src/ext/mbstring/mbstring.c Mon Jul  7 10:00:30 2008
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: mbstring.c,v 1.279 2008/07/07 09:57:12 indeyets Exp $ */
+/* $Id: mbstring.c,v 1.280 2008/07/07 10:00:30 indeyets Exp $ */
 
 /*
  * PHP 4 Multibyte String module mbstring
@@ -2099,8 +2099,8 @@
 {
size_t argc = ZEND_NUM_ARGS();
char *str, *encoding;
-   long str_len, from, len, encoding_len;
-   int mblen;
+   long from, len;
+   int mblen, str_len, encoding_len;
mbfl_string string, result, *ret;
 
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, sl|ls, str, 
str_len, from, len, encoding, encoding_len) == FAILURE) {
@@ -2172,7 +2172,8 @@
 {
size_t argc = ZEND_NUM_ARGS();
char *str, *encoding;
-   long str_len, from, len, encoding_len;
+   long from, len;
+   int str_len, encoding_len;
mbfl_string string, result, *ret;
 
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, sl|ls, str, 
str_len, from, len, encoding, encoding_len) == FAILURE) {
@@ -2276,7 +2277,8 @@
 {
zval **arg1, **arg2, **arg3, **arg4, **arg5;
char *str, *trimmarker, *encoding;
-   long str_len, from, width, trimmarker_len, encoding_len;
+   long from, width;
+   int str_len, trimmarker_len, encoding_len;
mbfl_string string, result, marker, *ret;
 
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, sll|ss, str, 
str_len, from, width, trimmarker, trimmarker_len, encoding, 
encoding_len) == FAILURE) {
@@ -2419,7 +2421,7 @@
 PHP_FUNCTION(mb_convert_encoding)
 {
char *arg_str, *arg_new;
-   long str_len, new_len;
+   int str_len, new_len;
zval *arg_old;
int i;
size_t size, l, n;
@@ -2562,7 +2564,7 @@
 PHP_FUNCTION(mb_detect_encoding)
 {
char *str;
-   long str_len;
+   int str_len;
zend_bool strict=0;
zval *encoding_list;
 
@@ -3202,7 +3204,7 @@
 php_mb_numericentity_exec(INTERNAL_FUNCTION_PARAMETERS, int type)
 {
char *str, *encoding;
-   long str_len, encoding_len;
+   int str_len, encoding_len;
zval *zconvmap, **hash_entry;
HashTable *target_hash;
size_t argc = ZEND_NUM_ARGS();



-- 
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 credits_ext.h

2008-07-07 Thread Jani Taskinen 
janiMon Jul  7 10:36:50 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard   credits_ext.h 
  Log:
  - Update credits
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/credits_ext.h?r1=1.30.2.6.2.6.2.2r2=1.30.2.6.2.6.2.3diff_format=u
Index: php-src/ext/standard/credits_ext.h
diff -u php-src/ext/standard/credits_ext.h:1.30.2.6.2.6.2.2 
php-src/ext/standard/credits_ext.h:1.30.2.6.2.6.2.3
--- php-src/ext/standard/credits_ext.h:1.30.2.6.2.6.2.2 Mon Nov  5 12:33:40 2007
+++ php-src/ext/standard/credits_ext.h  Mon Jul  7 10:36:50 2008
@@ -25,7 +25,6 @@
 CREDIT_LINE(ereg, Rasmus Lerdorf, Jim Winstead, Jaakko Hyvätti);
 CREDIT_LINE(EXIF, Rasmus Lerdorf, Marcus Boerger);
 CREDIT_LINE(FBSQL, Frank M. Kromann);
-CREDIT_LINE(FDF, Uwe Steinmann);
 CREDIT_LINE(Firebird/InterBase driver for PDO, Ard Biesheuvel);
 CREDIT_LINE(FTP, Stefan Esser, Andrew Skalski);
 CREDIT_LINE(GD imaging, Rasmus Lerdorf, Stig Bakken, Jim Winstead, Jouni 
Ahto, Ilia Alshanetsky, Pierre-Alain Joye, Marcus Boerger);
@@ -47,17 +46,18 @@
 CREDIT_LINE(Multibyte String Functions, Tsukada Takuya, Rui Hirokawa);
 CREDIT_LINE(mySQL driver for PDO, George Schlossnagle, Wez Furlong, Ilia 
Alshanetsky);
 CREDIT_LINE(MySQLi, Zak Greant, Georg Richter, Andrey Hristov, Ulf Wendel);
+CREDIT_LINE(MySQLnd, Georg Richter, Andrey Hristov, Ulf Wendel);
 CREDIT_LINE(MySQL, Zeev Suraski, Zak Greant, Georg Richter);
-CREDIT_LINE(ncurses, Ilia Alshanetsky, Wez Furlong, Hartmut Holzgraefe, 
Georg Richter);
-CREDIT_LINE(OCI8, Stig Bakken, Thies C. Arntzen, Andy Sautins, David 
Benson, Maxim Maletsky, Harald Radi, Antony Dovgal, Andi Gutmans, Wez Furlong);
+CREDIT_LINE(OCI8, Stig Bakken, Thies C. Arntzen, Andy Sautins, David 
Benson, Maxim Maletsky, Harald Radi, Antony Dovgal, Andi Gutmans, Wez Furlong, 
Christopher Jones, Oracle Corporation);
 CREDIT_LINE(ODBC driver for PDO, Wez Furlong);
 CREDIT_LINE(ODBC, Stig Bakken, Andreas Karajannis, Frank M. Kromann, Daniel 
R. Kalowsky);
 CREDIT_LINE(OpenSSL, Stig Venaas, Wez Furlong, Sascha Kettler);
 CREDIT_LINE(Oracle (OCI) driver for PDO, Wez Furlong);
 CREDIT_LINE(pcntl, Jason Greene);
 CREDIT_LINE(Perl Compatible Regexps, Andrei Zmievski);
+CREDIT_LINE(PHP Archive, Gregory Beaver, Marcus Boerger);
 CREDIT_LINE(PHP Data Objects, Wez Furlong, Marcus Boerger, Sterling Hughes, 
George Schlossnagle, Ilia Alshanetsky);
-CREDIT_LINE(PHP hash, Sara Golemon, Rasmus Lerdorf, Stefan Esser, Michael 
Wallner);
+CREDIT_LINE(PHP hash, Sara Golemon, Rasmus Lerdorf, Stefan Esser, Michael 
Wallner, Scott MacVicar);
 CREDIT_LINE(Posix, Kristian Koehntopp);
 CREDIT_LINE(PostgreSQL driver for PDO, Edin Kadribasic, Ilia Alshanetsky);
 CREDIT_LINE(PostgreSQL, Jouni Ahto, Zeev Suraski, Yasuo Ohgaki, Chris 
Kings-Lynne);
@@ -71,11 +71,10 @@
 CREDIT_LINE(SNMP, Rasmus Lerdorf, Harrie Hazewinkel, Mike Jackson, Steven 
Lawrance, Johann Hanne);
 CREDIT_LINE(SOAP, Brad Lafountain, Shane Caraveo, Dmitry Stogov);
 CREDIT_LINE(Sockets, Chris Vandomelen, Sterling Hughes, Daniel Beulshausen, 
Jason Greene);
-CREDIT_LINE(SPL, Marcus Boerger);
+CREDIT_LINE(SPL, Marcus Boerger, Etienne Kneuss);
 CREDIT_LINE(SQLite 3.x driver for PDO, Wez Furlong);
 CREDIT_LINE(SQLite, Wez Furlong, Tal Peer, Marcus Boerger, Ilia 
Alshanetsky);
 CREDIT_LINE(Sybase-CT, Zeev Suraski, Tom May, Timm Friebe);
-CREDIT_LINE(Sybase-DB, Zeev Suraski);
 CREDIT_LINE(System V Message based IPC, Wez Furlong);
 CREDIT_LINE(System V Semaphores, Tom May);
 CREDIT_LINE(System V Shared Memory, Christian Cartus);



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

[PHP-CVS] cvs: php-src /ext/standard credits_ext.h

2008-07-07 Thread Jani Taskinen 
janiMon Jul  7 10:38:16 2008 UTC

  Modified files:  
/php-src/ext/standard   credits_ext.h 
  Log:
  - Update credits
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/credits_ext.h?r1=1.43r2=1.44diff_format=u
Index: php-src/ext/standard/credits_ext.h
diff -u php-src/ext/standard/credits_ext.h:1.43 
php-src/ext/standard/credits_ext.h:1.44
--- php-src/ext/standard/credits_ext.h:1.43 Mon Nov  5 12:29:30 2007
+++ php-src/ext/standard/credits_ext.h  Mon Jul  7 10:38:16 2008
@@ -25,7 +25,6 @@
 CREDIT_LINE(ereg, Rasmus Lerdorf, Jim Winstead, Jaakko Hyvätti);
 CREDIT_LINE(EXIF, Rasmus Lerdorf, Marcus Boerger);
 CREDIT_LINE(FBSQL, Frank M. Kromann);
-CREDIT_LINE(FDF, Uwe Steinmann);
 CREDIT_LINE(Firebird/InterBase driver for PDO, Ard Biesheuvel);
 CREDIT_LINE(FTP, Stefan Esser, Andrew Skalski);
 CREDIT_LINE(GD imaging, Rasmus Lerdorf, Stig Bakken, Jim Winstead, Jouni 
Ahto, Ilia Alshanetsky, Pierre-Alain Joye, Marcus Boerger);
@@ -49,15 +48,16 @@
 CREDIT_LINE(MySQLi, Zak Greant, Georg Richter, Andrey Hristov, Ulf Wendel);
 CREDIT_LINE(MySQLnd, Georg Richter, Andrey Hristov, Ulf Wendel);
 CREDIT_LINE(MySQL, Zeev Suraski, Zak Greant, Georg Richter);
-CREDIT_LINE(OCI8, Stig Bakken, Thies C. Arntzen, Andy Sautins, David 
Benson, Maxim Maletsky, Harald Radi, Antony Dovgal, Andi Gutmans, Wez Furlong);
+CREDIT_LINE(OCI8, Stig Bakken, Thies C. Arntzen, Andy Sautins, David 
Benson, Maxim Maletsky, Harald Radi, Antony Dovgal, Andi Gutmans, Wez Furlong, 
Christopher Jones, Oracle Corporation);
 CREDIT_LINE(ODBC driver for PDO, Wez Furlong);
 CREDIT_LINE(ODBC, Stig Bakken, Andreas Karajannis, Frank M. Kromann, Daniel 
R. Kalowsky);
 CREDIT_LINE(OpenSSL, Stig Venaas, Wez Furlong, Sascha Kettler);
 CREDIT_LINE(Oracle (OCI) driver for PDO, Wez Furlong);
 CREDIT_LINE(pcntl, Jason Greene);
 CREDIT_LINE(Perl Compatible Regexps, Andrei Zmievski);
+CREDIT_LINE(PHP Archive, Gregory Beaver, Marcus Boerger);
 CREDIT_LINE(PHP Data Objects, Wez Furlong, Marcus Boerger, Sterling Hughes, 
George Schlossnagle, Ilia Alshanetsky);
-CREDIT_LINE(PHP hash, Sara Golemon, Rasmus Lerdorf, Stefan Esser, Michael 
Wallner);
+CREDIT_LINE(PHP hash, Sara Golemon, Rasmus Lerdorf, Stefan Esser, Michael 
Wallner, Scott MacVicar);
 CREDIT_LINE(Posix, Kristian Köhntopp);
 CREDIT_LINE(PostgreSQL driver for PDO, Edin Kadribasic, Ilia Alshanetsky);
 CREDIT_LINE(PostgreSQL, Jouni Ahto, Zeev Suraski, Yasuo Ohgaki, Chris 
Kings-Lynne);
@@ -71,11 +71,10 @@
 CREDIT_LINE(SNMP, Rasmus Lerdorf, Harrie Hazewinkel, Mike Jackson, Steven 
Lawrance, Johann Hanne);
 CREDIT_LINE(SOAP, Brad Lafountain, Shane Caraveo, Dmitry Stogov);
 CREDIT_LINE(Sockets, Chris Vandomelen, Sterling Hughes, Daniel Beulshausen, 
Jason Greene);
-CREDIT_LINE(SPL, Marcus Boerger);
+CREDIT_LINE(SPL, Marcus Boerger, Etienne Kneuss);
 CREDIT_LINE(SQLite 3.x driver for PDO, Wez Furlong);
 CREDIT_LINE(SQLite, Wez Furlong, Tal Peer, Marcus Boerger, Ilia 
Alshanetsky);
 CREDIT_LINE(Sybase-CT, Zeev Suraski, Tom May, Timm Friebe);
-CREDIT_LINE(Sybase-DB, Zeev Suraski);
 CREDIT_LINE(System V Message based IPC, Wez Furlong);
 CREDIT_LINE(System V Semaphores, Tom May);
 CREDIT_LINE(System V Shared Memory, Christian Cartus);



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

2008-07-07 Thread Jani Taskinen 
Good luck figuring out the info with different compilers..and which 
architecture you want there? Host, build or target?


IMO, this needs too much work to get working properly so count me out.

--Jani


Steph Fox wrote:

sfoxMon Jul  7 01:25:53 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard	info.c 
  Log:

  - Don't do stuff twice over
  @Jani: pick up mail!
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.249.2.10.2.14.2.8r2=1.249.2.10.2.14.2.9diff_format=u

Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.249.2.10.2.14.2.8 
php-src/ext/standard/info.c:1.249.2.10.2.14.2.9
--- php-src/ext/standard/info.c:1.249.2.10.2.14.2.8 Thu Jul  3 08:06:55 2008
+++ php-src/ext/standard/info.c Mon Jul  7 01:25:53 2008
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: info.c,v 1.249.2.10.2.14.2.8 2008/07/03 08:06:55 tony2001 Exp $ */

+/* $Id: info.c,v 1.249.2.10.2.14.2.9 2008/07/07 01:25:53 sfox Exp $ */
 
 #include php.h

 #include php_ini.h
@@ -48,18 +48,6 @@
 ZEND_EXTERN_MODULE_GLOBALS(iconv)
 #endif
 
-#if _MSC_VER = 1500

-#  define PHP_WINAPI_COMPILER MSVC9 (2008)
-#elif _MSC_VER = 1400
-#  define PHP_WINAPI_COMPILER MSVC8 (2005)
-#elif _MSC_VER = 1310
-#  define PHP_WINAPI_COMPILER MSVC7.1 (.NET 2003)
-#elif _MSC_VER = 1300
-#  define PHP_WINAPI_COMPILER MSVC7 (.NET 2002)
-#elif _MSC_VER  1300
-#  define PHP_WINAPI_COMPILER MSVC6 
-#endif
-
 #define SECTION(name)  if (!sapi_module.phpinfo_as_text) { \
PUTS(h2 name 
/h2\n); \
} else { \
@@ -473,15 +461,16 @@
php_info_print_table_start();
php_info_print_table_row(2, System, php_uname );
php_info_print_table_row(2, Build Date, __DATE__   __TIME__ 
);
+#ifdef COMPILER
+   php_info_print_table_row(2, Compiler, COMPILER);
+#endif
+#ifdef ARCHITECTURE
+   php_info_print_table_row(2, Architecture, ARCHITECTURE);
+#endif
 #ifdef CONFIGURE_COMMAND
php_info_print_table_row(2, Configure Command, 
CONFIGURE_COMMAND );
 #endif
 
-

-#ifdef PHP_WIN32
-   php_info_print_table_row(2, Windows Compiler and Version, 
PHP_WINAPI_COMPILER );
-#endif
-
if (sapi_module.pretty_name) {
php_info_print_table_row(2, Server API, 
sapi_module.pretty_name );
}






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

2008-07-07 Thread Pierre Joye 
On Mon, Jul 7, 2008 at 3:25 AM, Steph Fox [EMAIL PROTECTED] wrote:
 sfoxMon Jul  7 01:25:53 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard   info.c
  Log:
  - Don't do stuff twice over
  @Jani: pick up mail!

What are you doing here? Can you please revert this commit asap, thanks.

 http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.249.2.10.2.14.2.8r2=1.249.2.10.2.14.2.9diff_format=u
 Index: php-src/ext/standard/info.c
 diff -u php-src/ext/standard/info.c:1.249.2.10.2.14.2.8 
 php-src/ext/standard/info.c:1.249.2.10.2.14.2.9
 --- php-src/ext/standard/info.c:1.249.2.10.2.14.2.8 Thu Jul  3 08:06:55 
 2008
 +++ php-src/ext/standard/info.c Mon Jul  7 01:25:53 2008
 @@ -18,7 +18,7 @@
+--+
  */

 -/* $Id: info.c,v 1.249.2.10.2.14.2.8 2008/07/03 08:06:55 tony2001 Exp $ */
 +/* $Id: info.c,v 1.249.2.10.2.14.2.9 2008/07/07 01:25:53 sfox Exp $ */

  #include php.h
  #include php_ini.h
 @@ -48,18 +48,6 @@
  ZEND_EXTERN_MODULE_GLOBALS(iconv)
  #endif

 -#if _MSC_VER = 1500
 -#  define PHP_WINAPI_COMPILER MSVC9 (2008)
 -#elif _MSC_VER = 1400
 -#  define PHP_WINAPI_COMPILER MSVC8 (2005)
 -#elif _MSC_VER = 1310
 -#  define PHP_WINAPI_COMPILER MSVC7.1 (.NET 2003)
 -#elif _MSC_VER = 1300
 -#  define PHP_WINAPI_COMPILER MSVC7 (.NET 2002)
 -#elif _MSC_VER  1300
 -#  define PHP_WINAPI_COMPILER MSVC6 
 -#endif
 -
  #define SECTION(name)  if (!sapi_module.phpinfo_as_text) { \
PUTS(h2 name 
 /h2\n); \
} else { \
 @@ -473,15 +461,16 @@
php_info_print_table_start();
php_info_print_table_row(2, System, php_uname );
php_info_print_table_row(2, Build Date, __DATE__   
 __TIME__ );
 +#ifdef COMPILER
 +   php_info_print_table_row(2, Compiler, COMPILER);
 +#endif
 +#ifdef ARCHITECTURE
 +   php_info_print_table_row(2, Architecture, ARCHITECTURE);
 +#endif
  #ifdef CONFIGURE_COMMAND
php_info_print_table_row(2, Configure Command, 
 CONFIGURE_COMMAND );
  #endif

 -
 -#ifdef PHP_WIN32
 -   php_info_print_table_row(2, Windows Compiler and Version, 
 PHP_WINAPI_COMPILER );
 -#endif
 -
if (sapi_module.pretty_name) {
php_info_print_table_row(2, Server API, 
 sapi_module.pretty_name );
}



-- 
Pierre
http://blog.thepimp.net | http://www.libgd.org

-- 
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) /win32/build config.w32 confutils.js

2008-07-07 Thread Steph Fox 


Hi Pierre,


 - Fix up some bits and pieces.


For examples? Log message helps to see what has been changed, please be 
verbose.


Literally 'bits and pieces'. The duplicate function we discussed, ws, moving 
the MS versioning stuff to somewhere it could be used in config.w32.h. (Not 
moving it back because having it there forces duplicate code in the core.)


 - Head towards making it possible for all platforms to have compiler 
info in phpinfo() output.


It is already in php info:


It was Windows-specific. It's not now.


What is missing is the non windows platform part. As far as I remember
someone is already working on it and will add this info as well.


Any idea who? It isn't Jani.


 - Make it possible to switch off configure summary (--without-summary).


Talking about asking before committing, please do it next time (as I
do). The idea is the other way round, to drop the noise or get it if
enabled.


Believe it or not, I was trying not to offend you :)

- Steph


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

2008-07-07 Thread Steph Fox 


Pierre,


What are you doing here? Can you please revert this commit asap, thanks.


Please look at the code before reacting, this is actually the proper way to 
do it ('proper' as in, this is the way all the other build-specific 
information reaches phpinfo()).


Thanks,

- Steph 



--
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/mbstring mbstring.c php_mbregex.h

2008-07-07 Thread Felipe Pena 
felipe  Mon Jul  7 12:40:51 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mbstring   mbstring.c php_mbregex.h 
  Log:
  - Added arginfo
  - Removed unnecessary #include zend_arg_defs.c
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.224.2.22.2.25.2.12r2=1.224.2.22.2.25.2.13diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.12 
php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.13
--- php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.12Sat Jul  5 
06:52:04 2008
+++ php-src/ext/mbstring/mbstring.c Mon Jul  7 12:40:51 2008
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: mbstring.c,v 1.224.2.22.2.25.2.12 2008/07/05 06:52:04 hirokawa Exp $ */
+/* $Id: mbstring.c,v 1.224.2.22.2.25.2.13 2008/07/07 12:40:51 felipe Exp $ */
 
 /*
  * PHP 4 Multibyte String module mbstring
@@ -169,32 +169,6 @@
 
 /* }}} */
 
-static
-   ZEND_BEGIN_ARG_INFO(third_and_rest_force_ref, 1)
-   ZEND_ARG_PASS_INFO(0)
-   ZEND_ARG_PASS_INFO(0)
-   ZEND_END_ARG_INFO()
-
-static
-   ZEND_BEGIN_ARG_INFO_EX(mb_parse_str_arginfo, 0, 0, 1)
-   ZEND_ARG_INFO(0, encoded_string)
-   ZEND_ARG_ARRAY_INFO(1, result, 1)
-   ZEND_END_ARG_INFO()
-
-static
-   ZEND_BEGIN_ARG_INFO_EX(mb_convert_variables_arginfo, 1, 0, 3)
-   ZEND_ARG_INFO(0, to_encoding)
-   ZEND_ARG_INFO(0, from_encoding)
-   ZEND_ARG_INFO(1, vars)
-   ZEND_END_ARG_INFO()
-
-static
-   ZEND_BEGIN_ARG_INFO_EX(mb_ereg_arginfo, 0, 0, 2)
-   ZEND_ARG_INFO(0, pattern)
-   ZEND_ARG_INFO(0, string)
-   ZEND_ARG_INFO(1, regs)
-   ZEND_END_ARG_INFO()
-
 /* {{{ mb_overload_def mb_ovld[] */
 static const struct mb_overload_def mb_ovld[] = {
{MB_OVERLOAD_MAIL, mail, mb_send_mail, mb_orig_mail},
@@ -221,46 +195,393 @@
 }; 
 /* }}} */
 
+/* {{{ arginfo */
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_language, 0, 0, 0)
+   ZEND_ARG_INFO(0, language)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_internal_encoding, 0, 0, 0)
+   ZEND_ARG_INFO(0, encoding)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_http_input, 0, 0, 0)
+   ZEND_ARG_INFO(0, type)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_http_output, 0, 0, 0)
+   ZEND_ARG_INFO(0, encoding)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_detect_order, 0, 0, 0)
+   ZEND_ARG_INFO(0, encoding)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_substitute_character, 0, 0, 0)
+   ZEND_ARG_INFO(0, substchar)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_preferred_mime_name, 0, 0, 1)
+   ZEND_ARG_INFO(0, encoding)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_parse_str, 0, 0, 1)
+   ZEND_ARG_INFO(0, encoded_string)
+   ZEND_ARG_INFO(1, result)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_output_handler, 0, 0, 2)
+   ZEND_ARG_INFO(0, contents)
+   ZEND_ARG_INFO(0, status)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strlen, 0, 0, 1)
+   ZEND_ARG_INFO(0, str)
+   ZEND_ARG_INFO(0, encoding)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strpos, 0, 0, 2)
+   ZEND_ARG_INFO(0, haystack)
+   ZEND_ARG_INFO(0, needle)
+   ZEND_ARG_INFO(0, offset)
+   ZEND_ARG_INFO(0, encoding)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strrpos, 0, 0, 2)
+   ZEND_ARG_INFO(0, haystack)
+   ZEND_ARG_INFO(0, needle)
+   ZEND_ARG_INFO(0, offset)
+   ZEND_ARG_INFO(0, encoding)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_stripos, 0, 0, 2)
+   ZEND_ARG_INFO(0, haystack)
+   ZEND_ARG_INFO(0, needle)
+   ZEND_ARG_INFO(0, offset)
+   ZEND_ARG_INFO(0, encoding)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strripos, 0, 0, 2)
+   ZEND_ARG_INFO(0, haystack)
+   ZEND_ARG_INFO(0, needle)
+   ZEND_ARG_INFO(0, offset)
+   ZEND_ARG_INFO(0, encoding)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strstr, 0, 0, 2)
+   ZEND_ARG_INFO(0, haystack)
+   ZEND_ARG_INFO(0, needle)
+   ZEND_ARG_INFO(0, part)
+   ZEND_ARG_INFO(0, encoding)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strrchr, 0, 0, 2)
+   ZEND_ARG_INFO(0, haystack)
+   ZEND_ARG_INFO(0, needle)
+   ZEND_ARG_INFO(0, part)
+   ZEND_ARG_INFO(0, encoding)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_stristr, 0, 0, 2)
+   ZEND_ARG_INFO(0, haystack)
+   ZEND_ARG_INFO(0, needle)
+   ZEND_ARG_INFO(0, part)
+   ZEND_ARG_INFO(0, encoding)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strrichr, 0, 0, 2)
+

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

2008-07-07 Thread Steph Fox 


Hi Jani,


Good luck figuring out the info with different compilers..


You're saying the build system doesn't know it?


and which architecture you want there? Host, build or target?


Good question. Which does PHP use to determine a 64-bit or 32-bit build?


IMO, this needs too much work to get working properly so count me out.


So we can't even know if it's gcc or not, and if so which version? Weird, 
the build system does.
If the info isn't available it's simply not reported. The constants could 
equally well be set to 'unknown' if that's problematic.


- Steph 



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

2008-07-07 Thread Felipe Pena 
felipe  Mon Jul  7 12:52:01 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mbstring   mbstring.c 
  Log:
  - Removed unused variables
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.224.2.22.2.25.2.13r2=1.224.2.22.2.25.2.14diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.13 
php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.14
--- php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.13Mon Jul  7 
12:40:51 2008
+++ php-src/ext/mbstring/mbstring.c Mon Jul  7 12:52:00 2008
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: mbstring.c,v 1.224.2.22.2.25.2.13 2008/07/07 12:40:51 felipe Exp $ */
+/* $Id: mbstring.c,v 1.224.2.22.2.25.2.14 2008/07/07 12:52:00 felipe Exp $ */
 
 /*
  * PHP 4 Multibyte String module mbstring
@@ -2610,7 +2610,6 @@
Trim the string in terminal width */
 PHP_FUNCTION(mb_strimwidth)
 {
-   zval **arg1, **arg2, **arg3, **arg4, **arg5;
char *str, *trimmarker, *encoding;
long from, width;
int str_len, trimmarker_len, encoding_len;



-- 
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) /win32/build config.w32 confutils.js

2008-07-07 Thread Pierre Joye 
On Mon, Jul 7, 2008 at 2:33 PM, Steph Fox [EMAIL PROTECTED] wrote:

 Hi Pierre,

  - Fix up some bits and pieces.

 For examples? Log message helps to see what has been changed, please be
 verbose.

 Literally 'bits and pieces'. The duplicate function we discussed, ws, moving
 the MS versioning stuff to somewhere it could be used in config.w32.h. (Not
 moving it back because having it there forces duplicate code in the core.)

I'm about to commit some other changes, do you have any other pending commits?

One change I will apply is to put the useful functions and data in
confutils and not in a specific config.w32. confutils is the common
trunc and is run before any other config.w32 code.

  - Head towards making it possible for all platforms to have compiler
 info in phpinfo() output.

 It is already in php info:

 It was Windows-specific. It's not now.

 What is missing is the non windows platform part. As far as I remember
 someone is already working on it and will add this info as well.

 Any idea who? It isn't Jani.

I don't remember, someone said I will do it for *nix on efnet  :P

  - Make it possible to switch off configure summary (--without-summary).

 Talking about asking before committing, please do it next time (as I
 do). The idea is the other way round, to drop the noise or get it if
 enabled.

 Believe it or not, I was trying not to offend you :)

Heh, that's already a very good step, thanks :)

About the compiler/arch stuff, I did not do it yet for this exact
reason, there was no interest/will in the unix side. But it can be
done afterwards, even the summary thing (it is _very_ handy to double
check a build, there is more to come as well).


Cheers,
-- 
Pierre

http://blog.thepimp.net | http://www.libgd.org

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

[PHP-CVS] Re: [PHP-DEV] Re: [PHP-CVS] cvs: php-src(PHP_5_3) /win32/build config.w32 confutils.js

2008-07-07 Thread Steph Fox 


Hi Pierre,

I'm about to commit some other changes, do you have any other pending 
commits?


Not in this area. I'll concentrate on killing the .dsp files off - I tested 
now and they don't even work any more under VC6.



One change I will apply is to put the useful functions and data in
confutils and not in a specific config.w32. confutils is the common
trunc and is run before any other config.w32 code.


Please test this first. I'm talking about main/config.w32.h, which makes 
constants available throughout PHP as well as the build. confutils doesn't 
do this.



Any idea who? It isn't Jani.


I don't remember, someone said I will do it for *nix on efnet  :P


OK so I'll try Felipe :)


About the compiler/arch stuff, I did not do it yet for this exact
reason, there was no interest/will in the unix side. But it can be
done afterwards, even the summary thing (it is _very_ handy to double
check a build, there is more to come as well).


Yeah... I just wanted a way to switch it off, I find it obfuscating rather 
than useful, I'm having to scroll back up to get to the information I 
actually want. But I'm aware that others (probably with larger screens) will 
see things differently.


- Steph 



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

[PHP-CVS] Re: [PHP-DEV] Re: [PHP-CVS] cvs: php-src(PHP_5_3) /win32/build config.w32 confutils.js

2008-07-07 Thread Pierre Joye 
On Mon, Jul 7, 2008 at 3:03 PM, Steph Fox [EMAIL PROTECTED] wrote:

 One change I will apply is to put the useful functions and data in
 confutils and not in a specific config.w32. confutils is the common
 trunc and is run before any other config.w32 code.

 Please test this first. I'm talking about main/config.w32.h, which makes
 constants available throughout PHP as well as the build. confutils doesn't
 do this.

this file is generated automatically on each time you run configure.
It is fine to keep the config.w32.h.in as dummy template (it is not
used), so we have a file in cvs with all possible values, just like a
autoconf's configurefile.



 About the compiler/arch stuff, I did not do it yet for this exact
 reason, there was no interest/will in the unix side. But it can be
 done afterwards, even the summary thing (it is _very_ handy to double
 check a build, there is more to come as well).

 Yeah... I just wanted a way to switch it off, I find it obfuscating rather
 than useful, I'm having to scroll back up to get to the information I
 actually want. But I'm aware that others (probably with larger screens) will
 see things differently.

I will add also more options and allows each output to be stored in a
file. It will help to improve and automate the QA check as well.

Cheers
-- 
Pierre

http://blog.thepimp.net | http://www.libgd.org

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

Re: [PHP-CVS] Re: [PHP-DEV] Re: [PHP-CVS] cvs: php-src(PHP_5_3) /win32/build config.w32 confutils.js

2008-07-07 Thread Steph Fox 



this file is generated automatically on each time you run configure.
It is fine to keep the config.w32.h.in as dummy template (it is not
used), so we have a file in cvs with all possible values, just like a
autoconf's configurefile.


Ah no, you've misunderstood it. The config.w32.h.in file is not a dummy 
template, it generates most of main/config.w32.h. If you do AC_DEFINE(), the 
constant ends up in main/config.w32.h. That's why I changed it so we only 
have to pick up compiler info once, during the actual build, and stick it 
somewhere PHP can see it. It means we don't need to repeat the same checks 
in info.c, and it also means other platforms can use the same constants 
without doing any math in info.c.



I will add also more options and allows each output to be stored in a
file. It will help to improve and automate the QA check as well.


...  and that's the other reason I left it on by default.

Cheers,

- Steph 



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

Re: [PHP-CVS] Re: [PHP-DEV] Re: [PHP-CVS] cvs: php-src(PHP_5_3) /win32/build config.w32 confutils.js

2008-07-07 Thread Pierre Joye 
On Mon, Jul 7, 2008 at 3:18 PM, Steph Fox [EMAIL PROTECTED] wrote:

 this file is generated automatically on each time you run configure.
 It is fine to keep the config.w32.h.in as dummy template (it is not
 used), so we have a file in cvs with all possible values, just like a
 autoconf's configurefile.

 Ah no, you've misunderstood it. The config.w32.h.in file is not a dummy
 template,

Err, right, .h.in is actually used.

 it generates most of main/config.w32.h. If you do AC_DEFINE(), the
 constant ends up in main/config.w32.h. That's why I changed it so we only
 have to pick up compiler info once, during the actual build, and stick it
 somewhere PHP can see it. It means we don't need to repeat the same checks
 in info.c, and it also means other platforms can use the same constants
 without doing any math in info.c.

 I will add also more options and allows each output to be stored in a
 file. It will help to improve and automate the QA check as well.

 ...  and that's the other reason I left it on by default.

The name of the option is wrong then.

I will update the js again and add some comments to avoid confusions
in the future (HEAD and 5.3, please also apply any of your commits to
both branches).

Cheers,
-- 
Pierre

http://blog.thepimp.net | http://www.libgd.org

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

Re: [PHP-CVS] Re: [PHP-DEV] Re: [PHP-CVS] cvs: php-src(PHP_5_3) /win32/build config.w32 confutils.js

2008-07-07 Thread Steph Fox 



I will update the js again and add some comments to avoid confusions
in the future (HEAD and 5.3, please also apply any of your commits to
both branches).


Eh, just the one leetle old laptop with not much space or memory. One day 
5.3, next day HEAD. I don't mind doing my own MFB, it's just there may be a 
gap :)


- Steph



Cheers,
--
Pierre

http://blog.thepimp.net | http://www.libgd.org

--
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) /win32/build config.w32 confutils.js

2008-07-07 Thread Pierre-Alain Joye 
pajoye  Mon Jul  7 13:32:56 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/win32/buildconfig.w32 confutils.js 
  Log:
  - move common functions to confutils
  - rename the summary option to reflect its usage (Enable Sumamry, yes)
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.40.2.8.2.10.2.21r2=1.40.2.8.2.10.2.22diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.40.2.8.2.10.2.21 
php-src/win32/build/config.w32:1.40.2.8.2.10.2.22
--- php-src/win32/build/config.w32:1.40.2.8.2.10.2.21   Mon Jul  7 01:23:56 2008
+++ php-src/win32/build/config.w32  Mon Jul  7 13:32:55 2008
@@ -1,5 +1,5 @@
 // vim:ft=javascript
-// $Id: config.w32,v 1.40.2.8.2.10.2.21 2008/07/07 01:23:56 sfox Exp $
+// $Id: config.w32,v 1.40.2.8.2.10.2.22 2008/07/07 13:32:55 pajoye Exp $
 // Master config file; think of it as a configure.in
 // equivalent.
 
@@ -9,34 +9,12 @@
ERROR(MS C++ compiler is required);
 }
 
-function probe_binary(EXE, what)
-{
-   // tricky escapes to get stderr redirection to work
-   var command = 'cmd /c ' + EXE;
-   if (what == version) {
-   command = command + ' -v';
-   }
-   var version = execute(command + ' 21');
-
-   if (what == 64) {
-   if (version.match(/x64/)) {
-   return 1;
-   }
-   } else {
-   if (version.match(/(\d+\.\d+(\.\d+)?(\.\d+)?)/)) {
-   return RegExp.$1;
-   }
-   }
-   return 0;
-}
-
-var VC_VERSIONS = new Array();
-VC_VERSIONS[1200] = 'MSVC6 (Visual C++ 6.0)';
-VC_VERSIONS[1300] = 'MSVC7 (Visual C++ 2002)';
-VC_VERSIONS[1310] = 'MSVC7.1 (Visual C++ 2003)';
-VC_VERSIONS[1400] = 'MSVC8 (Visual C++ 2005)';
-VC_VERSIONS[1500] = 'MSVC9 (Visual C++ 2008)';
-
+/* For the record here: */
+// 1200 is VC6
+// 1300 is vs.net 2002
+// 1310 is vs.net 2003
+// 1400 is vs.net 2005
+// 1500 is vs.net 2008
 // Which version of the compiler do we have?
 VCVERS = probe_binary(CL).substr(0, 5).replace('.', '');
 STDOUT.WriteLine(  Detected compiler  + VC_VERSIONS[VCVERS]);
@@ -385,4 +363,4 @@
 
 DEFINE('SNAPSHOT_TEMPLATE', PHP_SNAPSHOT_TEMPLATE);
 
-ARG_WITH('summary', 'Skip configuration summary', 'yes');
+ARG_WITH('summary', 'Enable configuration summary', 'yes');
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.8.2.20r2=1.60.2.1.2.8.2.21diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8.2.20 
php-src/win32/build/confutils.js:1.60.2.1.2.8.2.21
--- php-src/win32/build/confutils.js:1.60.2.1.2.8.2.20  Mon Jul  7 01:23:56 2008
+++ php-src/win32/build/confutils.jsMon Jul  7 13:32:55 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-// $Id: confutils.js,v 1.60.2.1.2.8.2.20 2008/07/07 01:23:56 sfox Exp $
+// $Id: confutils.js,v 1.60.2.1.2.8.2.21 2008/07/07 13:32:55 pajoye Exp $
 
 var STDOUT = WScript.StdOut;
 var STDERR = WScript.StdErr;
@@ -27,9 +27,20 @@
 var SYSTEM_DRIVE = WshShell.Environment(Process).Item(SystemDrive);
 var PROGRAM_FILES = WshShell.Environment(Process).Item(ProgramFiles);
 
+/* Store the enabled extensions (summary + QA check) */
 var extensions_enabled = new Array();
+
+/* Store the SAPI enabled (summary + QA check) */
 var sapi_enabled = new Array();
 
+/* Mapping CL version  human readable name */
+var VC_VERSIONS = new Array();
+VC_VERSIONS[1200] = 'MSVC6 (Visual C++ 6.0)';
+VC_VERSIONS[1300] = 'MSVC7 (Visual C++ 2002)';
+VC_VERSIONS[1310] = 'MSVC7.1 (Visual C++ 2003)';
+VC_VERSIONS[1400] = 'MSVC8 (Visual C++ 2005)';
+VC_VERSIONS[1500] = 'MSVC9 (Visual C++ 2008)';
+
 if (PROGRAM_FILES == null) {
PROGRAM_FILES = C:\\Program Files;
 }
@@ -101,6 +112,27 @@
return ret;
 }
 
+function probe_binary(EXE, what)
+{
+   // tricky escapes to get stderr redirection to work
+   var command = 'cmd /c ' + EXE;
+   if (what == version) {
+   command = command + ' -v';
+   }
+   var version = execute(command + ' 21');
+
+   if (what == 64) {
+   if (version.match(/x64/)) {
+   return 1;
+   }
+   } else {
+   if (version.match(/(\d+\.\d+(\.\d+)?(\.\d+)?)/)) {
+   return RegExp.$1;
+   }
+   }
+   return 0;
+}
+
 function condense_path(path)
 {
path = FSO.GetAbsolutePathName(path);



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

[PHP-CVS] cvs: php-src /win32/build config.w32 confutils.js

2008-07-07 Thread Pierre-Alain Joye 
pajoye  Mon Jul  7 13:48:23 2008 UTC

  Modified files:  
/php-src/win32/buildconfig.w32 confutils.js 
  Log:
  - move common functions to confutil
  - MFB: allow to disable the summary (and move test in the function)
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.74r2=1.75diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.74 php-src/win32/build/config.w32:1.75
--- php-src/win32/build/config.w32:1.74 Sun Jul  6 09:56:01 2008
+++ php-src/win32/build/config.w32  Mon Jul  7 13:48:23 2008
@@ -1,5 +1,5 @@
 // vim:ft=javascript
-// $Id: config.w32,v 1.74 2008/07/06 09:56:01 pajoye Exp $
+// $Id: config.w32,v 1.75 2008/07/07 13:48:23 pajoye Exp $
 // Master config file; think of it as a configure.in
 // equivalent.
 
@@ -8,38 +8,16 @@
 if (!CL) {
ERROR(MS C++ compiler is required);
 }
-// Which version of the compiler do we have ?
-function probe_binary(EXE, what)
-{
-   // tricky escapes to get stderr redirection to work
-   var command = 'cmd /c ' + EXE;
-   if (what == version) {
-   command = command + ' -v';
-   }
-   var version = execute(command + ' 21');
-
-   if (what == 64) {
-   if (version.match(/x64/)) {
-   return 1;
-   }
-   } else {
-   if (version.match(/(\d+\.\d+(\.\d+)?(\.\d+)?)/)) {
-   return RegExp.$1;
-   }
-   }
-   return 0;
-}
-
-// Which version of the compiler do we have?
-VCVERS = probe_binary(CL);
-VCVERS = VCVERS.substr(0, 2) + VCVERS.substr(3, 2);
-STDOUT.WriteLine(Detected MS compiler version  + VCVERS);
 
 // 1200 is VC6
 // 1300 is vs.net 2002
 // 1310 is vs.net 2003
 // 1400 is vs.net 2005
 // 1500 is vs.net 2008
+// Which version of the compiler do we have?
+VCVERS = probe_binary(CL).substr(0, 5).replace('.', '');
+STDOUT.WriteLine(  Detected compiler  + VC_VERSIONS[VCVERS]);
+AC_DEFINE('COMPILER', VC_VERSIONS[VCVERS], Detected compiler version);
 
 // do we use x64 or 80x86 version of compiler?
 X64 = probe_binary(CL, 64);
@@ -402,3 +380,5 @@
 }
 
 DEFINE('SNAPSHOT_TEMPLATE', PHP_SNAPSHOT_TEMPLATE);
+
+ARG_ENABLE('summary', 'Enable configuration summary', 'yes');
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.75r2=1.76diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.75 
php-src/win32/build/confutils.js:1.76
--- php-src/win32/build/confutils.js:1.75   Sat Jul  5 19:52:45 2008
+++ php-src/win32/build/confutils.jsMon Jul  7 13:48:23 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-// $Id: confutils.js,v 1.75 2008/07/05 19:52:45 pajoye Exp $
+// $Id: confutils.js,v 1.76 2008/07/07 13:48:23 pajoye Exp $
 
 var STDOUT = WScript.StdOut;
 var STDERR = WScript.StdErr;
@@ -31,11 +31,11 @@
 var sapi_enabled = new Array();
 
 var VC_VERSIONS = new Array();
-VC_VERSIONS[1200] = 'VC6';
-VC_VERSIONS[1300] = 'Visual C++ 2002';
-VC_VERSIONS[1310] = 'Visual C++ 2003';
-VC_VERSIONS[1400] = 'Visual C++ 2005';
-VC_VERSIONS[1500] = 'Visual C++ 2008';
+VC_VERSIONS[1200] = 'MSVC6 (Visual C++ 6.0)';
+VC_VERSIONS[1300] = 'MSVC7 (Visual C++ 2002)';
+VC_VERSIONS[1310] = 'MSVC7.1 (Visual C++ 2003)';
+VC_VERSIONS[1400] = 'MSVC8 (Visual C++ 2005)';
+VC_VERSIONS[1500] = 'MSVC9 (Visual C++ 2008)';
 
 if (PROGRAM_FILES == null) {
PROGRAM_FILES = C:\\Program Files;
@@ -108,6 +108,27 @@
return ret;
 }
 
+function probe_binary(EXE, what)
+{
+   // tricky escapes to get stderr redirection to work
+   var command = 'cmd /c ' + EXE;
+   if (what == version) {
+   command = command + ' -v';
+   }
+   var version = execute(command + ' 21');
+
+   if (what == 64) {
+   if (version.match(/x64/)) {
+   return 1;
+   }
+   } else {
+   if (version.match(/(\d+\.\d+(\.\d+)?(\.\d+)?)/)) {
+   return RegExp.$1;
+   }
+   }
+   return 0;
+}
+
 function condense_path(path)
 {
path = FSO.GetAbsolutePathName(path);
@@ -1376,6 +1397,9 @@
 function write_summary()
 {
var ar = new Array();
+   if (PHP_SUMMARY == no) {
+   return;
+   }
 
STDOUT.WriteBlankLines(2);
 
@@ -1426,7 +1450,6 @@
generate_config_h();
STDOUT.WriteLine(Done.);
STDOUT.WriteBlankLines(1);
-
write_summary();
 
if (PHP_SNAPSHOT_BUILD != no) {
@@ -1732,7 +1755,6 @@
return items;
 }
 
-
 // for snapshot builders, this option will attempt to enable everything
 // and you can then build everything, ignoring fatal errors within a module
 // by running nmake snap
@@ -1743,5 +1765,3 @@
 // several objects at once, reducing overhead of starting new
 // compiler processes.
 ARG_ENABLE('one-shot', 'Optimize for fast build - best for release and 
snapshot

[PHP-CVS] cvs: php-src(PHP_5_3) /win32/build config.w32 confutils.js

2008-07-07 Thread Pierre-Alain Joye 
pajoye  Mon Jul  7 13:51:35 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/win32/buildconfig.w32 confutils.js 
  Log:
  - MFH: 
   - use ARG_ENABLE for the summary option
   - move test if summary function
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.40.2.8.2.10.2.22r2=1.40.2.8.2.10.2.23diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.40.2.8.2.10.2.22 
php-src/win32/build/config.w32:1.40.2.8.2.10.2.23
--- php-src/win32/build/config.w32:1.40.2.8.2.10.2.22   Mon Jul  7 13:32:55 2008
+++ php-src/win32/build/config.w32  Mon Jul  7 13:51:35 2008
@@ -1,5 +1,5 @@
 // vim:ft=javascript
-// $Id: config.w32,v 1.40.2.8.2.10.2.22 2008/07/07 13:32:55 pajoye Exp $
+// $Id: config.w32,v 1.40.2.8.2.10.2.23 2008/07/07 13:51:35 pajoye Exp $
 // Master config file; think of it as a configure.in
 // equivalent.
 
@@ -363,4 +363,4 @@
 
 DEFINE('SNAPSHOT_TEMPLATE', PHP_SNAPSHOT_TEMPLATE);
 
-ARG_WITH('summary', 'Enable configuration summary', 'yes');
+ARG_ENABLE('summary', 'Enable configuration summary', 'yes');
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.8.2.21r2=1.60.2.1.2.8.2.22diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8.2.21 
php-src/win32/build/confutils.js:1.60.2.1.2.8.2.22
--- php-src/win32/build/confutils.js:1.60.2.1.2.8.2.21  Mon Jul  7 13:32:55 2008
+++ php-src/win32/build/confutils.jsMon Jul  7 13:51:35 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-// $Id: confutils.js,v 1.60.2.1.2.8.2.21 2008/07/07 13:32:55 pajoye Exp $
+// $Id: confutils.js,v 1.60.2.1.2.8.2.22 2008/07/07 13:51:35 pajoye Exp $
 
 var STDOUT = WScript.StdOut;
 var STDERR = WScript.StdErr;
@@ -1402,6 +1402,9 @@
 function write_summary()
 {
var ar = new Array();
+   if (PHP_SUMMARY == no) {
+   return;
+   }
 
STDOUT.WriteBlankLines(2);
 
@@ -1452,10 +1455,7 @@
generate_config_h();
STDOUT.WriteLine(Done.);
STDOUT.WriteBlankLines(1);
-
-   if (PHP_SUMMARY != no) {
-   write_summary();
-   }
+   write_summary();
 
if (PHP_SNAPSHOT_BUILD != no) {
STDOUT.WriteLine(Type 'nmake snap' to build a PHP snapshot);



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

[PHP-CVS] cvs: php-src /ext/mbstring mbstring.c php_mbregex.h

2008-07-07 Thread Felipe Pena 
felipe  Mon Jul  7 13:52:44 2008 UTC

  Modified files:  
/php-src/ext/mbstring   mbstring.c php_mbregex.h 
  Log:
  MFB:
  - Added arginfo
  - Removed unnecessary #include zend_arg_defs.c
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.280r2=1.281diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.280 
php-src/ext/mbstring/mbstring.c:1.281
--- php-src/ext/mbstring/mbstring.c:1.280   Mon Jul  7 10:00:30 2008
+++ php-src/ext/mbstring/mbstring.c Mon Jul  7 13:52:44 2008
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: mbstring.c,v 1.280 2008/07/07 10:00:30 indeyets Exp $ */
+/* $Id: mbstring.c,v 1.281 2008/07/07 13:52:44 felipe Exp $ */
 
 /*
  * PHP 4 Multibyte String module mbstring
@@ -163,32 +163,6 @@
 
 /* }}} */
 
-static
-   ZEND_BEGIN_ARG_INFO(third_and_rest_force_ref, 1)
-   ZEND_ARG_PASS_INFO(0)
-   ZEND_ARG_PASS_INFO(0)
-   ZEND_END_ARG_INFO()
-
-static
-   ZEND_BEGIN_ARG_INFO_EX(mb_parse_str_arginfo, 0, 0, 1)
-   ZEND_ARG_INFO(0, encoded_string)
-   ZEND_ARG_ARRAY_INFO(1, result, 1)
-   ZEND_END_ARG_INFO()
-
-static
-   ZEND_BEGIN_ARG_INFO_EX(mb_convert_variables_arginfo, 1, 0, 3)
-   ZEND_ARG_INFO(0, to_encoding)
-   ZEND_ARG_INFO(0, from_encoding)
-   ZEND_ARG_INFO(1, vars)
-   ZEND_END_ARG_INFO()
-
-static
-   ZEND_BEGIN_ARG_INFO_EX(mb_ereg_arginfo, 0, 0, 2)
-   ZEND_ARG_INFO(0, pattern)
-   ZEND_ARG_INFO(0, string)
-   ZEND_ARG_INFO(1, regs)
-   ZEND_END_ARG_INFO()
-
 /* {{{ mb_overload_def mb_ovld[] */
 static const struct mb_overload_def mb_ovld[] = {
{MB_OVERLOAD_MAIL, mail, mb_send_mail, mb_orig_mail},
@@ -215,48 +189,406 @@
 }; 
 /* }}} */
 
+/* {{{ arginfo */
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_language, 0, 0, 0)
+   ZEND_ARG_INFO(0, language)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_internal_encoding, 0, 0, 0)
+   ZEND_ARG_INFO(0, encoding)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_http_input, 0, 0, 0)
+   ZEND_ARG_INFO(0, type)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_http_output, 0, 0, 0)
+   ZEND_ARG_INFO(0, encoding)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_detect_order, 0, 0, 0)
+   ZEND_ARG_INFO(0, encoding)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_substitute_character, 0, 0, 0)
+   ZEND_ARG_INFO(0, substchar)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_preferred_mime_name, 0, 0, 1)
+   ZEND_ARG_INFO(0, encoding)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_parse_str, 0, 0, 1)
+   ZEND_ARG_INFO(0, encoded_string)
+   ZEND_ARG_INFO(1, result)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_output_handler, 0, 0, 2)
+   ZEND_ARG_INFO(0, contents)
+   ZEND_ARG_INFO(0, status)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strlen, 0, 0, 1)
+   ZEND_ARG_INFO(0, str)
+   ZEND_ARG_INFO(0, encoding)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strpos, 0, 0, 2)
+   ZEND_ARG_INFO(0, haystack)
+   ZEND_ARG_INFO(0, needle)
+   ZEND_ARG_INFO(0, offset)
+   ZEND_ARG_INFO(0, encoding)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strrpos, 0, 0, 2)
+   ZEND_ARG_INFO(0, haystack)
+   ZEND_ARG_INFO(0, needle)
+   ZEND_ARG_INFO(0, offset)
+   ZEND_ARG_INFO(0, encoding)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_stripos, 0, 0, 2)
+   ZEND_ARG_INFO(0, haystack)
+   ZEND_ARG_INFO(0, needle)
+   ZEND_ARG_INFO(0, offset)
+   ZEND_ARG_INFO(0, encoding)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strripos, 0, 0, 2)
+   ZEND_ARG_INFO(0, haystack)
+   ZEND_ARG_INFO(0, needle)
+   ZEND_ARG_INFO(0, offset)
+   ZEND_ARG_INFO(0, encoding)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strstr, 0, 0, 2)
+   ZEND_ARG_INFO(0, haystack)
+   ZEND_ARG_INFO(0, needle)
+   ZEND_ARG_INFO(0, part)
+   ZEND_ARG_INFO(0, encoding)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strrchr, 0, 0, 2)
+   ZEND_ARG_INFO(0, haystack)
+   ZEND_ARG_INFO(0, needle)
+   ZEND_ARG_INFO(0, part)
+   ZEND_ARG_INFO(0, encoding)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_stristr, 0, 0, 2)
+   ZEND_ARG_INFO(0, haystack)
+   ZEND_ARG_INFO(0, needle)
+   ZEND_ARG_INFO(0, part)
+   ZEND_ARG_INFO(0, encoding)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strrichr, 0, 0, 2)
+   ZEND_ARG_INFO(0, haystack)
+   ZEND_ARG_INFO(0, needle)
+   ZEND_ARG_INFO(0, part)
+   ZEND_ARG_INFO(0,

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

2008-07-07 Thread Felipe Pena 
felipe  Mon Jul  7 13:55:42 2008 UTC

  Modified files:  
/php-src/ext/mbstring   mbstring.c 
  Log:
  - MFB: Removed unused variables
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.281r2=1.282diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.281 
php-src/ext/mbstring/mbstring.c:1.282
--- php-src/ext/mbstring/mbstring.c:1.281   Mon Jul  7 13:52:44 2008
+++ php-src/ext/mbstring/mbstring.c Mon Jul  7 13:55:42 2008
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: mbstring.c,v 1.281 2008/07/07 13:52:44 felipe Exp $ */
+/* $Id: mbstring.c,v 1.282 2008/07/07 13:55:42 felipe Exp $ */
 
 /*
  * PHP 4 Multibyte String module mbstring
@@ -2604,7 +2604,6 @@
Trim the string in terminal width */
 PHP_FUNCTION(mb_strimwidth)
 {
-   zval **arg1, **arg2, **arg3, **arg4, **arg5;
char *str, *trimmarker, *encoding;
long from, width;
int str_len, trimmarker_len, encoding_len;



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

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

2008-07-07 Thread Felipe Pena 
felipe  Mon Jul  7 17:18:43 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/imap   php_imap.c 
  Log:
  - Added arginfo
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.208.2.7.2.26.2.13r2=1.208.2.7.2.26.2.14diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.13 
php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.14
--- php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.13 Wed Jul  2 17:56:19 2008
+++ php-src/ext/imap/php_imap.c Mon Jul  7 17:18:43 2008
@@ -26,7 +26,7 @@
| PHP 4.0 updates:  Zeev Suraski [EMAIL PROTECTED]   |
+--+
  */
-/* $Id: php_imap.c,v 1.208.2.7.2.26.2.13 2008/07/02 17:56:19 pajoye Exp $ */
+/* $Id: php_imap.c,v 1.208.2.7.2.26.2.14 2008/07/07 17:18:43 felipe Exp $ */
 
 #define IMAP41
 
@@ -96,84 +96,498 @@
 ZEND_DECLARE_MODULE_GLOBALS(imap)
 static PHP_GINIT_FUNCTION(imap);
 
+/* {{{ arginfo */
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_open, 0, 0, 3)
+   ZEND_ARG_INFO(0, mailbox)
+   ZEND_ARG_INFO(0, user)
+   ZEND_ARG_INFO(0, password)
+   ZEND_ARG_INFO(0, options)
+   ZEND_ARG_INFO(0, n_retries)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_reopen, 0, 0, 2)
+   ZEND_ARG_INFO(0, stream_id)
+   ZEND_ARG_INFO(0, mailbox)
+   ZEND_ARG_INFO(0, options)
+   ZEND_ARG_INFO(0, n_retries)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_append, 0, 0, 3)
+   ZEND_ARG_INFO(0, stream_id)
+   ZEND_ARG_INFO(0, folder)
+   ZEND_ARG_INFO(0, message)
+   ZEND_ARG_INFO(0, options)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_num_msg, 0, 0, 1)
+   ZEND_ARG_INFO(0, stream_id)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_ping, 0, 0, 1)
+   ZEND_ARG_INFO(0, stream_id)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_num_recent, 0, 0, 1)
+   ZEND_ARG_INFO(0, stream_id)
+ZEND_END_ARG_INFO()
+
+#if defined(HAVE_IMAP2000) || defined(HAVE_IMAP2001)
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_get_quota, 0, 0, 2)
+   ZEND_ARG_INFO(0, stream_id)
+   ZEND_ARG_INFO(0, qroot)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_get_quotaroot, 0, 0, 2)
+   ZEND_ARG_INFO(0, stream_id)
+   ZEND_ARG_INFO(0, mbox)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_set_quota, 0, 0, 3)
+   ZEND_ARG_INFO(0, stream_id)
+   ZEND_ARG_INFO(0, qroot)
+   ZEND_ARG_INFO(0, mailbox_size)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_setacl, 0, 0, 4)
+   ZEND_ARG_INFO(0, stream_id)
+   ZEND_ARG_INFO(0, mailbox)
+   ZEND_ARG_INFO(0, id)
+   ZEND_ARG_INFO(0, rights)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_getacl, 0, 0, 2)
+   ZEND_ARG_INFO(0, stream_id)
+   ZEND_ARG_INFO(0, mailbox)
+ZEND_END_ARG_INFO()
+#endif
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_expunge, 0, 0, 1)
+   ZEND_ARG_INFO(0, stream_id)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_close, 0, 0, 1)
+   ZEND_ARG_INFO(0, stream_id)
+   ZEND_ARG_INFO(0, options)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_headers, 0, 0, 1)
+   ZEND_ARG_INFO(0, stream_id)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_body, 0, 0, 2)
+   ZEND_ARG_INFO(0, stream_id)
+   ZEND_ARG_INFO(0, msg_no)
+   ZEND_ARG_INFO(0, options)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_mail_copy, 0, 0, 3)
+   ZEND_ARG_INFO(0, stream_id)
+   ZEND_ARG_INFO(0, msglist)
+   ZEND_ARG_INFO(0, mailbox)
+   ZEND_ARG_INFO(0, options)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_mail_move, 0, 0, 3)
+   ZEND_ARG_INFO(0, stream_id)
+   ZEND_ARG_INFO(0, sequence)
+   ZEND_ARG_INFO(0, mailbox)
+   ZEND_ARG_INFO(0, options)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_createmailbox, 0, 0, 2)
+   ZEND_ARG_INFO(0, stream_id)
+   ZEND_ARG_INFO(0, mailbox)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_renamemailbox, 0, 0, 3)
+   ZEND_ARG_INFO(0, stream_id)
+   ZEND_ARG_INFO(0, old_name)
+   ZEND_ARG_INFO(0, new_name)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_deletemailbox, 0, 0, 2)
+   ZEND_ARG_INFO(0, stream_id)
+   ZEND_ARG_INFO(0, mailbox)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_list, 0, 0, 3)
+   ZEND_ARG_INFO(0, stream_id)
+   ZEND_ARG_INFO(0, ref)
+   ZEND_ARG_INFO(0, pattern)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_getmailboxes, 0, 0, 3)
+   ZEND_ARG_INFO(0, stream_id)
+   ZEND_ARG_INFO(0, ref)
+   ZEND_ARG_INFO(0, pattern)
+ZEND_END_ARG_INFO()
+
+static

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

2008-07-07 Thread Felipe Pena 
felipe  Mon Jul  7 17:19:07 2008 UTC

  Modified files:  
/php-src/ext/imap   php_imap.c 
  Log:
  - MFB: Added arginfo
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.253r2=1.254diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.253 php-src/ext/imap/php_imap.c:1.254
--- php-src/ext/imap/php_imap.c:1.253   Thu Jul  3 18:28:41 2008
+++ php-src/ext/imap/php_imap.c Mon Jul  7 17:19:07 2008
@@ -26,7 +26,7 @@
| PHP 4.0 updates:  Zeev Suraski [EMAIL PROTECTED]   |
+--+
  */
-/* $Id: php_imap.c,v 1.253 2008/07/03 18:28:41 pajoye Exp $ */
+/* $Id: php_imap.c,v 1.254 2008/07/07 17:19:07 felipe Exp $ */
 
 #define IMAP41
 
@@ -96,84 +96,498 @@
 ZEND_DECLARE_MODULE_GLOBALS(imap)
 static PHP_GINIT_FUNCTION(imap);
 
+/* {{{ arginfo */
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_open, 0, 0, 3)
+   ZEND_ARG_INFO(0, mailbox)
+   ZEND_ARG_INFO(0, user)
+   ZEND_ARG_INFO(0, password)
+   ZEND_ARG_INFO(0, options)
+   ZEND_ARG_INFO(0, n_retries)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_reopen, 0, 0, 2)
+   ZEND_ARG_INFO(0, stream_id)
+   ZEND_ARG_INFO(0, mailbox)
+   ZEND_ARG_INFO(0, options)
+   ZEND_ARG_INFO(0, n_retries)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_append, 0, 0, 3)
+   ZEND_ARG_INFO(0, stream_id)
+   ZEND_ARG_INFO(0, folder)
+   ZEND_ARG_INFO(0, message)
+   ZEND_ARG_INFO(0, options)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_num_msg, 0, 0, 1)
+   ZEND_ARG_INFO(0, stream_id)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_ping, 0, 0, 1)
+   ZEND_ARG_INFO(0, stream_id)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_num_recent, 0, 0, 1)
+   ZEND_ARG_INFO(0, stream_id)
+ZEND_END_ARG_INFO()
+
+#if defined(HAVE_IMAP2000) || defined(HAVE_IMAP2001)
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_get_quota, 0, 0, 2)
+   ZEND_ARG_INFO(0, stream_id)
+   ZEND_ARG_INFO(0, qroot)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_get_quotaroot, 0, 0, 2)
+   ZEND_ARG_INFO(0, stream_id)
+   ZEND_ARG_INFO(0, mbox)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_set_quota, 0, 0, 3)
+   ZEND_ARG_INFO(0, stream_id)
+   ZEND_ARG_INFO(0, qroot)
+   ZEND_ARG_INFO(0, mailbox_size)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_setacl, 0, 0, 4)
+   ZEND_ARG_INFO(0, stream_id)
+   ZEND_ARG_INFO(0, mailbox)
+   ZEND_ARG_INFO(0, id)
+   ZEND_ARG_INFO(0, rights)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_getacl, 0, 0, 2)
+   ZEND_ARG_INFO(0, stream_id)
+   ZEND_ARG_INFO(0, mailbox)
+ZEND_END_ARG_INFO()
+#endif
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_expunge, 0, 0, 1)
+   ZEND_ARG_INFO(0, stream_id)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_close, 0, 0, 1)
+   ZEND_ARG_INFO(0, stream_id)
+   ZEND_ARG_INFO(0, options)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_headers, 0, 0, 1)
+   ZEND_ARG_INFO(0, stream_id)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_body, 0, 0, 2)
+   ZEND_ARG_INFO(0, stream_id)
+   ZEND_ARG_INFO(0, msg_no)
+   ZEND_ARG_INFO(0, options)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_mail_copy, 0, 0, 3)
+   ZEND_ARG_INFO(0, stream_id)
+   ZEND_ARG_INFO(0, msglist)
+   ZEND_ARG_INFO(0, mailbox)
+   ZEND_ARG_INFO(0, options)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_mail_move, 0, 0, 3)
+   ZEND_ARG_INFO(0, stream_id)
+   ZEND_ARG_INFO(0, sequence)
+   ZEND_ARG_INFO(0, mailbox)
+   ZEND_ARG_INFO(0, options)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_createmailbox, 0, 0, 2)
+   ZEND_ARG_INFO(0, stream_id)
+   ZEND_ARG_INFO(0, mailbox)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_renamemailbox, 0, 0, 3)
+   ZEND_ARG_INFO(0, stream_id)
+   ZEND_ARG_INFO(0, old_name)
+   ZEND_ARG_INFO(0, new_name)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_deletemailbox, 0, 0, 2)
+   ZEND_ARG_INFO(0, stream_id)
+   ZEND_ARG_INFO(0, mailbox)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_list, 0, 0, 3)
+   ZEND_ARG_INFO(0, stream_id)
+   ZEND_ARG_INFO(0, ref)
+   ZEND_ARG_INFO(0, pattern)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_getmailboxes, 0, 0, 3)
+   ZEND_ARG_INFO(0, stream_id)
+   ZEND_ARG_INFO(0, ref)
+   ZEND_ARG_INFO(0, pattern)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_listscan, 0, 0, 4)
+   ZEND_ARG_INFO(0, stream_id)
+   ZEND_ARG_INFO(0, ref)
+

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

2008-07-07 Thread Felipe Pena 
felipe  Mon Jul  7 17:33:47 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/interbase  interbase.c 
  Log:
  - Added arginfo
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/interbase.c?r1=1.225.2.4.2.7.2.3r2=1.225.2.4.2.7.2.4diff_format=u
Index: php-src/ext/interbase/interbase.c
diff -u php-src/ext/interbase/interbase.c:1.225.2.4.2.7.2.3 
php-src/ext/interbase/interbase.c:1.225.2.4.2.7.2.4
--- php-src/ext/interbase/interbase.c:1.225.2.4.2.7.2.3 Mon Mar 10 22:12:34 2008
+++ php-src/ext/interbase/interbase.c   Mon Jul  7 17:33:47 2008
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: interbase.c,v 1.225.2.4.2.7.2.3 2008/03/10 22:12:34 felipe Exp $ */
+/* $Id: interbase.c,v 1.225.2.4.2.7.2.4 2008/07/07 17:33:47 felipe Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -46,64 +46,384 @@
 ZEND_DECLARE_MODULE_GLOBALS(ibase)
 static PHP_GINIT_FUNCTION(ibase);
 
+/* {{{ arginfo */
+static
+ZEND_BEGIN_ARG_INFO(arginfo_ibase_errmsg, 0)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO(arginfo_ibase_errcode, 0)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_connect, 0, 0, 1)
+   ZEND_ARG_INFO(0, database)
+   ZEND_ARG_INFO(0, username)
+   ZEND_ARG_INFO(0, password)
+   ZEND_ARG_INFO(0, charset)
+   ZEND_ARG_INFO(0, buffers)
+   ZEND_ARG_INFO(0, dialect)
+   ZEND_ARG_INFO(0, role)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_pconnect, 0, 0, 1)
+   ZEND_ARG_INFO(0, database)
+   ZEND_ARG_INFO(0, username)
+   ZEND_ARG_INFO(0, password)
+   ZEND_ARG_INFO(0, charset)
+   ZEND_ARG_INFO(0, buffers)
+   ZEND_ARG_INFO(0, dialect)
+   ZEND_ARG_INFO(0, role)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_close, 0, 0, 0)
+   ZEND_ARG_INFO(0, link_identifier)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_drop_db, 0, 0, 0)
+   ZEND_ARG_INFO(0, link_identifier)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_trans, 0, 0, 0)
+   ZEND_ARG_INFO(0, trans_args)
+   ZEND_ARG_INFO(0, link_identifier)
+   ZEND_ARG_INFO(0, trans_args)
+   ZEND_ARG_INFO(0, link_identifier)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_commit, 0, 0, 1)
+   ZEND_ARG_INFO(0, link_identifier)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_rollback, 0, 0, 1)
+   ZEND_ARG_INFO(0, link_identifier)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_commit_ret, 0, 0, 1)
+   ZEND_ARG_INFO(0, link_identifier)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_rollback_ret, 0, 0, 1)
+   ZEND_ARG_INFO(0, link_identifier)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_gen_id, 0, 0, 1)
+   ZEND_ARG_INFO(0, generator)
+   ZEND_ARG_INFO(0, increment)
+   ZEND_ARG_INFO(0, link_identifier)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_blob_create, 0, 0, 0)
+   ZEND_ARG_INFO(0, link_identifier)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_blob_open, 0, 0, 0)
+   ZEND_ARG_INFO(0, link_identifier)
+   ZEND_ARG_INFO(0, blob_id)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_blob_add, 0, 0, 2)
+   ZEND_ARG_INFO(0, blob_handle)
+   ZEND_ARG_INFO(0, data)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_blob_get, 0, 0, 2)
+   ZEND_ARG_INFO(0, blob_handle)
+   ZEND_ARG_INFO(0, len)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_blob_close, 0, 0, 1)
+   ZEND_ARG_INFO(0, blob_handle)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_blob_cancel, 0, 0, 1)
+   ZEND_ARG_INFO(0, blob_handle)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_blob_info, 0, 0, 0)
+   ZEND_ARG_INFO(0, link_identifier)
+   ZEND_ARG_INFO(0, blob_id)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_blob_echo, 0, 0, 0)
+   ZEND_ARG_INFO(0, link_identifier)
+   ZEND_ARG_INFO(0, blob_id)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_blob_import, 0, 0, 0)
+   ZEND_ARG_INFO(0, link_identifier)
+   ZEND_ARG_INFO(0, file)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_query, 0, 0, 0)
+   ZEND_ARG_INFO(0, link_identifier)
+   ZEND_ARG_INFO(0, link_identifier)
+   ZEND_ARG_INFO(0, query)
+   ZEND_ARG_INFO(0, bind_arg)
+   ZEND_ARG_INFO(0, bind_arg)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_affected_rows, 0, 0, 0)
+   ZEND_ARG_INFO(0, link_identifier)
+ZEND_END_ARG_INFO()
+
+#if abies_0
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_num_rows, 0, 0, 1)
+   ZEND_ARG_INFO(0, result_identifier)
+ZEND_END_ARG_INFO()
+#endif
+
+static

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

2008-07-07 Thread Felipe Pena 
felipe  Mon Jul  7 17:34:07 2008 UTC

  Modified files:  
/php-src/ext/interbase  interbase.c 
  Log:
  MFB: - Added arginfo
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/interbase.c?r1=1.238r2=1.239diff_format=u
Index: php-src/ext/interbase/interbase.c
diff -u php-src/ext/interbase/interbase.c:1.238 
php-src/ext/interbase/interbase.c:1.239
--- php-src/ext/interbase/interbase.c:1.238 Thu Feb 28 14:16:12 2008
+++ php-src/ext/interbase/interbase.c   Mon Jul  7 17:34:07 2008
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: interbase.c,v 1.238 2008/02/28 14:16:12 felipe Exp $ */
+/* $Id: interbase.c,v 1.239 2008/07/07 17:34:07 felipe Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -46,64 +46,384 @@
 ZEND_DECLARE_MODULE_GLOBALS(ibase)
 static PHP_GINIT_FUNCTION(ibase);
 
+/* {{{ arginfo */
+static
+ZEND_BEGIN_ARG_INFO(arginfo_ibase_errmsg, 0)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO(arginfo_ibase_errcode, 0)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_connect, 0, 0, 1)
+   ZEND_ARG_INFO(0, database)
+   ZEND_ARG_INFO(0, username)
+   ZEND_ARG_INFO(0, password)
+   ZEND_ARG_INFO(0, charset)
+   ZEND_ARG_INFO(0, buffers)
+   ZEND_ARG_INFO(0, dialect)
+   ZEND_ARG_INFO(0, role)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_pconnect, 0, 0, 1)
+   ZEND_ARG_INFO(0, database)
+   ZEND_ARG_INFO(0, username)
+   ZEND_ARG_INFO(0, password)
+   ZEND_ARG_INFO(0, charset)
+   ZEND_ARG_INFO(0, buffers)
+   ZEND_ARG_INFO(0, dialect)
+   ZEND_ARG_INFO(0, role)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_close, 0, 0, 0)
+   ZEND_ARG_INFO(0, link_identifier)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_drop_db, 0, 0, 0)
+   ZEND_ARG_INFO(0, link_identifier)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_trans, 0, 0, 0)
+   ZEND_ARG_INFO(0, trans_args)
+   ZEND_ARG_INFO(0, link_identifier)
+   ZEND_ARG_INFO(0, trans_args)
+   ZEND_ARG_INFO(0, link_identifier)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_commit, 0, 0, 1)
+   ZEND_ARG_INFO(0, link_identifier)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_rollback, 0, 0, 1)
+   ZEND_ARG_INFO(0, link_identifier)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_commit_ret, 0, 0, 1)
+   ZEND_ARG_INFO(0, link_identifier)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_rollback_ret, 0, 0, 1)
+   ZEND_ARG_INFO(0, link_identifier)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_gen_id, 0, 0, 1)
+   ZEND_ARG_INFO(0, generator)
+   ZEND_ARG_INFO(0, increment)
+   ZEND_ARG_INFO(0, link_identifier)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_blob_create, 0, 0, 0)
+   ZEND_ARG_INFO(0, link_identifier)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_blob_open, 0, 0, 0)
+   ZEND_ARG_INFO(0, link_identifier)
+   ZEND_ARG_INFO(0, blob_id)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_blob_add, 0, 0, 2)
+   ZEND_ARG_INFO(0, blob_handle)
+   ZEND_ARG_INFO(0, data)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_blob_get, 0, 0, 2)
+   ZEND_ARG_INFO(0, blob_handle)
+   ZEND_ARG_INFO(0, len)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_blob_close, 0, 0, 1)
+   ZEND_ARG_INFO(0, blob_handle)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_blob_cancel, 0, 0, 1)
+   ZEND_ARG_INFO(0, blob_handle)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_blob_info, 0, 0, 0)
+   ZEND_ARG_INFO(0, link_identifier)
+   ZEND_ARG_INFO(0, blob_id)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_blob_echo, 0, 0, 0)
+   ZEND_ARG_INFO(0, link_identifier)
+   ZEND_ARG_INFO(0, blob_id)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_blob_import, 0, 0, 0)
+   ZEND_ARG_INFO(0, link_identifier)
+   ZEND_ARG_INFO(0, file)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_query, 0, 0, 0)
+   ZEND_ARG_INFO(0, link_identifier)
+   ZEND_ARG_INFO(0, link_identifier)
+   ZEND_ARG_INFO(0, query)
+   ZEND_ARG_INFO(0, bind_arg)
+   ZEND_ARG_INFO(0, bind_arg)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_affected_rows, 0, 0, 0)
+   ZEND_ARG_INFO(0, link_identifier)
+ZEND_END_ARG_INFO()
+
+#if abies_0
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_num_rows, 0, 0, 1)
+   ZEND_ARG_INFO(0, result_identifier)
+ZEND_END_ARG_INFO()
+#endif
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_fetch_row, 0, 0, 1)
+   ZEND_ARG_INFO(0, result)
+   ZEND_ARG_INFO(0, fetch_flags)

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

2008-07-07 Thread Hannes Magnusson 
bjori   Mon Jul  7 17:58:32 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcEXTENSIONS 
  Log:
  He doesn't actually maintain it that much... :)
  
  
http://cvs.php.net/viewvc.cgi/php-src/EXTENSIONS?r1=1.72.2.4.2.4.2.6r2=1.72.2.4.2.4.2.7diff_format=u
Index: php-src/EXTENSIONS
diff -u php-src/EXTENSIONS:1.72.2.4.2.4.2.6 php-src/EXTENSIONS:1.72.2.4.2.4.2.7
--- php-src/EXTENSIONS:1.72.2.4.2.4.2.6 Mon Jul  7 00:07:59 2008
+++ php-src/EXTENSIONS  Mon Jul  7 17:58:32 2008
@@ -194,7 +194,7 @@
 SINCE:   5.1
 ---
 EXTENSION:   pdo_mysql
-PRIMARY MAINTAINER:  Ilia Alshanetsky [EMAIL PROTECTED], Johannes Schlüter 
[EMAIL PROTECTED], Andrey Hristov [EMAIL PROTECTED],  Johannes Schlüter 
[EMAIL PROTECTED], Ulf Wendel [EMAIL PROTECTED]  
+PRIMARY MAINTAINER:  Ilia Alshanetsky [EMAIL PROTECTED], Johannes Schlüter 
[EMAIL PROTECTED], Andrey Hristov [EMAIL PROTECTED],  Ulf Wendel [EMAIL 
PROTECTED]
 MAINTENANCE: Odd fixes
 STATUS:  Working
 SINCE:   5.1



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

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

2008-07-07 Thread Hannes Magnusson 
bjori   Mon Jul  7 17:59:52 2008 UTC

  Modified files:  
/php-srcEXTENSIONS 
  Log:
  MFB: once is enough
  
  
http://cvs.php.net/viewvc.cgi/php-src/EXTENSIONS?r1=1.82r2=1.83diff_format=u
Index: php-src/EXTENSIONS
diff -u php-src/EXTENSIONS:1.82 php-src/EXTENSIONS:1.83
--- php-src/EXTENSIONS:1.82 Mon Jul  7 00:07:12 2008
+++ php-src/EXTENSIONS  Mon Jul  7 17:59:52 2008
@@ -194,7 +194,7 @@
 SINCE:   5.1
 ---
 EXTENSION:   pdo_mysql
-PRIMARY MAINTAINER:  Ilia Alshanetsky [EMAIL PROTECTED], Johannes Schlüter 
[EMAIL PROTECTED], Andrey Hristov [EMAIL PROTECTED],  Johannes Schlüter 
[EMAIL PROTECTED], Ulf Wendel [EMAIL PROTECTED]  
+PRIMARY MAINTAINER:  Ilia Alshanetsky [EMAIL PROTECTED], Johannes Schlüter 
[EMAIL PROTECTED], Andrey Hristov [EMAIL PROTECTED], Ulf Wendel [EMAIL 
PROTECTED]
 MAINTENANCE: Odd fixes
 STATUS:  Working
 SINCE:   5.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/intl .cvsignore CREDITS TODO config.m4 config.w32 intl_common.h intl_convert.c intl_convert.h intl_data.h intl_error.c intl_error.h php_intl.c php_intl.h /ext/int

2008-07-07 Thread Stanislav Malyshev 
stasMon Jul  7 22:51:05 2008 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/intl   .cvsignore CREDITS TODO config.m4 config.w32 
intl_common.h intl_convert.c intl_convert.h 
intl_data.h intl_error.c intl_error.h php_intl.c 
php_intl.h 
/php-src/ext/intl/collator  .cvsignore collator.c collator.h 
collator_attr.c collator_attr.h 
collator_class.c collator_class.h 
collator_compare.c collator_compare.h 
collator_convert.c collator_convert.h 
collator_create.c collator_create.h 
collator_error.c collator_error.h 
collator_is_numeric.c 
collator_is_numeric.h collator_locale.c 
collator_locale.h collator_sort.c 
collator_sort.h 
/php-src/ext/intl/common.cvsignore common_error.c common_error.h 
/php-src/ext/intl/doc   Tutorial.txt collator_api.php common_api.php 
datefmt_api.php formatter_api.php 
grapheme_api.php locale_api.php 
msgfmt_api.php normalizer_api.php 
/php-src/ext/intl/formatter .cvsignore formatter.c formatter.h 
formatter_attr.c formatter_attr.h 
formatter_class.c formatter_class.h 
formatter_data.c formatter_data.h 
formatter_format.c formatter_format.h 
formatter_main.c formatter_main.h 
formatter_parse.c formatter_parse.h 
/php-src/ext/intl/grapheme  .cvsignore grapheme.h grapheme_string.c 
grapheme_util.c grapheme_util.h 
/php-src/ext/intl/locale.cvsignore locale.c locale.h 
locale_class.c locale_class.h 
locale_methods.c locale_methods.h 
/php-src/ext/intl/msgformat .cvsignore msgformat.c msgformat.h 
msgformat_attr.c msgformat_attr.h 
msgformat_class.c msgformat_class.h 
msgformat_data.c msgformat_data.h 
msgformat_format.c msgformat_format.h 
msgformat_helpers.cpp 
msgformat_helpers.h msgformat_parse.c 
msgformat_parse.h 
/php-src/ext/intl/normalizer.cvsignore normalizer.c normalizer.h 
normalizer_class.c normalizer_class.h 
normalizer_normalize.c 
normalizer_normalize.h 
/php-src/ext/intl/tests .cvsignore bug12887.phpt 
collation_customization.phpt 
collator_asort.phpt collator_compare.phpt 
collator_create.phpt 
collator_get_error_code.phpt 
collator_get_error_message.phpt 
collator_get_locale.phpt 
collator_get_set_attribute.phpt 
collator_get_set_strength.phpt 
collator_sort.phpt 
collator_sort_with_sort_keys.phpt 
dateformat_format.phpt 
dateformat_format_parse.phpt 
dateformat_get_datetype.phpt 
dateformat_get_locale.phpt 
dateformat_get_set_calendar.phpt 
dateformat_get_set_pattern.phpt 
dateformat_get_timetype.phpt 
dateformat_get_timezone_id.phpt 
dateformat_is_set_lenient.phpt 
dateformat_localtime.phpt 
dateformat_parse.phpt 
dateformat_parse_localtime_parsepos.phpt 
dateformat_parse_timestamp_parsepos.phpt 
dateformat_set_timezone_id.phpt 
formatter_fail.phpt formatter_format.phpt 
formatter_format_conv.phpt 
formatter_format_currency.phpt 
formatter_get_error.phpt 
formatter_get_locale.phpt 
formatter_get_set_attribute.phpt

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/intl/dateformat .cvsignore dateformat.c dateformat.h dateformat_attr.c dateformat_attr.h dateformat_class.c dateformat_class.h dateformat_data.c dateformat_data.h

2008-07-07 Thread Stanislav Malyshev 
stasMon Jul  7 23:10:15 2008 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/intl/dateformat.cvsignore dateformat.c dateformat.h 
dateformat_attr.c dateformat_attr.h 
dateformat_class.c dateformat_class.h 
dateformat_data.c dateformat_data.h 
dateformat_format.c 
dateformat_format.h dateformat_parse.c 
dateformat_parse.h 
  Log:
  Merge intl extension
  
  

http://cvs.php.net/viewvc.cgi/php-src/ext/intl/dateformat/.cvsignore?view=markuprev=1.1
Index: php-src/ext/intl/dateformat/.cvsignore
+++ php-src/ext/intl/dateformat/.cvsignore

http://cvs.php.net/viewvc.cgi/php-src/ext/intl/dateformat/dateformat.c?view=markuprev=1.1
Index: php-src/ext/intl/dateformat/dateformat.c
+++ php-src/ext/intl/dateformat/dateformat.c

http://cvs.php.net/viewvc.cgi/php-src/ext/intl/dateformat/dateformat.h?view=markuprev=1.1
Index: php-src/ext/intl/dateformat/dateformat.h
+++ php-src/ext/intl/dateformat/dateformat.h

http://cvs.php.net/viewvc.cgi/php-src/ext/intl/dateformat/dateformat_attr.c?view=markuprev=1.1
Index: php-src/ext/intl/dateformat/dateformat_attr.c
+++ php-src/ext/intl/dateformat/dateformat_attr.c

http://cvs.php.net/viewvc.cgi/php-src/ext/intl/dateformat/dateformat_attr.h?view=markuprev=1.1
Index: php-src/ext/intl/dateformat/dateformat_attr.h
+++ php-src/ext/intl/dateformat/dateformat_attr.h

http://cvs.php.net/viewvc.cgi/php-src/ext/intl/dateformat/dateformat_class.c?view=markuprev=1.1
Index: php-src/ext/intl/dateformat/dateformat_class.c
+++ php-src/ext/intl/dateformat/dateformat_class.c

http://cvs.php.net/viewvc.cgi/php-src/ext/intl/dateformat/dateformat_class.h?view=markuprev=1.1
Index: php-src/ext/intl/dateformat/dateformat_class.h
+++ php-src/ext/intl/dateformat/dateformat_class.h

http://cvs.php.net/viewvc.cgi/php-src/ext/intl/dateformat/dateformat_data.c?view=markuprev=1.1
Index: php-src/ext/intl/dateformat/dateformat_data.c
+++ php-src/ext/intl/dateformat/dateformat_data.c

http://cvs.php.net/viewvc.cgi/php-src/ext/intl/dateformat/dateformat_data.h?view=markuprev=1.1
Index: php-src/ext/intl/dateformat/dateformat_data.h
+++ php-src/ext/intl/dateformat/dateformat_data.h

http://cvs.php.net/viewvc.cgi/php-src/ext/intl/dateformat/dateformat_format.c?view=markuprev=1.1
Index: php-src/ext/intl/dateformat/dateformat_format.c
+++ php-src/ext/intl/dateformat/dateformat_format.c

http://cvs.php.net/viewvc.cgi/php-src/ext/intl/dateformat/dateformat_format.h?view=markuprev=1.1
Index: php-src/ext/intl/dateformat/dateformat_format.h
+++ php-src/ext/intl/dateformat/dateformat_format.h

http://cvs.php.net/viewvc.cgi/php-src/ext/intl/dateformat/dateformat_parse.c?view=markuprev=1.1
Index: php-src/ext/intl/dateformat/dateformat_parse.c
+++ php-src/ext/intl/dateformat/dateformat_parse.c

http://cvs.php.net/viewvc.cgi/php-src/ext/intl/dateformat/dateformat_parse.h?view=markuprev=1.1
Index: php-src/ext/intl/dateformat/dateformat_parse.h
+++ php-src/ext/intl/dateformat/dateformat_parse.h



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