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

2005-03-24 Thread changelog 
changelog   Thu Mar 24 20:33:53 2005 EDT

  Modified files:  
/php-srcChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/diff.php/php-src/ChangeLog?r1=1.1932r2=1.1933ty=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.1932 php-src/ChangeLog:1.1933
--- php-src/ChangeLog:1.1932Wed Mar 23 20:35:46 2005
+++ php-src/ChangeLog   Thu Mar 24 20:33:51 2005
@@ -1,3 +1,39 @@
+2005-03-24  Marcus Boerger  [EMAIL PROTECTED]
+
+* ZendEngine2/zend_vm_execute.h:
+  - Second part of removing temp solution
+
+* ZendEngine2/zend_vm_def.h:
+  - Remove potential bad solution for now
+
+2005-03-24  Jani Taskinen  [EMAIL PROTECTED]
+
+* scripts/Makefile.frag:
+  Remove: Has not existed for ages..
+
+2005-03-24  Zeev Suraski  [EMAIL PROTECTED]
+
+* (PHP_5_0)
+  NEWS
+  configure.in
+  main/php_version.h:
+  Roll RC2
+
+2005-03-24  Andi Gutmans  [EMAIL PROTECTED]
+
+* main/main.c
+  main/main.c:
+  - Fix typos
+
+2005-03-24  Antony Dovgal  [EMAIL PROTECTED]
+
+* (PHP_5_0)
+  ext/session/session.c:
+  MFH: fix leak when register_long_arrays is off
+
+* ext/session/session.c:
+  fix leak when register_long_arrays is off
+
 2005-03-23  Moriyoshi Koizumi  [EMAIL PROTECTED]
 
 * (PHP_4_3)
@@ -2505,7 +2541,7 @@
   ext/session/mod_mm.h
   ext/session/mod_user.h
   ext/session/php_session.h:
-  - Missing $Id: ChangeLog,v 1.1932 2005/03/24 01:35:46 changelog Exp $ 
tags
+  - Missing $Id: ChangeLog,v 1.1933 2005/03/25 01:33:51 changelog Exp $ 
tags
 
 * (PHP_4_3)
   ext/session/session.c:
@@ -2986,7 +3022,7 @@
 
 * (PHP_4_3)
   Zend/zend_ini_scanner.l:
-  Missing $Id: ChangeLog,v 1.1932 2005/03/24 01:35:46 changelog Exp $ tag 
+ ws fix
+  Missing $Id: ChangeLog,v 1.1933 2005/03/25 01:33:51 changelog Exp $ tag 
+ ws fix
 
 * ZendEngine2/zend_ini_scanner.l
   ZendEngine2/zend_ini_scanner.l:
@@ -4460,7 +4496,7 @@
   ext/standard/url_scanner_ex.c
   ext/standard/url_scanner_ex.h
   ext/standard/url_scanner_ex.re:
-  Missing $Id: ChangeLog,v 1.1932 2005/03/24 01:35:46 changelog Exp $ tag
+  Missing $Id: ChangeLog,v 1.1933 2005/03/25 01:33:51 changelog Exp $ tag
 
 * ext/standard/credits_ext.h
   ext/standard/credits_sapi.h:

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

2005-03-24 Thread Zeev Suraski 
zeevThu Mar 24 03:23:37 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-srcNEWS configure.in 
/php-src/main   php_version.h 
  Log:
  Roll RC2
  
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.300r2=1.1760.2.301ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.300 php-src/NEWS:1.1760.2.301
--- php-src/NEWS:1.1760.2.300   Wed Mar 23 18:56:36 2005
+++ php-src/NEWSThu Mar 24 03:23:34 2005
@@ -1,6 +1,6 @@
 PHPNEWS
 |||
-?? ??? 2005, PHP 5.0.4
+24 Mar 2005, PHP 5.0.4RC2
 - 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)
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.514.2.43r2=1.514.2.44ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.514.2.43 php-src/configure.in:1.514.2.44
--- php-src/configure.in:1.514.2.43 Thu Mar 17 08:11:36 2005
+++ php-src/configure.inThu Mar 24 03:23:34 2005
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.514.2.43 2005/03/17 13:11:36 zeev Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.514.2.44 2005/03/24 08:23:34 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=RC2-dev
+EXTRA_VERSION=RC2
 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.19r2=1.97.2.20ty=u
Index: php-src/main/php_version.h
diff -u php-src/main/php_version.h:1.97.2.19 
php-src/main/php_version.h:1.97.2.20
--- php-src/main/php_version.h:1.97.2.19Thu Mar 17 08:11:38 2005
+++ php-src/main/php_version.h  Thu Mar 24 03:23:37 2005
@@ -3,5 +3,5 @@
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 0
 #define PHP_RELEASE_VERSION 4
-#define PHP_EXTRA_VERSION RC2-dev
-#define PHP_VERSION 5.0.4RC2-dev
+#define PHP_EXTRA_VERSION RC2
+#define PHP_VERSION 5.0.4RC2

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

[PHP-CVS] cvs: php-src /scripts Makefile.frag

2005-03-24 Thread Jani Taskinen 
sniper  Thu Mar 24 12:16:34 2005 EDT

  Modified files:  
/php-src/scriptsMakefile.frag 
  Log:
  Remove: Has not existed for ages..
  
http://cvs.php.net/diff.php/php-src/scripts/Makefile.frag?r1=1.16r2=1.17ty=u
Index: php-src/scripts/Makefile.frag
diff -u php-src/scripts/Makefile.frag:1.16 php-src/scripts/Makefile.frag:1.17
--- php-src/scripts/Makefile.frag:1.16  Tue Mar  1 04:25:36 2005
+++ php-src/scripts/Makefile.frag   Thu Mar 24 12:16:34 2005
@@ -44,7 +44,6 @@
ext/session/ \
ext/dom/xml_common.h \
ext/xml/ \
-   ext/xml/expat/ \
ext/mbstring/ \
ext/mbstring/libmbfl/ \
ext/mbstring/libmbfl/mbfl/ \

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

Re: [PHP-CVS] cvs: php-src /main php.h

2005-03-24 Thread Andrei Zmievski 
On Mon, 21 Mar 2005, Jani Taskinen wrote:
 On Mon, 21 Mar 2005, Andrei Zmievski wrote:
 
 andrei   Mon Mar 21 01:43:28 2005 EDT
 
  Modified files:
/php-src/main php.h
  Log:
  Define PHP_ABSTRACT_ME
 
 Why? Why not use the ZEND macros?

Well, why do we have existing PHP_* ones anyway?

- Andrei

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

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

2005-03-24 Thread Ilia Alshanetsky 
iliaa   Thu Mar 24 19:30:44 2005 EDT

  Modified files:  
/php-src/ext/pgsql  pgsql.c 
  Log:
  Slightly safer code.
  
  
http://cvs.php.net/diff.php/php-src/ext/pgsql/pgsql.c?r1=1.320r2=1.321ty=u
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.320 php-src/ext/pgsql/pgsql.c:1.321
--- php-src/ext/pgsql/pgsql.c:1.320 Tue Mar 22 03:51:21 2005
+++ php-src/ext/pgsql/pgsql.c   Thu Mar 24 19:30:43 2005
@@ -20,7 +20,7 @@
+--+
  */
  
-/* $Id: pgsql.c,v 1.320 2005/03/22 08:51:21 chriskl Exp $ */
+/* $Id: pgsql.c,v 1.321 2005/03/25 00:30:43 iliaa Exp $ */
 
 #include stdlib.h
 
@@ -5164,7 +5164,7 @@
smart_str_append_long(querystr, 
Z_LVAL_PP(val));
break;
case IS_DOUBLE:
-   smart_str_appendl(querystr, buf, sprintf(buf, 
%f, Z_DVAL_PP(val)));
+   smart_str_appendl(querystr, buf, snprintf(buf, 
sizeof(buf), %f, Z_DVAL_PP(val)));
break;
default:
/* should not happen */

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

[PHP-CVS] cvs: php-src / NEWS /ext/pgsql config.m4 config.w32 pgsql.c /ext/pgsql/tests 08escape.phpt 25async_query_params.phpt

2005-03-24 Thread Christopher Kings-Lynne 
chriskl Fri Mar 25 01:26:31 2005 EDT

  Modified files:  
/php-srcNEWS 
/php-src/ext/pgsql  config.m4 config.w32 pgsql.c 
/php-src/ext/pgsql/tests08escape.phpt 25async_query_params.phpt 
  Log:
  (PHP pg_unescape_bytea) Use libpq version of PQunescapeBytea if it exists.
  
  # The version in libpq is newer and faster than the one in PHP, but it is
  # necessary for me to add a string copy for freeing purposes.  This copy
  # is only needed in Windows AFAIK, how can I detect that?
  
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1858r2=1.1859ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1858 php-src/NEWS:1.1859
--- php-src/NEWS:1.1858 Tue Mar 22 19:37:34 2005
+++ php-src/NEWSFri Mar 25 01:26:30 2005
@@ -1,6 +1,8 @@
 PHPNEWS
 |||
 ?? ??? 2004, PHP 5.1.0
+- Changed pg_unescape_bytea() to use the libpq version of PQunescapeBytea if
+  it is available.
 - Moved extensions to PECL:
   . ext/cpdf(Tony, Derick)
   . ext/dio (Jani, Derick)
http://cvs.php.net/diff.php/php-src/ext/pgsql/config.m4?r1=1.41r2=1.42ty=u
Index: php-src/ext/pgsql/config.m4
diff -u php-src/ext/pgsql/config.m4:1.41 php-src/ext/pgsql/config.m4:1.42
--- php-src/ext/pgsql/config.m4:1.41Tue Mar 22 03:51:21 2005
+++ php-src/ext/pgsql/config.m4 Fri Mar 25 01:26:30 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.41 2005/03/22 08:51:21 chriskl Exp $
+dnl $Id: config.m4,v 1.42 2005/03/25 06:26:30 chriskl Exp $
 dnl
 
 AC_DEFUN([PHP_PGSQL_CHECK_FUNCTIONS],[
@@ -69,6 +69,7 @@
   old_LDFLAGS=$LDFLAGS
   LDFLAGS=$LDFLAGS -L$PGSQL_LIBDIR
   AC_CHECK_LIB(pq, PQescapeString,AC_DEFINE(HAVE_PQESCAPE,1,[PostgreSQL 7.2.0 
or later]))
+  AC_CHECK_LIB(pq, 
PQunescapeBytea,AC_DEFINE(HAVE_PQUNESCAPEBYTEA,1,[PostgreSQL 7.3.0 or later]))
   AC_CHECK_LIB(pq, 
PQsetnonblocking,AC_DEFINE(HAVE_PQSETNONBLOCKING,1,[PostgreSQL 7.0.x or later]))
   AC_CHECK_LIB(pq, PQcmdTuples,AC_DEFINE(HAVE_PQCMDTUPLES,1,[Broken libpq 
under windows]))
   AC_CHECK_LIB(pq, PQoidValue,AC_DEFINE(HAVE_PQOIDVALUE,1,[Older PostgreSQL]))
http://cvs.php.net/diff.php/php-src/ext/pgsql/config.w32?r1=1.5r2=1.6ty=u
Index: php-src/ext/pgsql/config.w32
diff -u php-src/ext/pgsql/config.w32:1.5 php-src/ext/pgsql/config.w32:1.6
--- php-src/ext/pgsql/config.w32:1.5Tue Mar 22 03:51:21 2005
+++ php-src/ext/pgsql/config.w32Fri Mar 25 01:26:30 2005
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.5 2005/03/22 08:51:21 chriskl Exp $
+// $Id: config.w32,v 1.6 2005/03/25 06:26:30 chriskl Exp $
 // vim:ft=javascript
 
 ARG_WITH(pgsql, PostgreSQL support, no);
@@ -8,7 +8,7 @@
CHECK_HEADER_ADD_INCLUDE(libpq-fe.h, CFLAGS_PGSQL, 
PHP_PHP_BUILD + \\include\\pgsql; + PHP_PGSQL)) {
EXTENSION(pgsql, pgsql.c);
AC_DEFINE('HAVE_PGSQL', 1, 'Have PostgreSQL library');
-   ADD_FLAG(CFLAGS_PGSQL, /D HAVE_PG_CONFIG_H /D PGSQL_EXPORTS 
/D HAVE_PQSETNONBLOCKING /D HAVE_PQCMDTUPLES /D HAVE_PQCLIENTENCODING /D 
HAVE_PQESCAPE /D HAVE_PQPARAMETERSTATUS /D HAVE_PGTRANSACTIONSTATUS /D 
HAVE_PQEXECPARAMS /D HAVE_PQPREPARE /D HAVE_PQEXECPREPARED /D 
HAVE_PQRESULTERRORFIELD /D HAVE_PQSENDQUERYPARAMS /D HAVE_PQSENDPREPARE /D 
HAVE_PQSENDQUERYPREPARED /D HAVE_PQPUTCOPYDATA /D HAVE_PQPUTCOPYEND /D 
HAVE_PQGETCOPYDATA /D HAVE_PQSETERRORVERBOSITY);
+   ADD_FLAG(CFLAGS_PGSQL, /D HAVE_PG_CONFIG_H /D PGSQL_EXPORTS 
/D HAVE_PQSETNONBLOCKING /D HAVE_PQCMDTUPLES /D HAVE_PQCLIENTENCODING /D 
HAVE_PQESCAPE /D HAVE_PQPARAMETERSTATUS /D HAVE_PGTRANSACTIONSTATUS /D 
HAVE_PQEXECPARAMS /D HAVE_PQPREPARE /D HAVE_PQEXECPREPARED /D 
HAVE_PQRESULTERRORFIELD /D HAVE_PQSENDQUERYPARAMS /D HAVE_PQSENDPREPARE /D 
HAVE_PQSENDQUERYPREPARED /D HAVE_PQPUTCOPYDATA /D HAVE_PQPUTCOPYEND /D 
HAVE_PQGETCOPYDATA /D HAVE_PQSETERRORVERBOSITY /D HAVE_PQUNESCAPEBYTEA);
} else {
WARNING(pgsql not enabled; libraries and headers not found);
}
http://cvs.php.net/diff.php/php-src/ext/pgsql/pgsql.c?r1=1.321r2=1.322ty=u
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.321 php-src/ext/pgsql/pgsql.c:1.322
--- php-src/ext/pgsql/pgsql.c:1.321 Thu Mar 24 19:30:43 2005
+++ php-src/ext/pgsql/pgsql.c   Fri Mar 25 01:26:30 2005
@@ -20,7 +20,7 @@
+--+
  */
  
-/* $Id: pgsql.c,v 1.321 2005/03/25 00:30:43 iliaa Exp $ */
+/* $Id: pgsql.c,v 1.322 2005/03/25 06:26:30 chriskl Exp $ */
 
 #include stdlib.h
 
@@ -3414,6 +3414,7 @@
 }
 /* }}} */
 
+#if !HAVE_PQUNESCAPEBYTEA
 /* PQunescapeBytea() from PostgreSQL 7.3 to provide bytea unescape feature to 
7.2 users.
Renamed to php_pgsql_unescape_bytea() */
 /*
@@ -3517,12 +3518,13 @@
*retbuflen = buflen;
return buffer;
 }
+#endif
 
 /* {{{ proto string pg_unescape_bytea(string data)
Unescape binary for bytea type  */