[PHP-CVS] cvs: php-src(PHP_5_0) / configure.in

2005-03-17 Thread Jani Taskinen
sniper  Thu Mar 17 03:12:15 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-srcconfigure.in 
  Log:
  fix build
  
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.514.2.41r2=1.514.2.42ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.514.2.41 php-src/configure.in:1.514.2.42
--- php-src/configure.in:1.514.2.41 Wed Mar 16 01:36:53 2005
+++ php-src/configure.inThu Mar 17 03:12:14 2005
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.514.2.41 2005/03/16 06:36:53 sniper Exp $ -*- sh 
-*-
+dnl ## $Id: configure.in,v 1.514.2.42 2005/03/17 08:12:14 sniper Exp $ -*- sh 
-*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -308,7 +308,6 @@
CPPFLAGS=$CPPFLAGS -I/usr/pkg/include
LDFLAGS=$LDFLAGS -L/usr/pkg/lib
 fi
-INCLUDES=$INCLUDES -I\$(top_builddir)/Zend
 test -d /usr/ucblib  PHP_ADD_LIBPATH(/usr/ucblib)
 
 
@@ -980,6 +979,9 @@
   PHP_THREAD_SAFETY=no
 fi
 
+INCLUDES=$INCLUDES -I\$(top_builddir)/TSRM
+INCLUDES=$INCLUDES -I\$(top_builddir)/Zend
+
 if test $abs_srcdir != $abs_builddir; then
   INCLUDES=$INCLUDES -I\$(top_srcdir)/main -I\$(top_srcdir)/Zend
   INCLUDES=$INCLUDES -I\$(top_srcdir)/TSRM -I\$(top_builddir)/
@@ -1152,7 +1154,6 @@
 PHP_SUBST(CXXFLAGS_CLEAN)
 PHP_SUBST(CXX_PHP_COMPILE)
 PHP_SUBST_OLD(DEBUG_CFLAGS)
-PHP_SUBST(DEFS)
 PHP_SUBST_OLD(EXTENSION_DIR)
 PHP_SUBST_OLD(EXTRA_LDFLAGS)
 PHP_SUBST_OLD(EXTRA_LDFLAGS_PROGRAM)

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



[PHP-CVS] cvs: php-src(PHP_4_3) / configure.in

2005-03-17 Thread Jani Taskinen
sniper  Thu Mar 17 03:13:03 2005 EDT

  Modified files:  (Branch: PHP_4_3)
/php-srcconfigure.in 
  Log:
  fix build
  
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.396.2.156r2=1.396.2.157ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.396.2.156 php-src/configure.in:1.396.2.157
--- php-src/configure.in:1.396.2.156Wed Mar 16 01:37:03 2005
+++ php-src/configure.inThu Mar 17 03:13:03 2005
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.396.2.156 2005/03/16 06:37:03 sniper Exp $ -*- sh 
-*-
+dnl ## $Id: configure.in,v 1.396.2.157 2005/03/17 08:13:03 sniper Exp $ -*- sh 
-*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -300,7 +300,6 @@
CPPFLAGS=$CPPFLAGS -I/usr/pkg/include
LDFLAGS=$LDFLAGS -L/usr/pkg/lib
 fi
-INCLUDES=$INCLUDES -I\$(top_builddir)/Zend
 test -d /usr/ucblib  PHP_ADD_LIBPATH(/usr/ucblib)
 
 
@@ -942,6 +941,9 @@
   PHP_THREAD_SAFETY=no
 fi
 
+INCLUDES=$INCLUDES -I\$(top_builddir)/TSRM
+INCLUDES=$INCLUDES -I\$(top_builddir)/Zend
+
 if test $abs_srcdir != $abs_builddir; then
   INCLUDES=$INCLUDES -I\$(top_srcdir)/main -I\$(top_srcdir)/Zend
   INCLUDES=$INCLUDES -I\$(top_srcdir)/TSRM -I\$(top_builddir)/
@@ -1114,7 +1116,6 @@
 PHP_SUBST(CXXFLAGS_CLEAN)
 PHP_SUBST(CXX_PHP_COMPILE)
 PHP_SUBST_OLD(DEBUG_CFLAGS)
-PHP_SUBST(DEFS)
 PHP_SUBST_OLD(EXTENSION_DIR)
 PHP_SUBST_OLD(EXTRA_LDFLAGS)
 PHP_SUBST_OLD(EXTRA_LDFLAGS_PROGRAM)

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



[PHP-CVS] cvs: php-src(PHP_4_3) /scripts phpize.m4

2005-03-17 Thread Jani Taskinen
sniper  Thu Mar 17 03:13:22 2005 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/scriptsphpize.m4 
  Log:
  remove unused subst
  
http://cvs.php.net/diff.php/php-src/scripts/phpize.m4?r1=1.1.2.10r2=1.1.2.11ty=u
Index: php-src/scripts/phpize.m4
diff -u php-src/scripts/phpize.m4:1.1.2.10 php-src/scripts/phpize.m4:1.1.2.11
--- php-src/scripts/phpize.m4:1.1.2.10  Fri Mar  4 10:16:27 2005
+++ php-src/scripts/phpize.m4   Thu Mar 17 03:13:21 2005
@@ -89,7 +89,6 @@
 PHP_SUBST(CPPFLAGS)
 PHP_SUBST(CXX)
 PHP_SUBST(CXXFLAGS)
-PHP_SUBST(DEFS)
 PHP_SUBST(EXTENSION_DIR)
 PHP_SUBST(EXTRA_LDFLAGS)
 PHP_SUBST(EXTRA_LIBS)

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



[PHP-CVS] cvs: php-src /ext/mbstring mb_gpc.c mbstring.c /ext/soap php_sdl.c TSRM TSRM.h tsrm_config_common.h

2005-03-17 Thread Jani Taskinen
sniper  Thu Mar 17 03:15:24 2005 EDT

  Modified files:  
/TSRM   TSRM.h tsrm_config_common.h 
/php-src/ext/mbstring   mb_gpc.c mbstring.c 
/php-src/ext/soap   php_sdl.c 
  Log:
  Revert bad fix
  
http://cvs.php.net/diff.php/TSRM/TSRM.h?r1=1.47r2=1.48ty=u
Index: TSRM/TSRM.h
diff -u TSRM/TSRM.h:1.47 TSRM/TSRM.h:1.48
--- TSRM/TSRM.h:1.47Wed Mar 16 17:00:06 2005
+++ TSRM/TSRM.h Thu Mar 17 03:15:22 2005
@@ -15,7 +15,7 @@
 
 /* #ifndef WIN32 */
 #ifndef WIN32
-# include tsrm_config.h
+# include tsrm_config.h
 #endif
 
 #ifdef WIN32
http://cvs.php.net/diff.php/TSRM/tsrm_config_common.h?r1=1.16r2=1.17ty=u
Index: TSRM/tsrm_config_common.h
diff -u TSRM/tsrm_config_common.h:1.16 TSRM/tsrm_config_common.h:1.17
--- TSRM/tsrm_config_common.h:1.16  Wed Mar 16 17:00:06 2005
+++ TSRM/tsrm_config_common.h   Thu Mar 17 03:15:22 2005
@@ -8,7 +8,7 @@
 #ifdef TSRM_WIN32
 # include tsrm_config.w32.h
 #else
-# include tsrm_config.h
+# include tsrm_config.h
 # include sys/param.h
 #endif
 
http://cvs.php.net/diff.php/php-src/ext/mbstring/mb_gpc.c?r1=1.15r2=1.16ty=u
Index: php-src/ext/mbstring/mb_gpc.c
diff -u php-src/ext/mbstring/mb_gpc.c:1.15 php-src/ext/mbstring/mb_gpc.c:1.16
--- php-src/ext/mbstring/mb_gpc.c:1.15  Wed Mar 16 20:14:10 2005
+++ php-src/ext/mbstring/mb_gpc.c   Thu Mar 17 03:15:23 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: mb_gpc.c,v 1.15 2005/03/17 01:14:10 rasmus Exp $ */
+/* $Id: mb_gpc.c,v 1.16 2005/03/17 08:15:23 sniper Exp $ */
 
 /* {{{ includes */
 #ifdef HAVE_CONFIG_H
@@ -39,7 +39,7 @@
 #include rfc1867.h
 #include php_content_types.h
 #include SAPI.h
-#include TSRM/TSRM.h
+#include TSRM.h
 
 #include mb_gpc.h
 /* }}} */
http://cvs.php.net/diff.php/php-src/ext/mbstring/mbstring.c?r1=1.221r2=1.222ty=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.221 
php-src/ext/mbstring/mbstring.c:1.222
--- php-src/ext/mbstring/mbstring.c:1.221   Wed Mar 16 20:14:10 2005
+++ php-src/ext/mbstring/mbstring.c Thu Mar 17 03:15:23 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: mbstring.c,v 1.221 2005/03/17 01:14:10 rasmus Exp $ */
+/* $Id: mbstring.c,v 1.222 2005/03/17 08:15:23 sniper Exp $ */
 
 /*
  * PHP 4 Multibyte String module mbstring
@@ -68,7 +68,7 @@
 #include php_content_types.h
 #include SAPI.h
 #include php_unicode.h
-#include TSRM/TSRM.h
+#include TSRM.h
 
 #include mb_gpc.h
 
http://cvs.php.net/diff.php/php-src/ext/soap/php_sdl.c?r1=1.78r2=1.79ty=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.78 php-src/ext/soap/php_sdl.c:1.79
--- php-src/ext/soap/php_sdl.c:1.78 Wed Mar 16 17:00:07 2005
+++ php-src/ext/soap/php_sdl.c  Thu Mar 17 03:15:23 2005
@@ -17,14 +17,14 @@
   |  Dmitry Stogov [EMAIL PROTECTED] |
   +--+
 */
-/* $Id: php_sdl.c,v 1.78 2005/03/16 22:00:07 rasmus Exp $ */
+/* $Id: php_sdl.c,v 1.79 2005/03/17 08:15:23 sniper Exp $ */
 
 #include php_soap.h
 #include ext/libxml/php_libxml.h
 #include libxml/uri.h
 
 #include ext/standard/md5.h
-#include ../../TSRM/tsrm_virtual_cwd.h
+#include tsrm_virtual_cwd.h
 
 #include sys/types.h
 #include sys/stat.h

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



[PHP-CVS] cvs: php-src / configure.in

2005-03-17 Thread Jani Taskinen
sniper  Thu Mar 17 03:15:50 2005 EDT

  Modified files:  
/php-srcconfigure.in 
  Log:
  Fixed build properly
  
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.544r2=1.545ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.544 php-src/configure.in:1.545
--- php-src/configure.in:1.544  Wed Mar 16 01:36:42 2005
+++ php-src/configure.inThu Mar 17 03:15:50 2005
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.544 2005/03/16 06:36:42 sniper Exp $ -*- autoconf 
-*-
+dnl ## $Id: configure.in,v 1.545 2005/03/17 08:15:50 sniper Exp $ -*- autoconf 
-*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -269,7 +269,6 @@
CPPFLAGS=$CPPFLAGS -I/usr/pkg/include
LDFLAGS=$LDFLAGS -L/usr/pkg/lib
 fi
-INCLUDES=$INCLUDES -I\$(top_builddir)/Zend
 test -d /usr/ucblib  PHP_ADD_LIBPATH(/usr/ucblib)
 
 
@@ -923,6 +922,9 @@
   PHP_THREAD_SAFETY=no
 fi
 
+INCLUDES=$INCLUDES -I\$(top_builddir)/TSRM
+INCLUDES=$INCLUDES -I\$(top_builddir)/Zend
+
 if test $abs_srcdir != $abs_builddir; then
   INCLUDES=$INCLUDES -I\$(top_srcdir)/main -I\$(top_srcdir)/Zend
   INCLUDES=$INCLUDES -I\$(top_srcdir)/TSRM -I\$(top_builddir)/
@@ -1094,7 +1096,6 @@
 PHP_SUBST(CXXFLAGS)
 PHP_SUBST(CXXFLAGS_CLEAN)
 PHP_SUBST_OLD(DEBUG_CFLAGS)
-PHP_SUBST(DEFS)
 PHP_SUBST_OLD(EXTENSION_DIR)
 PHP_SUBST_OLD(EXTRA_LDFLAGS)
 PHP_SUBST_OLD(EXTRA_LDFLAGS_PROGRAM)

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



[PHP-CVS] cvs: php-src /scripts phpize.m4

2005-03-17 Thread Jani Taskinen
sniper  Thu Mar 17 03:16:51 2005 EDT

  Modified files:  
/php-src/scriptsphpize.m4 
  Log:
  Removed unused DEFS subst
  
http://cvs.php.net/diff.php/php-src/scripts/phpize.m4?r1=1.12r2=1.13ty=u
Index: php-src/scripts/phpize.m4
diff -u php-src/scripts/phpize.m4:1.12 php-src/scripts/phpize.m4:1.13
--- php-src/scripts/phpize.m4:1.12  Fri Mar  4 09:34:24 2005
+++ php-src/scripts/phpize.m4   Thu Mar 17 03:16:51 2005
@@ -93,7 +93,6 @@
 PHP_SUBST(CPPFLAGS)
 PHP_SUBST(CXX)
 PHP_SUBST(CXXFLAGS)
-PHP_SUBST(DEFS)
 PHP_SUBST(EXTENSION_DIR)
 PHP_SUBST(EXTRA_LDFLAGS)
 PHP_SUBST(EXTRA_LIBS)

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



Re: [PHP-CVS] cvs: php-src(PHP_4_3) /ext/snmp php_snmp.h snmp.c

2005-03-17 Thread Jani Taskinen
On Wed, 16 Mar 2005, Rasmus Lerdorf wrote:
Ilia Alshanetsky wrote:
Rasmus Lerdorf wrote:
I think this is a bit of a grey area actually.  We definitely want to avoid 
new destabilizing core features in the 4.3 branch, but in extensions on the 
fringes it is a hard call.  There are plenty of new features going into 
PECL extensions that work fine with PHP 4.3.  So if ext/snmp had been moved 
to PECL these commits would have been fine?

Well, PECL gives the author far greater freedom relating to the release 
cycle and it is up to the author(s) of an extension to decide when to make a 
release and how to classify it (stable, beta, etc...). So, to answer your 
question, had snmp been in PECL the commits would've been fine.
Let's just move ext/snmp to PECL then and let Harrie and others develop this 
at their pace.
From HEAD only or branches too? :)
--Jani
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php


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

2005-03-17 Thread Rob Richards
rrichards   Thu Mar 17 07:37:19 2005 EDT

  Modified files:  
/php-src/ext/standard   dl.h 
  Log:
  export php_dl to fix windows cli build
  
http://cvs.php.net/diff.php/php-src/ext/standard/dl.h?r1=1.19r2=1.20ty=u
Index: php-src/ext/standard/dl.h
diff -u php-src/ext/standard/dl.h:1.19 php-src/ext/standard/dl.h:1.20
--- php-src/ext/standard/dl.h:1.19  Thu Jan  8 12:32:51 2004
+++ php-src/ext/standard/dl.h   Thu Mar 17 07:37:18 2005
@@ -18,12 +18,12 @@
+--+
 */
 
-/* $Id: dl.h,v 1.19 2004/01/08 17:32:51 sniper Exp $ */
+/* $Id: dl.h,v 1.20 2005/03/17 12:37:18 rrichards Exp $ */
 
 #ifndef DL_H
 #define DL_H
 
-void php_dl(pval *file,int type,pval *return_value TSRMLS_DC);
+PHPAPI void php_dl(pval *file,int type,pval *return_value TSRMLS_DC);
 
 
 /* dynamic loading functions */

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



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

2005-03-17 Thread Zeev Suraski
zeevThu Mar 17 08:11:38 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-srcNEWS configure.in 
/php-src/main   php_version.h 
  Log:
  RC1 - RC2-dev
  
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.290r2=1.1760.2.291ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.290 php-src/NEWS:1.1760.2.291
--- php-src/NEWS:1.1760.2.290   Wed Mar 16 15:31:00 2005
+++ php-src/NEWSThu Mar 17 08:11:33 2005
@@ -1,6 +1,6 @@
 PHPNEWS
 |||
-13 Mar 2005, PHP 5.0.4RC1
+?? ??? 2005, PHP 5.0.4
 - Added Oracle Instant Client support. (cjbj at hotmail dot com, Tony)
 - Added length and charsetnr for field array and object in mysqli. (Georg)
 - Added checks for negative values to gmp_sqrt(), gmp_powm(), gmp_sqrtrem()
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.514.2.42r2=1.514.2.43ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.514.2.42 php-src/configure.in:1.514.2.43
--- php-src/configure.in:1.514.2.42 Thu Mar 17 03:12:14 2005
+++ php-src/configure.inThu Mar 17 08:11:36 2005
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.514.2.42 2005/03/17 08:12:14 sniper Exp $ -*- sh 
-*-
+dnl ## $Id: configure.in,v 1.514.2.43 2005/03/17 13:11:36 zeev Exp $ -*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -41,7 +41,7 @@
 MAJOR_VERSION=5
 MINOR_VERSION=0
 RELEASE_VERSION=4
-EXTRA_VERSION=RC1
+EXTRA_VERSION=RC2-dev
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION
 
 dnl Define where extension directories are located in the configure context
http://cvs.php.net/diff.php/php-src/main/php_version.h?r1=1.97.2.18r2=1.97.2.19ty=u
Index: php-src/main/php_version.h
diff -u php-src/main/php_version.h:1.97.2.18 
php-src/main/php_version.h:1.97.2.19
--- php-src/main/php_version.h:1.97.2.18Sun Mar 13 14:57:05 2005
+++ php-src/main/php_version.h  Thu Mar 17 08:11:38 2005
@@ -3,5 +3,5 @@
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 0
 #define PHP_RELEASE_VERSION 4
-#define PHP_EXTRA_VERSION RC1
-#define PHP_VERSION 5.0.4RC1
+#define PHP_EXTRA_VERSION RC2-dev
+#define PHP_VERSION 5.0.4RC2-dev

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



[PHP-CVS] cvs: php-src(PHP_4_3) /ext/domxml php_domxml.c

2005-03-17 Thread Rob Richards
rrichards   Thu Mar 17 08:11:48 2005 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/domxml php_domxml.c 
  Log:
  Fixed bug #32340 (insert_before($node,NULL) does not return)
  
http://cvs.php.net/diff.php/php-src/ext/domxml/php_domxml.c?r1=1.218.2.49r2=1.218.2.50ty=u
Index: php-src/ext/domxml/php_domxml.c
diff -u php-src/ext/domxml/php_domxml.c:1.218.2.49 
php-src/ext/domxml/php_domxml.c:1.218.2.50
--- php-src/ext/domxml/php_domxml.c:1.218.2.49  Fri Feb 25 17:13:08 2005
+++ php-src/ext/domxml/php_domxml.c Thu Mar 17 08:11:47 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_domxml.c,v 1.218.2.49 2005/02/25 22:13:08 rrichards Exp $ */
+/* $Id: php_domxml.c,v 1.218.2.50 2005/03/17 13:11:47 rrichards Exp $ */
 
 /* TODO
  * - Support Notation Nodes
@@ -2612,10 +2612,7 @@
if (new_child == NULL)
new_child = xmlAddPrevSibling(refp, child);
} else {
-   /* first unlink node, if child is already a child of parent
-   for some strange reason, this is needed
-*/
-   if (child-parent == parent){
+   if (child-parent != NULL){
xmlUnlinkNode(child);
}
new_child = xmlAddChild(parent, child);

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



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

2005-03-17 Thread Rob Richards
rrichards   Thu Mar 17 08:13:09 2005 EDT

  Modified files:  (Branch: PHP_4_3)
/php-srcNEWS 
  Log:
  BFN
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.857r2=1.1247.2.858ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.857 php-src/NEWS:1.1247.2.858
--- php-src/NEWS:1.1247.2.857   Mon Mar 14 16:11:44 2005
+++ php-src/NEWSThu Mar 17 08:13:08 2005
@@ -6,6 +6,7 @@
   and gmp_fact() to prevent SIGFPE. (Tony)
 - Changed phpize not to require libtool. (Jani)
 - Updated bundled libmbfl library (used for multibyte functions). (Moriyoshi)
+- Fixed bug #32340 (insert_before($node,NULL) does not return). (Rob) 
 - Fixed bug #32114 (DOM crashing when attribute appended to Document). (Rob)
   Fixed bugs:
   . Bug #32063 (mb_convert_encoding ignores named entity 'alpha')

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



[PHP-CVS] cvs: php-src /sapi/cli php_cli.c

2005-03-17 Thread Jani Taskinen
sniper  Thu Mar 17 08:43:33 2005 EDT

  Modified files:  
/php-src/sapi/cli   php_cli.c 
  Log:
  - Made CLI option -d output error and exit if an non-existing (or 
unmodifyable) entry is passed
  
http://cvs.php.net/diff.php/php-src/sapi/cli/php_cli.c?r1=1.119r2=1.120ty=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.119 php-src/sapi/cli/php_cli.c:1.120
--- php-src/sapi/cli/php_cli.c:1.119Thu Mar 17 02:31:22 2005
+++ php-src/sapi/cli/php_cli.c  Thu Mar 17 08:43:32 2005
@@ -19,7 +19,7 @@
+--+
 */
 
-/* $Id: php_cli.c,v 1.119 2005/03/17 07:31:22 derick Exp $ */
+/* $Id: php_cli.c,v 1.120 2005/03/17 13:43:32 sniper Exp $ */
 
 #include php.h
 #include php_globals.h
@@ -395,7 +395,7 @@
 }
 /* }}} */
 
-static void define_command_line_ini_entry(char *arg TSRMLS_DC)
+static int define_command_line_ini_entry(char *arg TSRMLS_DC)
 {
char *name, *value;
 
@@ -413,8 +413,9 @@
ZVAL_STRING(extension, value, 0);
php_dl(extension, MODULE_PERSISTENT, zval TSRMLS_CC);
} else {
-   zend_alter_ini_entry(name, strlen(name)+1, value, 
strlen(value), PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE);
+   return zend_alter_ini_entry(name, strlen(name)+1, value, 
strlen(value), PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE);
}
+   return SUCCESS;
 }
 
 
@@ -661,7 +662,10 @@
switch (c) {
 
case 'd': /* define ini entries on command line */
-   define_command_line_ini_entry(php_optarg 
TSRMLS_CC);
+   if (define_command_line_ini_entry(php_optarg 
TSRMLS_CC) == FAILURE) {
+   zend_printf(Invalid php.ini entry 
'%s'.\n, php_optarg);
+   goto err;
+   }
break;
 
case 'h': /* help  quit */

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



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

2005-03-17 Thread Rasmus Lerdorf
rasmus  Thu Mar 17 11:26:24 2005 EDT

  Modified files:  
/php-src/main/streams   cast.c 
  Log:
  Silence a warning here on systems where off_t is a long long.  
  
  
http://cvs.php.net/diff.php/php-src/main/streams/cast.c?r1=1.10r2=1.11ty=u
Index: php-src/main/streams/cast.c
diff -u php-src/main/streams/cast.c:1.10 php-src/main/streams/cast.c:1.11
--- php-src/main/streams/cast.c:1.10Thu Jan  8 03:17:58 2004
+++ php-src/main/streams/cast.c Thu Mar 17 11:26:24 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: cast.c,v 1.10 2004/01/08 08:17:58 andi Exp $ */
+/* $Id: cast.c,v 1.11 2005/03/17 16:26:24 rasmus Exp $ */
 
 #define _GNU_SOURCE
 #include php.h
@@ -267,7 +267,7 @@

php_error_docref(NULL TSRMLS_CC, E_WARNING,
%ld bytes of buffered data lost during stream 
conversion!,
-   stream-writepos - stream-readpos);
+   (long)(stream-writepos - stream-readpos));
}

if (castas == PHP_STREAM_AS_STDIO  ret)

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



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

2005-03-17 Thread Ilia Alshanetsky
iliaa   Thu Mar 17 12:16:44 2005 EDT

  Modified files:  
/php-src/ext/ftpftp.c 
  Log:
  Fixed compiler warning on win32.
  
  
http://cvs.php.net/diff.php/php-src/ext/ftp/ftp.c?r1=1.109r2=1.110ty=u
Index: php-src/ext/ftp/ftp.c
diff -u php-src/ext/ftp/ftp.c:1.109 php-src/ext/ftp/ftp.c:1.110
--- php-src/ext/ftp/ftp.c:1.109 Thu Mar 10 18:37:45 2005
+++ php-src/ext/ftp/ftp.c   Thu Mar 17 12:16:43 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: ftp.c,v 1.109 2005/03/10 23:37:45 iliaa Exp $ */
+/* $Id: ftp.c,v 1.110 2005/03/17 17:16:43 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -838,7 +838,9 @@
}
 
if (type == FTPTYPE_ASCII) {
+#ifndef PHP_WIN32
char *s;
+#endif
char *ptr = data-buf;
char *e = ptr + rcvd;
/* logic depends on the OS EOL

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



[PHP-CVS] cvs: php-src(PHP_5_0) /ext/ftp ftp.c

2005-03-17 Thread Ilia Alshanetsky
iliaa   Thu Mar 17 12:16:49 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/ftpftp.c 
  Log:
  MFH: Fixed compiler warning on win32.
  
  
http://cvs.php.net/diff.php/php-src/ext/ftp/ftp.c?r1=1.103.2.6r2=1.103.2.7ty=u
Index: php-src/ext/ftp/ftp.c
diff -u php-src/ext/ftp/ftp.c:1.103.2.6 php-src/ext/ftp/ftp.c:1.103.2.7
--- php-src/ext/ftp/ftp.c:1.103.2.6 Thu Mar 10 18:38:02 2005
+++ php-src/ext/ftp/ftp.c   Thu Mar 17 12:16:49 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: ftp.c,v 1.103.2.6 2005/03/10 23:38:02 iliaa Exp $ */
+/* $Id: ftp.c,v 1.103.2.7 2005/03/17 17:16:49 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -838,7 +838,9 @@
}
 
if (type == FTPTYPE_ASCII) {
+#ifndef PHP_WIN32
char *s;
+#endif
char *ptr = data-buf;
char *e = ptr + rcvd;
/* logic depends on the OS EOL

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



[PHP-CVS] cvs: php-src(PHP_4_3) /ext/ftp ftp.c

2005-03-17 Thread Ilia Alshanetsky
iliaa   Thu Mar 17 12:16:53 2005 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/ftpftp.c 
  Log:
  MFH: Fixed compiler warning on win32.
  
  
http://cvs.php.net/diff.php/php-src/ext/ftp/ftp.c?r1=1.68.2.21r2=1.68.2.22ty=u
Index: php-src/ext/ftp/ftp.c
diff -u php-src/ext/ftp/ftp.c:1.68.2.21 php-src/ext/ftp/ftp.c:1.68.2.22
--- php-src/ext/ftp/ftp.c:1.68.2.21 Thu Mar 10 18:38:18 2005
+++ php-src/ext/ftp/ftp.c   Thu Mar 17 12:16:53 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: ftp.c,v 1.68.2.21 2005/03/10 23:38:18 iliaa Exp $ */
+/* $Id: ftp.c,v 1.68.2.22 2005/03/17 17:16:53 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -705,7 +705,9 @@
}
 
if (type == FTPTYPE_ASCII) {
+#ifndef PHP_WIN32
char *s;
+#endif
char *ptr = data-buf;
char *e = ptr + rcvd;
/* logic depends on the OS EOL

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



[PHP-CVS] cvs: php-src(PHP_5_0) /ext/exif exif.c

2005-03-17 Thread Ilia Alshanetsky
iliaa   Thu Mar 17 12:20:36 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/exif   exif.c 
  Log:
  Fixed build of exif extension on win32.
  
  
http://cvs.php.net/diff.php/php-src/ext/exif/exif.c?r1=1.162.2.7r2=1.162.2.8ty=u
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.162.2.7 php-src/ext/exif/exif.c:1.162.2.8
--- php-src/ext/exif/exif.c:1.162.2.7   Wed Mar  2 13:22:40 2005
+++ php-src/ext/exif/exif.c Thu Mar 17 12:20:35 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: exif.c,v 1.162.2.7 2005/03/02 18:22:40 sesser Exp $ */
+/* $Id: exif.c,v 1.162.2.8 2005/03/17 17:20:35 iliaa Exp $ */
 
 /*  ToDos
  *
@@ -76,6 +76,9 @@
 #include ext/mbstring/mbstring.h
 #endif
 
+/* needed for ssize_t definition */
+#include sys/types.h
+
 typedef unsigned char uchar;
 
 #ifndef safe_emalloc
@@ -112,7 +115,7 @@
 };
 /* }}} */
 
-#define EXIF_VERSION 1.4 $Id: exif.c,v 1.162.2.7 2005/03/02 18:22:40 sesser 
Exp $
+#define EXIF_VERSION 1.4 $Id: exif.c,v 1.162.2.8 2005/03/17 17:20:35 iliaa 
Exp $
 
 /* {{{ PHP_MINFO_FUNCTION
  */

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



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

2005-03-17 Thread Ilia Alshanetsky
iliaa   Thu Mar 17 12:20:52 2005 EDT

  Modified files:  
/php-src/ext/exif   exif.c 
  Log:
  MFB: Fixed build of exif extension on win32.
  
  
http://cvs.php.net/diff.php/php-src/ext/exif/exif.c?r1=1.170r2=1.171ty=u
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.170 php-src/ext/exif/exif.c:1.171
--- php-src/ext/exif/exif.c:1.170   Wed Mar  2 13:21:45 2005
+++ php-src/ext/exif/exif.c Thu Mar 17 12:20:52 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: exif.c,v 1.170 2005/03/02 18:21:45 sesser Exp $ */
+/* $Id: exif.c,v 1.171 2005/03/17 17:20:52 iliaa Exp $ */
 
 /*  ToDos
  *
@@ -76,6 +76,9 @@
 #include ext/mbstring/mbstring.h
 #endif
 
+/* needed for ssize_t definition */
+#include sys/types.h
+
 typedef unsigned char uchar;
 
 #ifndef safe_emalloc
@@ -112,7 +115,7 @@
 };
 /* }}} */
 
-#define EXIF_VERSION 1.4 $Id: exif.c,v 1.170 2005/03/02 18:21:45 sesser Exp $
+#define EXIF_VERSION 1.4 $Id: exif.c,v 1.171 2005/03/17 17:20:52 iliaa Exp $
 
 /* {{{ PHP_MINFO_FUNCTION
  */

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



[PHP-CVS] cvs: php-src(PHP_4_3) /ext/exif exif.c

2005-03-17 Thread Ilia Alshanetsky
iliaa   Thu Mar 17 12:21:03 2005 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/exif   exif.c 
  Log:
  MFH: Fixed build of exif extension on win32.
  
  
http://cvs.php.net/diff.php/php-src/ext/exif/exif.c?r1=1.118.2.35r2=1.118.2.36ty=u
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.118.2.35 php-src/ext/exif/exif.c:1.118.2.36
--- php-src/ext/exif/exif.c:1.118.2.35  Sat Mar  5 13:30:47 2005
+++ php-src/ext/exif/exif.c Thu Mar 17 12:21:02 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: exif.c,v 1.118.2.35 2005/03/05 18:30:47 rasmus Exp $ */
+/* $Id: exif.c,v 1.118.2.36 2005/03/17 17:21:02 iliaa Exp $ */
 
 /*  ToDos
  *
@@ -68,6 +68,9 @@
 #include ext/mbstring/mbstring.h
 #endif
 
+/* needed for ssize_t definition */
+#include sys/types.h
+
 typedef unsigned char uchar;
 
 #ifndef safe_emalloc
@@ -101,7 +104,7 @@
 };
 /* }}} */
 
-#define EXIF_VERSION 1.4 $Id: exif.c,v 1.118.2.35 2005/03/05 18:30:47 rasmus 
Exp $
+#define EXIF_VERSION 1.4 $Id: exif.c,v 1.118.2.36 2005/03/17 17:21:02 iliaa 
Exp $
 
 /* {{{ PHP_MINFO_FUNCTION
  */

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



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

2005-03-17 Thread Antony Dovgal
tony2001Thu Mar 17 13:12:30 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/mysqli mysqli_api.c 
  Log:
  MFH: typofix
  
  
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_api.c?r1=1.87.2.11r2=1.87.2.12ty=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.87.2.11 
php-src/ext/mysqli/mysqli_api.c:1.87.2.12
--- php-src/ext/mysqli/mysqli_api.c:1.87.2.11   Fri Jan 28 12:37:42 2005
+++ php-src/ext/mysqli/mysqli_api.c Thu Mar 17 13:12:30 2005
@@ -15,7 +15,7 @@
   | Author: Georg Richter [EMAIL PROTECTED]|
   +--+
 
-  $Id: mysqli_api.c,v 1.87.2.11 2005/01/28 17:37:42 georg Exp $ 
+  $Id: mysqli_api.c,v 1.87.2.12 2005/03/17 18:12:30 tony2001 Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -245,7 +245,7 @@
var_cnt = argc - start;
 
if (var_cnt != mysql_stmt_field_count(stmt-stmt)) {
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, Number of bind 
variables doesn't match number of fields in prepared statmement.);
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Number of bind 
variables doesn't match number of fields in prepared statement.);
efree(args);
RETURN_FALSE;
}

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



[PHP-CVS] cvs: php-src(PHP_5_0) /ext/snmp php_snmp.h snmp.c

2005-03-17 Thread Harrie Hazewinkel
harrie  Thu Mar 17 14:47:49 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/snmp   php_snmp.h snmp.c 
  Log:
  Adding SNMPV2 functions for data retrieval.
  
  
http://cvs.php.net/diff.php/php-src/ext/snmp/php_snmp.h?r1=1.22.2.1r2=1.22.2.2ty=u
Index: php-src/ext/snmp/php_snmp.h
diff -u php-src/ext/snmp/php_snmp.h:1.22.2.1 
php-src/ext/snmp/php_snmp.h:1.22.2.2
--- php-src/ext/snmp/php_snmp.h:1.22.2.1Sat Jan  8 07:02:39 2005
+++ php-src/ext/snmp/php_snmp.h Thu Mar 17 14:47:48 2005
@@ -20,7 +20,7 @@
   +--+
 */
 
-/* $Id: php_snmp.h,v 1.22.2.1 2005/01/08 12:02:39 sniper Exp $ */
+/* $Id: php_snmp.h,v 1.22.2.2 2005/03/17 19:47:48 harrie Exp $ */
 
 #ifndef PHP_SNMP_H
 #define PHP_SNMP_H
@@ -52,6 +52,12 @@
 PHP_FUNCTION(snmp_set_oid_numeric_print);
 PHP_FUNCTION(snmpset);
 
+PHP_FUNCTION(snmp2_get);
+PHP_FUNCTION(snmp2_getnext);
+PHP_FUNCTION(snmp2_walk);
+PHP_FUNCTION(snmp2_real_walk);
+PHP_FUNCTION(snmp2_set);
+
 PHP_FUNCTION(snmp3_get);
 PHP_FUNCTION(snmp3_getnext);
 PHP_FUNCTION(snmp3_walk);
http://cvs.php.net/diff.php/php-src/ext/snmp/snmp.c?r1=1.92.2.4r2=1.92.2.5ty=u
Index: php-src/ext/snmp/snmp.c
diff -u php-src/ext/snmp/snmp.c:1.92.2.4 php-src/ext/snmp/snmp.c:1.92.2.5
--- php-src/ext/snmp/snmp.c:1.92.2.4Sat Feb 12 13:30:26 2005
+++ php-src/ext/snmp/snmp.c Thu Mar 17 14:47:48 2005
@@ -20,7 +20,7 @@
+--+
  */
 
-/* $Id: snmp.c,v 1.92.2.4 2005/02/12 18:30:26 sniper Exp $ */
+/* $Id: snmp.c,v 1.92.2.5 2005/03/17 19:47:48 harrie Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -133,6 +133,12 @@
 #endif
PHP_FE(snmpset, NULL)
 
+   PHP_FE(snmp2_get, NULL)
+   PHP_FE(snmp2_getnext, NULL)
+   PHP_FE(snmp2_walk, NULL)
+   PHP_FE(snmp2_real_walk, NULL)
+   PHP_FE(snmp2_set, NULL)
+
PHP_FE(snmp3_get, NULL)
PHP_FE(snmp3_getnext, NULL)
PHP_FE(snmp3_walk, NULL)
@@ -324,7 +330,7 @@
 
 /* {{{ php_snmp_internal
 *
-* Generic SNMP object fetcher (for both v3 and v1)
+* Generic SNMP object fetcher (for all SNMP versions)
 *
 * st=1   snmpget()  - query an agent and return a single value.
 * st=2   snmpget()  - query an agent and return the next single value.
@@ -524,7 +530,7 @@
 
 /* {{{ php_snmp
 *
-* Generic SNMPv1 handler
+* Generic community based SNMP handler for version 1 and 2.
 * This function makes use of the internal SNMP object fetcher.
 * The object fetcher is shared with SNMPv3.
 *
@@ -538,7 +544,7 @@
 * st=11  snmpset() - query an agent and set a single value
 *
 */
-static void php_snmp(INTERNAL_FUNCTION_PARAMETERS, int st) 
+static void php_snmp(INTERNAL_FUNCTION_PARAMETERS, int st, int version) 
 {
zval **a1, **a2, **a3, **a4, **a5, **a6, **a7;
struct snmp_session session;
@@ -600,7 +606,7 @@
 
session.peername = hostname;
session.remote_port = remote_port;
-   session.version = SNMP_VERSION_1;
+   session.version = version;
/*
* FIXME: potential memory leak
* This is a workaround for an artifact (Mike Slifcak)
@@ -626,7 +632,7 @@
Fetch a SNMP object */
 PHP_FUNCTION(snmpget)
 {
-   php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU,1);
+   php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU,1, SNMP_VERSION_1);
 }
 /* }}} */
 
@@ -634,7 +640,7 @@
Fetch a SNMP object */
 PHP_FUNCTION(snmpgetnext)
 {
-   php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU,2);
+   php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU,2, SNMP_VERSION_1);
 }
 /* }}} */
 
@@ -642,7 +648,7 @@
Return all objects under the specified object id */
 PHP_FUNCTION(snmpwalk)
 {
-   php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU,3);
+   php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU,3, SNMP_VERSION_1);
 }
 /* }}} */
 
@@ -650,7 +656,7 @@
Return all objects including their respective object id withing the 
specified one */
 PHP_FUNCTION(snmprealwalk)
 {
-   php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU,4);
+   php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU,4, SNMP_VERSION_1);
 }
 /* }}} */
 
@@ -728,7 +734,7 @@
Set the value of a SNMP object */
 PHP_FUNCTION(snmpset)
 {
-   php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU,11);
+   php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU,11, SNMP_VERSION_1);
 }
 /* }}} */
 
@@ -810,6 +816,9 @@
 * symbol on purpose, as it's defined to be the same as the former.
 */
|| !strcasecmp(prot, AES)) {
+   s-securityPrivProto = usmAES128PrivProtocol;
+   s-securityPrivProtoLen = 
OIDSIZE(usmAES128PrivProtocol);
+   return (0);
 #else  
) {
s-securityPrivProto = usmAES128PrivProtocol;
@@ -894,6 +903,45 @@
 }
 /* }}} */
 
+/* {{{ proto string snmp2_get(string host, string community, string object_id 
[, int timeout [, int retries]]) 
+   Fetch a SNMP object */

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

2005-03-17 Thread Harrie Hazewinkel
harrie  Thu Mar 17 15:51:11 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-srcNEWS 
  Log:
  Added SNMPv2 support.
  
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.291r2=1.1760.2.292ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.291 php-src/NEWS:1.1760.2.292
--- php-src/NEWS:1.1760.2.291   Thu Mar 17 08:11:33 2005
+++ php-src/NEWSThu Mar 17 15:51:01 2005
@@ -1,6 +1,7 @@
 PHPNEWS
 |||
 ?? ??? 2005, PHP 5.0.4
+- Added SNMPv2 support. (harrie)
 - Added Oracle Instant Client support. (cjbj at hotmail dot com, Tony)
 - Added length and charsetnr for field array and object in mysqli. (Georg)
 - Added checks for negative values to gmp_sqrt(), gmp_powm(), gmp_sqrtrem()

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



[PHP-CVS] cvs: php-src(PHP_4_3) /ext/mbstring mbstring.dsp

2005-03-17 Thread Moriyoshi Koizumi
moriyoshi   Thu Mar 17 19:49:33 2005 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/mbstring   mbstring.dsp 
  Log:
  - Add missing entries.
  
  
http://cvs.php.net/diff.php/php-src/ext/mbstring/mbstring.dsp?r1=1.12.2.5r2=1.12.2.6ty=u
Index: php-src/ext/mbstring/mbstring.dsp
diff -u php-src/ext/mbstring/mbstring.dsp:1.12.2.5 
php-src/ext/mbstring/mbstring.dsp:1.12.2.6
--- php-src/ext/mbstring/mbstring.dsp:1.12.2.5  Wed Dec 10 12:26:24 2003
+++ php-src/ext/mbstring/mbstring.dsp   Thu Mar 17 19:49:32 2005
@@ -243,6 +243,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=.\libmbfl\filters\mbfilter_iso8859_16.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\libmbfl\filters\mbfilter_iso8859_2.c
 # End Source File
 # Begin Source File
@@ -756,6 +760,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=.\libmbfl\filters\unicode_table_iso8859_16.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\libmbfl\filters\unicode_table_iso8859_2.h
 # End Source File
 # Begin Source File

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



[PHP-CVS] cvs: php-src /pear go-pear-list.php

2005-03-17 Thread Greg Beaver
cellog  Thu Mar 17 20:55:11 2005 EDT

  Modified files:  
/php-src/pear   go-pear-list.php 
  Log:
  update to Archive_Tar 1.3.1
  
http://cvs.php.net/diff.php/php-src/pear/go-pear-list.php?r1=1.12r2=1.13ty=u
Index: php-src/pear/go-pear-list.php
diff -u php-src/pear/go-pear-list.php:1.12 php-src/pear/go-pear-list.php:1.13
--- php-src/pear/go-pear-list.php:1.12  Mon Mar 14 18:57:07 2005
+++ php-src/pear/go-pear-list.php   Thu Mar 17 20:55:10 2005
@@ -3,14 +3,14 @@
  * that will be used to create the PEAR folder
  * in the windows snapshot.
  * See win32/build/mkdist.php for more details
- * $Id: go-pear-list.php,v 1.12 2005/03/14 23:57:07 cellog Exp $
+ * $Id: go-pear-list.php,v 1.13 2005/03/18 01:55:10 cellog Exp $
  */
 $packages  = array(
 // required packages for the installer
 PEAR  =1.3.5,
 XML_RPC   =1.2.2,
 Console_Getopt=1.2,
-Archive_Tar   =1.3.0,
+Archive_Tar   =1.3.1,
 
 // required packages for the web frontend
 PEAR_Frontend_Web =0.4,

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



[PHP-CVS] cvs: php-src(PHP_4_3) /pear go-pear-list.php

2005-03-17 Thread Greg Beaver
cellog  Thu Mar 17 20:58:20 2005 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/pear   go-pear-list.php 
  Log:
  update to Archive_Tar 1.3.1
  
http://cvs.php.net/diff.php/php-src/pear/go-pear-list.php?r1=1.12.2.2r2=1.12.2.3ty=u
Index: php-src/pear/go-pear-list.php
diff -u php-src/pear/go-pear-list.php:1.12.2.2 
php-src/pear/go-pear-list.php:1.12.2.3
--- php-src/pear/go-pear-list.php:1.12.2.2  Mon Mar 14 19:11:47 2005
+++ php-src/pear/go-pear-list.php   Thu Mar 17 20:58:20 2005
@@ -3,14 +3,14 @@
  * that will be used to create the PEAR folder
  * in the windows snapshot.
  * See win32/build/mkdist.php for more details
- * $Id: go-pear-list.php,v 1.12.2.2 2005/03/15 00:11:47 cellog Exp $
+ * $Id: go-pear-list.php,v 1.12.2.3 2005/03/18 01:58:20 cellog Exp $
  */
 $packages  = array(
 // required packages for the installer
 PEAR  =1.3.5,
 XML_RPC   =1.2.2,
 Console_Getopt=1.2,
-Archive_Tar   =1.3.0,
+Archive_Tar   =1.3.1,
 
 // required packages for the web frontend
 PEAR_Frontend_Web =0.4,

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



[PHP-CVS] cvs: php-src(PHP_5_0) /pear go-pear-list.php

2005-03-17 Thread Greg Beaver
cellog  Thu Mar 17 20:59:01 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/pear   go-pear-list.php 
  Log:
  update to newest packages
  
http://cvs.php.net/diff.php/php-src/pear/go-pear-list.php?r1=1.9.2.3r2=1.9.2.4ty=u
Index: php-src/pear/go-pear-list.php
diff -u php-src/pear/go-pear-list.php:1.9.2.3 
php-src/pear/go-pear-list.php:1.9.2.4
--- php-src/pear/go-pear-list.php:1.9.2.3   Sun Feb 20 19:55:08 2005
+++ php-src/pear/go-pear-list.php   Thu Mar 17 20:59:00 2005
@@ -3,19 +3,19 @@
  * that will be used to create the PEAR folder
  * in the windows snapshot.
  * See win32/build/mkdist.php for more details
- * $Id: go-pear-list.php,v 1.9.2.3 2005/02/21 00:55:08 cellog Exp $
+ * $Id: go-pear-list.php,v 1.9.2.4 2005/03/18 01:59:00 cellog Exp $
  */
 $packages  = array(
 // required packages for the installer
 PEAR  =1.3.5,
-XML_RPC   =1.1.0,
+XML_RPC   =1.2.2,
 Console_Getopt=1.2,
-Archive_Tar   =1.2,
+Archive_Tar   =1.3.1,
 
 // required packages for the web frontend
 PEAR_Frontend_Web =0.4,
 HTML_Template_IT  =1.1,
-Net_UserAgent_Detect  =1.0,
+Net_UserAgent_Detect  =2.0.1,
 );
 
 ?

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



[PHP-CVS] cvs: CVSROOT / avail

2005-03-17 Thread Zeev Suraski
zeevFri Mar 18 02:27:01 2005 EDT

  Modified files:  
/CVSROOTavail 
  Log:
  PostgreSQL karma for Chrisopher
  
  
http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.954r2=1.955ty=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.954 CVSROOT/avail:1.955
--- CVSROOT/avail:1.954 Mon Mar 14 15:14:49 2005
+++ CVSROOT/avail   Fri Mar 18 02:27:00 2005
@@ -169,7 +169,7 @@
 avail|nmav|php-src/ext/ovrimos
 avail|steinm,uw|php-src/ext/pdf
 avail|jdonagher,david|php-src/ext/pfpro
-avail|jah|php-src/ext/pgsql
+avail|jah,chriskl|php-src/ext/pgsql
 avail|ostborn|php-src/ext/phpdoc,pecl/phpdoc,pecl/soap,pear/Image_GIS
 avail|clay|pear/VersionControl
 avail|mfonda|pear/Crypt_HMAC

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