date:20040126

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

2004-01-26 Thread changelog

changelog   Mon Jan 26 20:32:24 2004 EDT

  Modified files:  
/php-srcChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/diff.php/php-src/ChangeLog?r1=1.1519r2=1.1520ty=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.1519 php-src/ChangeLog:1.1520
--- php-src/ChangeLog:1.1519Sun Jan 25 20:33:17 2004
+++ php-src/ChangeLog   Mon Jan 26 20:32:23 2004
@@ -1,3 +1,129 @@
+2004-01-26  Marcus Boerger  [EMAIL PROTECTED]
+
+* ZendEngine2/zend_interfaces.c
+  ZendEngine2/zend_interfaces.h:
+  - Export struct zend_user_iterator
+  - Ad 'it' to function prefix to prevent naming clashes
+  - Export zend_user_it_free_current
+
+* NEWS:
+  Fixed bug #27042 (SPL: SeekableIterator seek() broken).
+
+2004-01-26  Georg Richter  [EMAIL PROTECTED]
+
+* ext/mysqli/mysqli_api.c:
+  fixed compiler warning (thx to Marcus Boerger)
+
+2004-01-26  Antony Dovgal  [EMAIL PROTECTED]
+
+* ext/oci8/oci8.c:
+  change to use different allocator (Sascha, thanks =) )
+
+* ext/oci8/oci8.c:
+  fix this annoying notice about limited range
+
+* ext/oci8/oci8.c:
+  improve debug messages
+
+* ext/oci8/oci8.c:
+  oops =(
+  forgot these brackets..
+
+* ext/oci8/oci8.c:
+  fix oci_field_type_raw's proto
+  oci_collection_element_get should return FALSE only if there is no such
+  element and NULL, if it's null
+
+2004-01-26  Adam Dickmeiss  [EMAIL PROTECTED]
+
+* ext/yaz/config.m4
+  ext/yaz/php_yaz.c
+  ext/yaz/php_yaz.h:
+  New function yaz_es that creates Z39.50 Extended Service Package to
+  facilitate record update, database create, database drop.
+
+2004-01-26  Georg Richter  [EMAIL PROTECTED]
+
+* ext/mysqli/mysqli_api.c
+  ext/mysqli/mysqli_fe.c:
+  proto fixes
+  removed mysqli_read_query_result (will be removed in libmysql)
+
+2004-01-26  Sebastian Bergmann  [EMAIL PROTECTED]
+
+* CODING_STANDARDS:
+  Update URL.
+
+2004-01-26  Marcus Boerger  [EMAIL PROTECTED]
+
+* ext/dba/README:
+  
+  Add README
+
+2004-01-26  Georg Richter  [EMAIL PROTECTED]
+
+* ext/mysqli/mysqli_api.c
+  ext/mysqli/mysqli_nonapi.c:
+  more prototype fixes.
+  fixed a bug in mysqli_send_long_data
+
+2004-01-26  Jani Taskinen  [EMAIL PROTECTED]
+
+* ext/curl/interface.c:
+  - Fixed compile problem with CURLOPT_HTTPAUTH
+
+* tests/lang/bug26900.phpt:
+  test for bug #26900
+
+* php.ini-dist
+  php.ini-recommended
+  main/main.c
+  main/php_globals.h
+  main/php_variables.c:
+  - Remove gpc_order since it doesn't serve any purpose.
+
+2004-01-26  Pierre-Alain Joye  [EMAIL PROTECTED]
+
+* (RELEASE_1_3b6)
+  pear/scripts/pearcmd.php:
+  - Fix the command name in the usage text
+
+* (RELEASE_1_3b6)
+  pear/package-PEAR.xml:
+  - # 521 entry
+
+* (RELEASE_1_3b6)
+  pear/PEAR/Common.php:
+  - Remove useless property
+
+* pear/PEAR/Common.php:
+  - Fix #521, incorrect filename in CS warnings
+
+2004-01-26  Moriyoshi Koizumi  [EMAIL PROTECTED]
+
+* (PHP_4_3)
+  NEWS:
+  BFN
+
+2004-01-26  Jani Taskinen  [EMAIL PROTECTED]
+
+* (PHP_4_3)
+  NEWS
+  ext/curl/curl.c:
+  MFH: - Fixed bug #27040 (passing an array of form-fields to
+  CURLOPT_POSTFIELDS does not work).
+
+* ext/curl/interface.c:
+  - Fixed bug #27040 (passing an array of form-fields to CURLOPT_POSTFIELDS
+  does not work).
+
+2004-01-26  Ilia Alshanetsky  [EMAIL PROTECTED]
+
+* (PHP_4_3)
+  NEWS:
+  A better bug description, for people without the official Ilia decoder
+  ring.
+
 2004-01-25  Ilia Alshanetsky  [EMAIL PROTECTED]
 
 * (PHP_4_3)

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

2004-01-26 Thread changelog

changelog   Mon Jan 26 20:32:27 2004 EDT

  Modified files:  
/ZendEngine2ChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/diff.php/ZendEngine2/ChangeLog?r1=1.394r2=1.395ty=u
Index: ZendEngine2/ChangeLog
diff -u ZendEngine2/ChangeLog:1.394 ZendEngine2/ChangeLog:1.395
--- ZendEngine2/ChangeLog:1.394 Sun Jan 25 20:33:25 2004
+++ ZendEngine2/ChangeLog   Mon Jan 26 20:32:27 2004
@@ -1,3 +1,11 @@
+2004-01-26  Marcus Boerger  [EMAIL PROTECTED]
+
+* zend_interfaces.c
+  zend_interfaces.h:
+  - Export struct zend_user_iterator
+  - Ad 'it' to function prefix to prevent naming clashes
+  - Export zend_user_it_free_current
+
 2004-01-25  Ilia Alshanetsky  [EMAIL PROTECTED]
 
 * zend_execute.c:
@@ -2990,7 +2998,7 @@
 2003-06-10  Jani Taskinen  [EMAIL PROTECTED]
 
 * zend_multiply.h:
-  - Missing $Id: ChangeLog,v 1.394 2004/01/26 01:33:25 changelog Exp $ tag
+  - Missing $Id: ChangeLog,v 1.395 2004/01/27 01:32:27 changelog Exp $ tag
 
 2003-06-10  James Cox  [EMAIL PROTECTED]
 
@@ -4714,7 +4722,7 @@
   zend_types.h
   zend_variables.c
   zend_variables.h:
-  - Added some missing CVS $Id: ChangeLog,v 1.394 2004/01/26 01:33:25 changelog 
Exp $ tags, headers and footers.
+  - Added some missing CVS $Id: ChangeLog,v 1.395 2004/01/27 01:32:27 changelog 
Exp $ tags, headers and footers.
 
 2003-01-30  Ilia Alshanetsky  [EMAIL PROTECTED]

[PHP-CVS] cvs: php-src /ext/mysqli mysqli_api.c mysqli_nonapi.c

2004-01-26 Thread Georg Richter

georg   Mon Jan 26 02:39:58 2004 EDT

  Modified files:  
/php-src/ext/mysqli mysqli_api.c mysqli_nonapi.c 
  Log:
  more prototype fixes.
  fixed a bug in mysqli_send_long_data
  
  
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_api.c?r1=1.61r2=1.62ty=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.61 php-src/ext/mysqli/mysqli_api.c:1.62
--- php-src/ext/mysqli/mysqli_api.c:1.61Sun Jan 25 07:01:36 2004
+++ php-src/ext/mysqli/mysqli_api.c Mon Jan 26 02:39:57 2004
@@ -15,7 +15,7 @@
   | Author: Georg Richter [EMAIL PROTECTED]|
   +--+
 
-  $Id: mysqli_api.c,v 1.61 2004/01/25 12:01:36 georg Exp $ 
+  $Id: mysqli_api.c,v 1.62 2004/01/26 07:39:57 georg Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -29,7 +29,6 @@
 #include ext/standard/info.h
 #include php_mysqli.h
 
-
 /* {{{ proto mixed mysqli_affected_rows(object link)
Get number of affected rows in previous MySQL operation */
 PHP_FUNCTION(mysqli_affected_rows)
@@ -709,7 +708,7 @@
 }
 /* }}} */
 
-/* {{{ proto object mysqli_fetch_field (object result)
+/* {{{ proto mixed mysqli_fetch_field (object result)
Get column information from a result and return as an object */
 PHP_FUNCTION(mysqli_fetch_field) 
 {
@@ -741,7 +740,7 @@
 }
 /* }}} */
 
-/* {{{ proto array mysqli_fetch_fields (object result)
+/* {{{ proto mixed mysqli_fetch_fields (object result)
Return array of objects containing field meta-data */
 PHP_FUNCTION(mysqli_fetch_fields) 
 {
@@ -786,7 +785,7 @@
 }
 /* }}} */
 
-/* {{{ proto array mysqli_fetch_field_direct (object result, int offset)
+/* {{{ proto mixed mysqli_fetch_field_direct (object result, int offset)
Fetch meta-data for a single field */
 PHP_FUNCTION(mysqli_fetch_field_direct) 
 {
@@ -819,7 +818,7 @@
 }
 /* }}} */
 
-/* {{{ proto array mysqli_fetch_lengths (object result)
+/* {{{ proto mixed mysqli_fetch_lengths (object result)
Get the length of each output in a result */
 PHP_FUNCTION(mysqli_fetch_lengths) 
 {
@@ -1507,11 +1506,10 @@
}
MYSQLI_FETCH_RESOURCE(stmt, STMT *, mysql_stmt, mysqli_stmt); 
 
-   if (!param_nr) {
+   if (param_nr  0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid parameter 
number);
RETURN_FALSE;
}
-   param_nr--;
 
if (mysql_send_long_data(stmt-stmt, param_nr, data, data_len)) {
RETURN_FALSE;
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.27r2=1.28ty=u
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.27 php-src/ext/mysqli/mysqli_nonapi.c:1.28
--- php-src/ext/mysqli/mysqli_nonapi.c:1.27 Sun Jan 11 19:34:37 2004
+++ php-src/ext/mysqli/mysqli_nonapi.c  Mon Jan 26 02:39:57 2004
@@ -15,7 +15,7 @@
   | Author: Georg Richter [EMAIL PROTECTED]|
   +--+
 
-  $Id: mysqli_nonapi.c,v 1.27 2004/01/12 00:34:37 helly Exp $ 
+  $Id: mysqli_nonapi.c,v 1.28 2004/01/26 07:39:57 georg Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -163,7 +163,7 @@
 }
 /* }}} */
 
-/* {{{ proto array mysqli_fetch_array (object result [,int resulttype])
+/* {{{ proto mixed mysqli_fetch_array (object result [,int resulttype])
Fetch a result row as an associative array, a numeric array, or both */
 PHP_FUNCTION(mysqli_fetch_array) 
 {
@@ -171,7 +171,7 @@
 }
 /* }}} */
 
-/* {{{ proto array mysqli_fetch_assoc (object result)
+/* {{{ proto mixed mysqli_fetch_assoc (object result)
Fetch a result row as an associative array */
 PHP_FUNCTION(mysqli_fetch_assoc) 
 {
@@ -179,7 +179,7 @@
 }
 /* }}} */
 
-/* {{{ proto object mysqli_fetch_object (object result [, string class_name [, 
NULL|array ctor_params]])
+/* {{{ proto mixed mysqli_fetch_object (object result [, string class_name [, 
NULL|array ctor_params]])
Fetch a result row as an object */
 PHP_FUNCTION(mysqli_fetch_object) 
 {

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

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

2004-01-26 Thread Marcus Boerger

helly   Mon Jan 26 02:52:53 2004 EDT

  Modified files:  
/php-src/ext/splspl_functions.c 
  Log:
  We are in c not c++
  
http://cvs.php.net/diff.php/php-src/ext/spl/spl_functions.c?r1=1.21r2=1.22ty=u
Index: php-src/ext/spl/spl_functions.c
diff -u php-src/ext/spl/spl_functions.c:1.21 php-src/ext/spl/spl_functions.c:1.22
--- php-src/ext/spl/spl_functions.c:1.21Sun Jan 25 12:30:19 2004
+++ php-src/ext/spl/spl_functions.c Mon Jan 26 02:52:52 2004
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: spl_functions.c,v 1.21 2004/01/25 17:30:19 helly Exp $ */
+/* $Id: spl_functions.c,v 1.22 2004/01/26 07:52:52 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
#include config.h
@@ -133,10 +133,11 @@
 /* {{{ spl_add_classes */
 int spl_add_classes(zend_class_entry ** ppce, zval *list, int sub, int allow, int 
ce_flags TSRMLS_DC)
 {
+   zend_class_entry *pce = *ppce;
+
if (!ppce) {
return 0;
}
-   zend_class_entry *pce = *ppce;
spl_add_class_name(list, pce, allow, ce_flags TSRMLS_CC);
if (sub) {
spl_add_interfaces(list, pce, allow, ce_flags TSRMLS_CC);

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

[PHP-CVS] cvs: php-src /ext/dba README

2004-01-26 Thread Marcus Boerger

helly   Mon Jan 26 03:37:24 2004 EDT

  Added files: 
/php-src/ext/dbaREADME 
  Log:
  Add README
  

-- 
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/dba README

2004-01-26 Thread Marcus Boerger

helly   Mon Jan 26 03:38:38 2004 EDT

  Added files: (Branch: PHP_4_3)
/php-src/ext/dbaREADME 
  Log:
  MFH
  


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

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

2004-01-26 Thread Sebastian Bergmann

sebastian   Mon Jan 26 07:37:49 2004 EDT

  Modified files:  
/php-srcCODING_STANDARDS 
  Log:
  Update URL.
  
http://cvs.php.net/diff.php/php-src/CODING_STANDARDS?r1=1.28r2=1.29ty=u
Index: php-src/CODING_STANDARDS
diff -u php-src/CODING_STANDARDS:1.28 php-src/CODING_STANDARDS:1.29
--- php-src/CODING_STANDARDS:1.28   Wed Jan 21 15:18:09 2004
+++ php-src/CODING_STANDARDSMon Jan 26 07:37:48 2004
@@ -183,7 +183,7 @@
 indentation and comment styles and up to function declaration
 syntax.
 
-(see also http://www.tuxedo.org/~esr/jargon/html/entry/indent-style.html)
+(see also http://www.catb.org/~esr/jargon/html/I/indent-style.html)
 
 [3] Be generous with whitespace and braces.  Always prefer:
 

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

[PHP-CVS] cvs: php-src /ext/mysqli mysqli_api.c mysqli_fe.c

2004-01-26 Thread Georg Richter

georg   Mon Jan 26 08:38:14 2004 EDT

  Modified files:  
/php-src/ext/mysqli mysqli_fe.c mysqli_api.c 
  Log:
  proto fixes
  removed mysqli_read_query_result (will be removed in libmysql)
  
  
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_fe.c?r1=1.25r2=1.26ty=u
Index: php-src/ext/mysqli/mysqli_fe.c
diff -u php-src/ext/mysqli/mysqli_fe.c:1.25 php-src/ext/mysqli/mysqli_fe.c:1.26
--- php-src/ext/mysqli/mysqli_fe.c:1.25 Thu Jan  8 12:32:31 2004
+++ php-src/ext/mysqli/mysqli_fe.c  Mon Jan 26 08:38:13 2004
@@ -15,7 +15,7 @@
   | Author: Georg Richter [EMAIL PROTECTED]|
   +--+
 
-  $Id: mysqli_fe.c,v 1.25 2004/01/08 17:32:31 sniper Exp $ 
+  $Id: mysqli_fe.c,v 1.26 2004/01/26 13:38:13 georg Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -106,7 +106,6 @@
PHP_FE(mysqli_prepare, 
 NULL)
PHP_FE(mysqli_report,  
 NULL)
PHP_FE(mysqli_query,   
 NULL)
-   PHP_FE(mysqli_read_query_result,NULL)
PHP_FE(mysqli_real_connect,
 NULL)
PHP_FE(mysqli_real_escape_string,   NULL)
PHP_FALIAS(mysqli_escape_string, 
@@ -182,7 +181,6 @@
PHP_FALIAS(ping,mysqli_ping,NULL)
PHP_FALIAS(prepare,mysqli_prepare,NULL)
PHP_FALIAS(query,mysqli_query,NULL)
-   PHP_FALIAS(read_query_result,mysqli_read_query_result,NULL)
PHP_FALIAS(real_connect,mysqli_real_connect,NULL)
PHP_FALIAS(real_escape_string,mysqli_real_escape_string,NULL)
PHP_FALIAS(escape_string, mysqli_real_escape_string,NULL)
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_api.c?r1=1.62r2=1.63ty=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.62 php-src/ext/mysqli/mysqli_api.c:1.63
--- php-src/ext/mysqli/mysqli_api.c:1.62Mon Jan 26 02:39:57 2004
+++ php-src/ext/mysqli/mysqli_api.c Mon Jan 26 08:38:13 2004
@@ -15,7 +15,7 @@
   | Author: Georg Richter [EMAIL PROTECTED]|
   +--+
 
-  $Id: mysqli_api.c,v 1.62 2004/01/26 07:39:57 georg Exp $ 
+  $Id: mysqli_api.c,v 1.63 2004/01/26 13:38:13 georg Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -1286,26 +1286,6 @@
 }
 /* }}} */
 
-/* {{{ proto bool mysqli_read_query_result(object link)
-*/
-PHP_FUNCTION(mysqli_read_query_result)
-{
-   MYSQL   *mysql;
-   zval*mysql_link;
-
-   if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), O, 
mysql_link, mysqli_link_class_entry) == FAILURE) {
-   return;
-   }
-   MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, mysql_link, mysqli_link);
-
-   if (mysql_read_query_result(mysql)) {
-   RETURN_FALSE;
-   }
-
-   RETURN_TRUE;
-}
-/* }}} */
-
 /* {{{ proto bool mysqli_real_connect(object link [,string hostname [,string username 
[,string passwd [,string dbname [,int port [,string socket [,int flags]]])
Open a connection to a mysql server */ 
 PHP_FUNCTION(mysqli_real_connect)
@@ -1732,19 +1712,23 @@
 }
 /* }}} */
   
-/* {{{ proto string mysqli_stat(object link) 
+/* {{{ proto mixed mysqli_stat(object link) 
Get current system status */
 PHP_FUNCTION(mysqli_stat)
 {
MYSQL   *mysql;
zval*mysql_link;
+   char*stat;
 
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), O, 
mysql_link, mysqli_link_class_entry) == FAILURE) {
return;
}
MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, mysql_link, mysqli_link);
 
-   RETURN_STRING((char *)mysql_stat(mysql), 1);
+   if (stat = (char *)mysql_stat(mysql)) {
+   RETURN_STRING(stat, 1);
+   }
+   RETURN_FALSE;
 }
 
 /* }}} */
@@ -1781,7 +1765,7 @@
 }
 /* }}} */
 
-/* {{{ proto object mysqli_stmt_store_result(stmt)
+/* {{{ proto bool mysqli_stmt_store_result(stmt)
 */
 PHP_FUNCTION(mysqli_stmt_store_result)
 {
@@ -1873,7 +1857,7 @@
 
 /* }}} */
 
-/* {{{ proto object mysqli_use_result(object link)
+/* {{{ proto mixed mysqli_use_result(object link)
Directly retrieve query results - do not buffer results on client side */
 PHP_FUNCTION(mysqli_use_result)
 {

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

[PHP-CVS] cvs: php-src /ext/yaz config.m4 php_yaz.c php_yaz.h

2004-01-26 Thread Adam Dickmeiss

dickmeiss   Mon Jan 26 08:40:50 2004 EDT

  Modified files:  
/php-src/ext/yazconfig.m4 php_yaz.c php_yaz.h 
  Log:
  New function yaz_es that creates Z39.50 Extended Service Package to
  facilitate record update, database create, database drop.
  
  http://cvs.php.net/diff.php/php-src/ext/yaz/config.m4?r1=1.14r2=1.15ty=u
Index: php-src/ext/yaz/config.m4
diff -u php-src/ext/yaz/config.m4:1.14 php-src/ext/yaz/config.m4:1.15
--- php-src/ext/yaz/config.m4:1.14  Fri Feb 28 02:17:46 2003
+++ php-src/ext/yaz/config.m4   Mon Jan 26 08:40:49 2004
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.14 2003/02/28 07:17:46 sniper Exp $
+dnl $Id: config.m4,v 1.15 2004/01/26 13:40:49 dickmeiss Exp $
 dnl
 
 PHP_ARG_WITH(yaz,for YAZ support,
@@ -23,13 +23,14 @@
 AC_DEFINE(HAVE_YAZ,1,[Whether you have YAZ])
 . $yazconfig
 
-dnl Check version (2.0 or greater required)
+dnl Check version (2.0.6 or greater required)
 AC_MSG_CHECKING([for YAZ version])
 yaz_version=`echo $YAZVERSION | awk 'BEGIN { FS = .; } { printf %d, ($1 * 
1000 + $2) * 1000 + $3;}'`
-if test $yaz_version -ge 200; then
+echo $yaz_version
+if test $yaz_version -ge 206; then
   AC_MSG_RESULT([$YAZVERSION])
 else
-  AC_MSG_ERROR([YAZ version 2.0 or later required.])
+  AC_MSG_ERROR([YAZ version 2.0.6 or later required.])
 fi
 
 for c in $YAZLIB; do
http://cvs.php.net/diff.php/php-src/ext/yaz/php_yaz.c?r1=1.82r2=1.83ty=u
Index: php-src/ext/yaz/php_yaz.c
diff -u php-src/ext/yaz/php_yaz.c:1.82 php-src/ext/yaz/php_yaz.c:1.83
--- php-src/ext/yaz/php_yaz.c:1.82  Thu Jan  8 03:17:50 2004
+++ php-src/ext/yaz/php_yaz.c   Mon Jan 26 08:40:49 2004
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_yaz.c,v 1.82 2004/01/08 08:17:50 andi Exp $ */
+/* $Id: php_yaz.c,v 1.83 2004/01/26 13:40:49 dickmeiss Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -33,9 +33,9 @@
 #include yaz/yaz-version.h
 
 #ifndef YAZ_VERSIONL
-#error YAZ version 2.0 or later must be used.
-#elif YAZ_VERSIONL  0x02
-#error YAZ version 2.0 or later must be used.
+#error YAZ version 2.0.6 or later must be used.
+#elif YAZ_VERSIONL  0x020006
+#error YAZ version 2.0.6 or later must be used.
 #endif
 
 #ifdef PHP_WIN32
@@ -111,11 +111,34 @@
 static int order_associations;
 static int le_link;
 
+
+#ifdef COMPILE_DL_YAZ
+ZEND_GET_MODULE(yaz)
+#endif
+
+#ifdef ZEND_BEGIN_ARG_INFO
+ZEND_BEGIN_ARG_INFO(second_argument_force_ref, 0)
+ZEND_ARG_PASS_INFO(0)
+ZEND_ARG_PASS_INFO(1)
+ZEND_END_ARG_INFO();
+
+ZEND_BEGIN_ARG_INFO(third_argument_force_ref, 0)
+ZEND_ARG_PASS_INFO(0)
+ZEND_ARG_PASS_INFO(1)
+ZEND_END_ARG_INFO();
+#else
+static unsigned char second_argument_force_ref[] = {
+2, BYREF_NONE, BYREF_FORCE };
+static unsigned char third_argument_force_ref[] = {
+3, BYREF_NONE, BYREF_NONE, BYREF_FORCE };
+#endif
+
+
 function_entry yaz_functions [] = {
PHP_FE(yaz_connect, NULL)
PHP_FE(yaz_close, NULL)
PHP_FE(yaz_search, NULL)
-   PHP_FE(yaz_wait, second_arg_force_ref)
+   PHP_FE(yaz_wait, second_argument_force_ref)
PHP_FE(yaz_errno, NULL)
PHP_FE(yaz_error, NULL)
PHP_FE(yaz_addinfo, NULL)
@@ -127,15 +150,16 @@
PHP_FE(yaz_itemorder, NULL)
PHP_FE(yaz_es_result, NULL)
PHP_FE(yaz_scan, NULL)
-   PHP_FE(yaz_scan_result, second_arg_force_ref)
+   PHP_FE(yaz_scan_result, second_argument_force_ref)
PHP_FE(yaz_present, NULL)
PHP_FE(yaz_ccl_conf, NULL)
-   PHP_FE(yaz_ccl_parse, third_arg_force_ref)
+   PHP_FE(yaz_ccl_parse, third_argument_force_ref)
PHP_FE(yaz_database, NULL)
PHP_FE(yaz_sort, NULL)
PHP_FE(yaz_schema, NULL)
PHP_FE(yaz_set_option, NULL)
PHP_FE(yaz_get_option, NULL)
+   PHP_FE(yaz_es, NULL)
{NULL, NULL, NULL}
 };
 
@@ -304,9 +328,10 @@
otherInfo[0] = array_lookup_string(ht, otherInfo0);
otherInfo[1] = array_lookup_string(ht, otherInfo1);
otherInfo[2] = array_lookup_string(ht, otherInfo2);
-   } else {
+   } else if (Z_TYPE_PP(user) == IS_STRING) {
convert_to_string_ex(user);
-   user_str = (*user)-value.str.val;
+   if (*(*user)-value.str.val)
+   user_str = (*user)-value.str.val;
}
} else {
WRONG_PARAM_COUNT;
@@ -831,8 +856,50 @@
}
return r;
 }
+static void retval_array2_grs1(zval *return_value, Z_GenericRecord *p)
+{
+   int i;
+   
+   array_init(return_value);
+   
+   for (i = 0; ip-num_elements; i++)
+   {
+   zval *zval_element;
+   zval *zval_sub;
+   Z_TaggedElement *e = p-elements[i];
+   
+

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

2004-01-26 Thread Antony Dovgal

tony2001Mon Jan 26 08:59:42 2004 EDT

  Modified files:  
/php-src/ext/oci8   oci8.c 
  Log:
  fix oci_field_type_raw's proto
  oci_collection_element_get should return FALSE only if there is no such element and 
NULL, if it's null
  
  
http://cvs.php.net/diff.php/php-src/ext/oci8/oci8.c?r1=1.238r2=1.239ty=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.238 php-src/ext/oci8/oci8.c:1.239
--- php-src/ext/oci8/oci8.c:1.238   Thu Jan 22 03:39:50 2004
+++ php-src/ext/oci8/oci8.c Mon Jan 26 08:59:42 2004
@@ -22,7 +22,7 @@
+--+
  */
 
-/* $Id: oci8.c,v 1.238 2004/01/22 08:39:50 tony2001 Exp $ */
+/* $Id: oci8.c,v 1.239 2004/01/26 13:59:42 tony2001 Exp $ */
 
 /* TODO list:
  *
@@ -785,7 +785,7 @@
 
php_info_print_table_start();
php_info_print_table_row(2, OCI8 Support, enabled);
-   php_info_print_table_row(2, Revision, $Revision: 1.238 $);
+   php_info_print_table_row(2, Revision, $Revision: 1.239 $);
 
sprintf(buf, %ld, num_persistent);
php_info_print_table_row(2, Active Persistent Links, buf);
@@ -5449,7 +5449,7 @@
 }
 /* }}} */
 
-/* {{{ proto mixed oci_field_type_raw(resource stmt, int col)
+/* {{{ proto int oci_field_type_raw(resource stmt, int col)
Tell the raw oracle data type of a column */
 PHP_FUNCTION(oci_field_type_raw)
 {
@@ -6505,7 +6505,7 @@
 
/* Return null if the value is null */
if (*elemind == OCI_IND_NULL) {
-   RETURN_FALSE;
+   RETURN_NULL;
} 
 
switch (coll-element_typecode) {

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

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

2004-01-26 Thread Antony Dovgal

tony2001Mon Jan 26 09:02:09 2004 EDT

  Modified files:  
/php-src/ext/oci8   oci8.c 
  Log:
  oops =(
  forgot these brackets..
  
  
http://cvs.php.net/diff.php/php-src/ext/oci8/oci8.c?r1=1.239r2=1.240ty=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.239 php-src/ext/oci8/oci8.c:1.240
--- php-src/ext/oci8/oci8.c:1.239   Mon Jan 26 08:59:42 2004
+++ php-src/ext/oci8/oci8.c Mon Jan 26 09:02:08 2004
@@ -22,7 +22,7 @@
+--+
  */
 
-/* $Id: oci8.c,v 1.239 2004/01/26 13:59:42 tony2001 Exp $ */
+/* $Id: oci8.c,v 1.240 2004/01/26 14:02:08 tony2001 Exp $ */
 
 /* TODO list:
  *
@@ -785,7 +785,7 @@
 
php_info_print_table_start();
php_info_print_table_row(2, OCI8 Support, enabled);
-   php_info_print_table_row(2, Revision, $Revision: 1.239 $);
+   php_info_print_table_row(2, Revision, $Revision: 1.240 $);
 
sprintf(buf, %ld, num_persistent);
php_info_print_table_row(2, Active Persistent Links, buf);
@@ -6505,7 +6505,7 @@
 
/* Return null if the value is null */
if (*elemind == OCI_IND_NULL) {
-   RETURN_NULL;
+   RETURN_NULL();
} 
 
switch (coll-element_typecode) {

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

2004-01-26 Thread Antony Dovgal

tony2001Mon Jan 26 09:04:24 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/oci8   oci8.c 
  Log:
  MFH
  
  
http://cvs.php.net/diff.php/php-src/ext/oci8/oci8.c?r1=1.183.2.9r2=1.183.2.10ty=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.183.2.9 php-src/ext/oci8/oci8.c:1.183.2.10
--- php-src/ext/oci8/oci8.c:1.183.2.9   Tue Jan 20 06:37:17 2004
+++ php-src/ext/oci8/oci8.c Mon Jan 26 09:04:22 2004
@@ -21,7 +21,7 @@
+--+
  */
 
-/* $Id: oci8.c,v 1.183.2.9 2004/01/20 11:37:17 tony2001 Exp $ */
+/* $Id: oci8.c,v 1.183.2.10 2004/01/26 14:04:22 tony2001 Exp $ */
 
 /* TODO list:
  *
@@ -641,7 +641,7 @@
 
php_info_print_table_start();
php_info_print_table_row(2, OCI8 Support, enabled);
-   php_info_print_table_row(2, Revision, $Revision: 1.183.2.9 $);
+   php_info_print_table_row(2, Revision, $Revision: 1.183.2.10 $);
 #ifndef PHP_WIN32
php_info_print_table_row(2, Oracle Version, PHP_OCI8_VERSION );
php_info_print_table_row(2, Compile-time ORACLE_HOME, PHP_OCI8_DIR );
@@ -3834,7 +3834,7 @@
 
 /* }}} */
 
-/* {{{ proto mixed ocicolumntype(int stmt, int col)
+/* {{{ proto int ocicolumntype(int stmt, int col)
Tell the data type of a column */
 
 PHP_FUNCTION(ocicolumntype)
@@ -4998,7 +4998,7 @@
 
/* Return null if the value is null */
if(*elemind == OCI_IND_NULL) {
-   RETURN_FALSE;
+   RETURN_NULL();
} 
 
switch (coll-element_typecode) {

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

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

2004-01-26 Thread Antony Dovgal

tony2001Mon Jan 26 10:21:53 2004 EDT

  Modified files:  
/php-src/ext/oci8   oci8.c 
  Log:
  improve debug messages
  
  
http://cvs.php.net/diff.php/php-src/ext/oci8/oci8.c?r1=1.240r2=1.241ty=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.240 php-src/ext/oci8/oci8.c:1.241
--- php-src/ext/oci8/oci8.c:1.240   Mon Jan 26 09:02:08 2004
+++ php-src/ext/oci8/oci8.c Mon Jan 26 10:21:52 2004
@@ -22,7 +22,7 @@
+--+
  */
 
-/* $Id: oci8.c,v 1.240 2004/01/26 14:02:08 tony2001 Exp $ */
+/* $Id: oci8.c,v 1.241 2004/01/26 15:21:52 tony2001 Exp $ */
 
 /* TODO list:
  *
@@ -785,7 +785,7 @@
 
php_info_print_table_start();
php_info_print_table_row(2, OCI8 Support, enabled);
-   php_info_print_table_row(2, Revision, $Revision: 1.240 $);
+   php_info_print_table_row(2, Revision, $Revision: 1.241 $);
 
sprintf(buf, %ld, num_persistent);
php_info_print_table_row(2, Active Persistent Links, buf);
@@ -2197,7 +2197,7 @@
}
}

-   oci_debug(OCILobGetLen: len=%d,*loblen);
+   oci_debug(oci_lobgetlen: len=%d,*loblen);
 
return 0;
 }
@@ -2309,7 +2309,7 @@
*buffer = buf;
*loblen = siz;
 
-   oci_debug(OCIloadlob: size=%d,siz);
+   oci_debug(oci_loadlob: size=%d,siz);
 
return 0;
 }
@@ -2442,7 +2442,7 @@
*buffer = buf;
*len = bytes;
 
-   oci_debug(OCIreadlob: size=%d,bytes);
+   oci_debug(oci_readlob: size=%d,bytes);
 
return 0;
 }
@@ -3400,7 +3400,7 @@
)
);
 
-   oci_debug(OCILobFlushBuffer: flush_flag=%d,flush_flag);
+   oci_debug(oci_lob_flush: flush_flag=%d,flush_flag);
 
if (connection-error) {
oci_error(connection-pError, OCILobFlushBuffer, connection-error);
@@ -3786,7 +3786,7 @@
if ((id = getThis()) != 0) {
inx = _oci_get_ocidesc(id,descriptor TSRMLS_CC);
if (inx) {
-   oci_debug(OCIfreedesc: descr=%d,inx);
+   oci_debug(oci_free_descriptor: descr=%d,inx);
zend_list_delete(inx);
RETURN_TRUE;
}
@@ -3838,7 +3838,7 @@
)
);
 
-   oci_debug(OCIsavedesc: curloblen=%d,curloblen);
+   oci_debug(oci_lob_save: curloblen=%d,curloblen);
 
if (offparam == -1) {
offset = curloblen;
@@ -3877,7 +3877,7 @@
)
);
 
-   oci_debug(OCIsavedesc: size=%d offset=%d,loblen,offset);
+   oci_debug(oci_lob_save: size=%d offset=%d,loblen,offset);
 
if (connection-error) {
oci_error(connection-pError, OCILobWrite, 
connection-error);
@@ -3954,7 +3954,7 @@
)
);
 
-   oci_debug(OCIsavelob: size=%d,loblen);
+   oci_debug(oci_lob_import: size=%d,loblen);
 
if (connection-error) {
oci_error(connection-pError, OCILobWrite, 
connection-error);
@@ -4254,7 +4254,7 @@
)
);
 
-   oci_debug(OCILobWrite: size=%d 
offset=%d,loblen,descr-lob_current_position);
+   oci_debug(oci_lob_write: size=%d 
offset=%d,loblen,descr-lob_current_position);
 
if (connection-error) {
oci_error(connection-pError, OCILobWrite, 
connection-error);
@@ -4408,7 +4408,7 @@
)
);
 
-   oci_debug(OCILobTrim: trim_length=%d,trim_length);
+   oci_debug(oci_lob_truncate: trim_length=%d,trim_length);
 
if (connection-error) {
oci_error(connection-pError, OCILobTrim, connection-error);
@@ -4486,7 +4486,7 @@
)
);
 
-   oci_debug(OCILobErase: erase_length=%d, 
erase_offset=%d,erase_length,erase_offset);
+   oci_debug(oci_lob_erase: erase_length=%d, 
erase_offset=%d,erase_length,erase_offset);
 
if (connection-error) {
oci_error(connection-pError, OCILobErase, 
connection-error);
@@ -4615,7 +4615,7 @@
break;
}

-   oci_debug(OCIsavedesc: buffering_flag=%d,buffering_flag);
+   oci_debug(oci_lob_set_buffering: buffering_flag=%d,buffering_flag);
 
if (connection-error) {
oci_error(connection-pError, OCILobFlushBuffer, 
connection-error);
@@ -4904,7 +4904,7 @@
 
coffs = start;
 
-   oci_debug(ociwritelobtofile(start = %d, length = %d, loblen = 
%d,start,length,loblen);
+

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

2004-01-26 Thread Antony Dovgal

tony2001Mon Jan 26 10:25:32 2004 EDT

  Modified files:  
/php-src/ext/oci8   oci8.c 
  Log:
  fix this annoying notice about limited range
  
  
http://cvs.php.net/diff.php/php-src/ext/oci8/oci8.c?r1=1.241r2=1.242ty=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.241 php-src/ext/oci8/oci8.c:1.242
--- php-src/ext/oci8/oci8.c:1.241   Mon Jan 26 10:21:52 2004
+++ php-src/ext/oci8/oci8.c Mon Jan 26 10:25:32 2004
@@ -22,7 +22,7 @@
+--+
  */
 
-/* $Id: oci8.c,v 1.241 2004/01/26 15:21:52 tony2001 Exp $ */
+/* $Id: oci8.c,v 1.242 2004/01/26 15:25:32 tony2001 Exp $ */
 
 /* TODO list:
  *
@@ -785,7 +785,7 @@
 
php_info_print_table_start();
php_info_print_table_row(2, OCI8 Support, enabled);
-   php_info_print_table_row(2, Revision, $Revision: 1.241 $);
+   php_info_print_table_row(2, Revision, $Revision: 1.242 $);
 
sprintf(buf, %ld, num_persistent);
php_info_print_table_row(2, Active Persistent Links, buf);
@@ -2649,7 +2649,7 @@
)
);
 
-   smart_str_append_long_ex(hashed_details, charsetid, 1);
+   smart_str_append_unsigned(hashed_details, charsetid);
 
charsetid = 0;
}

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

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

2004-01-26 Thread Sascha Schumann

On Mon, 26 Jan 2004, Antony Dovgal wrote:

 tony2001  Mon Jan 26 10:25:32 2004 EDT

   Modified files:
 /php-src/ext/oci8 oci8.c
   Log:
   fix this annoying notice about limited range

You need to use a different allocator (.._ex(.., 1)).

 - smart_str_append_long_ex(hashed_details, charsetid, 1);
 + smart_str_append_unsigned(hashed_details, charsetid);

- Sascha

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

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

2004-01-26 Thread Antony Dovgal

tony2001Mon Jan 26 10:42:25 2004 EDT

  Modified files:  
/php-src/ext/oci8   oci8.c 
  Log:
  change to use different allocator (Sascha, thanks =) )
  
  
http://cvs.php.net/diff.php/php-src/ext/oci8/oci8.c?r1=1.242r2=1.243ty=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.242 php-src/ext/oci8/oci8.c:1.243
--- php-src/ext/oci8/oci8.c:1.242   Mon Jan 26 10:25:32 2004
+++ php-src/ext/oci8/oci8.c Mon Jan 26 10:42:24 2004
@@ -22,7 +22,7 @@
+--+
  */
 
-/* $Id: oci8.c,v 1.242 2004/01/26 15:25:32 tony2001 Exp $ */
+/* $Id: oci8.c,v 1.243 2004/01/26 15:42:24 tony2001 Exp $ */
 
 /* TODO list:
  *
@@ -785,7 +785,7 @@
 
php_info_print_table_start();
php_info_print_table_row(2, OCI8 Support, enabled);
-   php_info_print_table_row(2, Revision, $Revision: 1.242 $);
+   php_info_print_table_row(2, Revision, $Revision: 1.243 $);
 
sprintf(buf, %ld, num_persistent);
php_info_print_table_row(2, Active Persistent Links, buf);
@@ -2649,7 +2649,7 @@
)
);
 
-   smart_str_append_unsigned(hashed_details, charsetid);
+   smart_str_append_unsigned_ex(hashed_details, charsetid, 1);
 
charsetid = 0;
}

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

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

2004-01-26 Thread Antony Dovgal

On Mon, 26 Jan 2004 16:37:38 +0100 (CET)
Sascha Schumann [EMAIL PROTECTED] wrote:

 On Mon, 26 Jan 2004, Antony Dovgal wrote:
 
  tony2001Mon Jan 26 10:25:32 2004 EDT
 
Modified files:
  /php-src/ext/oci8   oci8.c
Log:
fix this annoying notice about limited range
 
 You need to use a different allocator (.._ex(.., 1)).

fixed, thanks =)

---
WBR,
Antony Dovgal aka tony2001
[EMAIL PROTECTED]

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

[PHP-CVS] cvs: CVSROOT / avail

2004-01-26 Thread Rasmus Lerdorf

rasmus  Mon Jan 26 12:42:35 2004 EDT

  Modified files:  
/CVSROOTavail 
  Log:
  pearweb karma for draber
  
  
http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.816r2=1.817ty=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.816 CVSROOT/avail:1.817
--- CVSROOT/avail:1.816 Sun Jan 25 15:03:08 2004
+++ CVSROOT/avail   Mon Jan 26 12:42:34 2004
@@ -50,7 +50,7 @@
 avail|cox,mj,vblavet,dickmann,tal,pajoye,jmcastagnetto,alexmerz,cellog|php-src/pear
 
 # PEAR website and weekly news
-avail|alan_k,chagenbu,cmv,cox,derick,dickmann,jon,mj,pajoye,richard,tal,antonio,alexmerz,jan,toby|pearweb
+avail|alan_k,chagenbu,cmv,cox,derick,dickmann,jon,mj,pajoye,richard,tal,antonio,alexmerz,jan,toby,draber|pearweb
 
avail|arnaud,bjoern,chregu,dams,david,jmcastagnetto,rashid,tuupola,silvano|pearweb/weeklynews
 
 # Some people get access to the peardoc

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

[PHP-CVS] cvs: CVSROOT / modules

2004-01-26 Thread Rasmus Lerdorf

rasmus  Mon Jan 26 13:01:14 2004 EDT

  Modified files:  
/CVSROOTmodules 
  Log:
  doc-da
  
  
http://cvs.php.net/diff.php/CVSROOT/modules?r1=1.67r2=1.68ty=u
Index: CVSROOT/modules
diff -u CVSROOT/modules:1.67 CVSROOT/modules:1.68
--- CVSROOT/modules:1.67Sun Jan 11 05:11:35 2004
+++ CVSROOT/modules Mon Jan 26 13:01:13 2004
@@ -1,7 +1,7 @@
 #
 # The CVS Modules File
 #
-#ident @(#)cvs/examples:$Name:  $:$Id: modules,v 1.67 2004/01/11 10:11:35 goba Exp $
+#ident @(#)cvs/examples:$Name:  $:$Id: modules,v 1.68 2004/01/26 18:01:13 rasmus Exp 
$
 #
 # Three different line formats are valid:
 #  key -aaliases...
@@ -62,7 +62,7 @@
 phpdoc phpdoc
 
 # this checks out the build system all of the languages
-phpdoc-all phpdoc phpdoc-ar-dir phpdoc-cs-dir phpdoc-de-dir phpdoc-el-dir 
phpdoc-es-dir phpdoc-fi-dir phpdoc-fr-dir phpdoc-he-dir phpdoc-hk-dir 
phpdoc-hu-dir phpdoc-id-dir phpdoc-it-dir phpdoc-ja-dir phpdoc-kr-dir 
phpdoc-lt-dir phpdoc-nl-dir phpdoc-pl-dir phpdoc-pt-dir phpdoc-pt_BR-dir 
phpdoc-ro-dir phpdoc-ru-dir phpdoc-sk-dir phpdoc-sl-dir phpdoc-sv-dir 
phpdoc-tr-dir phpdoc-tw-dir phpdoc-zh-dir
+phpdoc-all phpdoc phpdoc-ar-dir phpdoc-cs-dir phpdoc-da-dir phpdoc-de-dir 
phpdoc-el-dir phpdoc-es-dir phpdoc-fi-dir phpdoc-fr-dir phpdoc-he-dir 
phpdoc-hk-dir phpdoc-hu-dir phpdoc-id-dir phpdoc-it-dir phpdoc-ja-dir 
phpdoc-kr-dir phpdoc-lt-dir phpdoc-nl-dir phpdoc-pl-dir phpdoc-pt-dir 
phpdoc-pt_BR-dir phpdoc-ro-dir phpdoc-ru-dir phpdoc-sk-dir phpdoc-sl-dir 
phpdoc-sv-dir phpdoc-tr-dir phpdoc-tw-dir phpdoc-zh-dir
 
 # these allow checking out each translation on its own, or with the english
 # version and build infrastructure
@@ -72,6 +72,9 @@
 phpdoc-cs-dir -d cs phpdoc-cs
 phpdoc-cs-only phpdoc-cs
 phpdoc-cs phpdoc phpdoc-cs-dir
+phpdoc-da-dir -d da phpdoc-da
+phpdoc-da-only phpdoc-da
+phpdoc-da phpdoc phpdoc-da-dir
 phpdoc-de-dir -d de phpdoc-de
 phpdoc-de-only phpdoc-de
 phpdoc-de phpdoc phpdoc-de-dir

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

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

2004-01-26 Thread Georg Richter

georg   Mon Jan 26 15:08:17 2004 EDT

  Modified files:  
/php-src/ext/mysqli mysqli_api.c 
  Log:
  fixed compiler warning (thx to Marcus Boerger)
  
  
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_api.c?r1=1.63r2=1.64ty=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.63 php-src/ext/mysqli/mysqli_api.c:1.64
--- php-src/ext/mysqli/mysqli_api.c:1.63Mon Jan 26 08:38:13 2004
+++ php-src/ext/mysqli/mysqli_api.c Mon Jan 26 15:08:16 2004
@@ -15,7 +15,7 @@
   | Author: Georg Richter [EMAIL PROTECTED]|
   +--+
 
-  $Id: mysqli_api.c,v 1.63 2004/01/26 13:38:13 georg Exp $ 
+  $Id: mysqli_api.c,v 1.64 2004/01/26 20:08:16 georg Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -1725,7 +1725,7 @@
}
MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, mysql_link, mysqli_link);
 
-   if (stat = (char *)mysql_stat(mysql)) {
+   if ((stat = (char *)mysql_stat(mysql))) {
RETURN_STRING(stat, 1);
}
RETURN_FALSE;

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

[PHP-CVS] cvs: php-src / NEWS /ext/spl spl_iterators.c /ext/spl/tests limititerator.phpt

2004-01-26 Thread Marcus Boerger

helly   Mon Jan 26 17:30:26 2004 EDT

  Added files: 
/php-src/ext/spl/tests  limititerator.phpt 

  Modified files:  
/php-srcNEWS 
/php-src/ext/splspl_iterators.c 
  Log:
  Fixed bug #27042 (SPL: SeekableIterator seek() broken).
  
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1589r2=1.1590ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1589 php-src/NEWS:1.1590
--- php-src/NEWS:1.1589 Sun Jan 25 09:00:59 2004
+++ php-src/NEWSMon Jan 26 17:30:23 2004
@@ -11,6 +11,7 @@
   (Derick)
 - Fixed problems with longlong values in mysqli. (Georg)
 - Fixed class name case preserving of user defined classes. (Marcus)
+- Fixed bug #27042 (SPL: SeekableIterator seek() broken). (Marcus)
 - Fixed bug #27008 (Every class method can be called as static). (Marcus)
 - Fixed bug #26938 (exec() has problems reading long lines).
   (Ilia, runekl[at]opoint[dot]com
http://cvs.php.net/diff.php/php-src/ext/spl/spl_iterators.c?r1=1.15r2=1.16ty=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.15 php-src/ext/spl/spl_iterators.c:1.16
--- php-src/ext/spl/spl_iterators.c:1.15Tue Jan 20 15:59:45 2004
+++ php-src/ext/spl/spl_iterators.c Mon Jan 26 17:30:24 2004
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: spl_iterators.c,v 1.15 2004/01/20 20:59:45 helly Exp $ */
+/* $Id: spl_iterators.c,v 1.16 2004/01/26 22:30:24 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include config.h
@@ -880,6 +880,9 @@
INIT_PZVAL(zpos);
ZVAL_LONG(zpos, pos);
zend_call_method_with_1_params(intern-inner.zobject, 
intern-inner.ce, NULL, seek, NULL, zpos);
+   spl_dual_it_free(intern TSRMLS_CC);
+   zend_user_it_free_current(intern-inner.iterator TSRMLS_CC);
+   spl_dual_it_fetch(intern, 1 TSRMLS_CC);
intern-current.pos = pos;
} else {
/* emulate the forward seek, by next() calls */

http://cvs.php.net/co.php/php-src/ext/spl/tests/limititerator.phpt?r=1.1p=1
Index: php-src/ext/spl/tests/limititerator.phpt
+++ php-src/ext/spl/tests/limititerator.phpt
--TEST--
SPL: SeekableIterator
--SKIPIF--
?php if (!extension_loaded(spl)) print skip; ?
--FILE--
?php

class NumericArrayIterator implements Iterator
{
protected $a;
protected $i;

public function __construct($a)
{
echo __METHOD__ . \n;
$this-a = $a;
}

public function rewind()
{
echo __METHOD__ . \n;
$this-i = 0;
}

public function hasMore()
{
echo __METHOD__ . \n;
return $this-i  count($this-a);
}

public function key()
{
echo __METHOD__ . \n;
return $this-i;
}

public function current()
{
echo __METHOD__ . \n;
return $this-a[$this-i];
}

public function next()
{
echo __METHOD__ . \n;
$this-i++;
}
}

class SeekableNumericArrayIterator extends NumericArrayIterator implements 
SeekableIterator
{
public function seek($index)
{
if ($index  count($this-a)) {
$this-i = $index;
}
echo __METHOD__ . '(' . $index . )\n;
}
}

$a = array(1, 2, 3, 4, 5);
foreach (new LimitIterator(new NumericArrayIterator($a)) as $v)
{
print $v\n;
}

echo ===SEEKABLE===\n;
$a = array(1, 2, 3, 4, 5);
foreach(new LimitIterator(new SeekableNumericArrayIterator($a)) as $v)
{
print $v\n;
}

echo ===SEEKING===\n;
$a = array(1, 2, 3, 4, 5);
$l = new LimitIterator(new SeekableNumericArrayIterator($a));
for($i = 0; $i  5; $i++)
{
$l-seek($i);
print $l-current() . \n;
}

?
===DONE===
?php exit(0); ?
--EXPECT--
NumericArrayIterator::__construct
NumericArrayIterator::rewind
NumericArrayIterator::hasMore
NumericArrayIterator::hasMore
NumericArrayIterator::current
NumericArrayIterator::key
1
NumericArrayIterator::next
NumericArrayIterator::hasMore
NumericArrayIterator::current
NumericArrayIterator::key
2
NumericArrayIterator::next
NumericArrayIterator::hasMore
NumericArrayIterator::current
NumericArrayIterator::key
3
NumericArrayIterator::next
NumericArrayIterator::hasMore
NumericArrayIterator::current
NumericArrayIterator::key
4
NumericArrayIterator::next
NumericArrayIterator::hasMore
NumericArrayIterator::current
NumericArrayIterator::key
5
NumericArrayIterator::next
NumericArrayIterator::hasMore
===SEEKABLE===
NumericArrayIterator::__construct
NumericArrayIterator::rewind
SeekableNumericArrayIterator::seek(0)
NumericArrayIterator::hasMore
NumericArrayIterator::current
NumericArrayIterator::key
1
NumericArrayIterator::next
NumericArrayIterator::hasMore
NumericArrayIterator::current

[PHP-CVS] cvs: php-src /ext/spl/tests limititerator.phpt

2004-01-26 Thread Marcus Boerger

helly   Mon Jan 26 18:20:00 2004 EDT

  Modified files:  
/php-src/ext/spl/tests  limititerator.phpt 
  Log:
  Remove test code
  
http://cvs.php.net/diff.php/php-src/ext/spl/tests/limititerator.phpt?r1=1.1r2=1.2ty=u
Index: php-src/ext/spl/tests/limititerator.phpt
diff -u php-src/ext/spl/tests/limititerator.phpt:1.1 
php-src/ext/spl/tests/limititerator.phpt:1.2
--- php-src/ext/spl/tests/limititerator.phpt:1.1Mon Jan 26 17:30:25 2004
+++ php-src/ext/spl/tests/limititerator.phptMon Jan 26 18:20:00 2004
@@ -82,7 +82,6 @@
 
 ?
 ===DONE===
-?php exit(0); ?
 --EXPECT--
 NumericArrayIterator::__construct
 NumericArrayIterator::rewind

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

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

2004-01-26 Thread Marcus Boerger

helly   Mon Jan 26 18:59:50 2004 EDT

  Modified files:  
/php-src/ext/splspl_iterators.c 
  Log:
  Must use zval* here
  
http://cvs.php.net/diff.php/php-src/ext/spl/spl_iterators.c?r1=1.16r2=1.17ty=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.16 php-src/ext/spl/spl_iterators.c:1.17
--- php-src/ext/spl/spl_iterators.c:1.16Mon Jan 26 17:30:24 2004
+++ php-src/ext/spl/spl_iterators.c Mon Jan 26 18:59:50 2004
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: spl_iterators.c,v 1.16 2004/01/26 22:30:24 helly Exp $ */
+/* $Id: spl_iterators.c,v 1.17 2004/01/26 23:59:50 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include config.h
@@ -865,7 +865,7 @@
 
 static INLINE void spl_limit_it_seek(spl_dual_it_object *intern, long pos TSRMLS_DC)
 {
-   zval  zpos;
+   zval  *zpos;
 
spl_dual_it_free(intern TSRMLS_CC);
if (pos  intern-u.limit.offset) {
@@ -877,9 +877,10 @@
return;
}
if (instanceof_function(intern-inner.ce, spl_ce_SeekableIterator TSRMLS_CC)) {
-   INIT_PZVAL(zpos);
-   ZVAL_LONG(zpos, pos);
-   zend_call_method_with_1_params(intern-inner.zobject, 
intern-inner.ce, NULL, seek, NULL, zpos);
+   MAKE_STD_ZVAL(zpos);
+   ZVAL_LONG(zpos, pos);
+   zend_call_method_with_1_params(intern-inner.zobject, 
intern-inner.ce, NULL, seek, NULL, zpos);
+   zval_ptr_dtor(zpos);
spl_dual_it_free(intern TSRMLS_CC);
zend_user_it_free_current(intern-inner.iterator TSRMLS_CC);
spl_dual_it_fetch(intern, 1 TSRMLS_CC);

-- 
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) / makerpm

2004-01-26 Thread Marcus Boerger

helly   Mon Jan 26 19:32:35 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-srcmakerpm 
  Log:
  Use RPM variables
  # as discussed with ilia
  
  
http://cvs.php.net/diff.php/php-src/makerpm?r1=1.4.8.3r2=1.4.8.4ty=u
Index: php-src/makerpm
diff -u php-src/makerpm:1.4.8.3 php-src/makerpm:1.4.8.4
--- php-src/makerpm:1.4.8.3 Wed Jan 21 02:19:07 2004
+++ php-src/makerpm Mon Jan 26 19:32:35 2004
@@ -39,7 +39,7 @@
 Group: Networking/Daemons
 Source0: http://www.php.net/distributions/php-%{PACKAGE_VERSION}.tar.gz
 Copyright: PHP License
-BuildRoot: /tmp/php4-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
 Requires: webserver
 
 %description
@@ -90,15 +90,15 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/usr/lib/apache
-install -m 755 .libs/libphp4.so $RPM_BUILD_ROOT/usr/lib/apache
-mkdir -p $RPM_BUILD_ROOT/usr/bin
-install -m 0755 sapi/cli/php $RPM_BUILD_ROOT/usr/bin
-install -m 0755 sapi/cgi/php $RPM_BUILD_ROOT/usr/bin/php_cgi
-mkdir -p $RPM_BUILD_ROOT/man/man1
-install -m 0755 sapi/cli/php.1 $RPM_BUILD_ROOT/man/man1
-mkdir -p $RPM_BUILD_ROOT/etc
-install -m 0755 php.ini-recommended $RPM_BUILD_ROOT/etc/php.ini
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/apache
+install -m 0755 .libs/libphp5.so $RPM_BUILD_ROOT%{_libdir}/apache
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+install -m 0755 sapi/cli/php $RPM_BUILD_ROOT%{_bindir}
+install -m 0755 sapi/cgi/php $RPM_BUILD_ROOT%{_bindir}/php_cgi
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+install -m 0755 sapi/cli/php.1 $RPM_BUILD_ROOT%{_mandir}/man1
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
+install -m 0755 php.ini-recommended $RPM_BUILD_ROOT%{_sysconfdir}/php.ini
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -144,11 +144,11 @@
 
 %files
 %defattr(-,root,root)
-/usr/lib/apache/libphp4.so
-/usr/bin/php
-/usr/bin/php_cgi
-/man/man1/php.1*
-/etc/php.ini
+%{_libdir}/apache/libphp4.so
+%{_bindir}/php
+%{_bindir}/php_cgi
+%{_mandir}/man1/php.1*
+%{_sysconfdir}/php.ini
 
 %doc TODO CODING_STANDARDS CREDITS ChangeLog LICENSE NEWS
 EOF

-- 
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) / makerpm

2004-01-26 Thread Marcus Boerger

helly   Mon Jan 26 20:24:18 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-srcmakerpm 
  Log:
  still version 4 here
  
http://cvs.php.net/diff.php/php-src/makerpm?r1=1.4.8.4r2=1.4.8.5ty=u
Index: php-src/makerpm
diff -u php-src/makerpm:1.4.8.4 php-src/makerpm:1.4.8.5
--- php-src/makerpm:1.4.8.4 Mon Jan 26 19:32:35 2004
+++ php-src/makerpm Mon Jan 26 20:24:17 2004
@@ -91,7 +91,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/apache
-install -m 0755 .libs/libphp5.so $RPM_BUILD_ROOT%{_libdir}/apache
+install -m 0755 .libs/libphp4.so $RPM_BUILD_ROOT%{_libdir}/apache
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 install -m 0755 sapi/cli/php $RPM_BUILD_ROOT%{_bindir}
 install -m 0755 sapi/cgi/php $RPM_BUILD_ROOT%{_bindir}/php_cgi

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

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

2004-01-26 Thread Ilia Alshanetsky

iliaa   Mon Jan 26 22:20:36 2004 EDT

  Modified files:  
/php-src/main/streams   userspace.c 
  Log:
  Removed unused variable.
  
  
http://cvs.php.net/diff.php/php-src/main/streams/userspace.c?r1=1.19r2=1.20ty=u
Index: php-src/main/streams/userspace.c
diff -u php-src/main/streams/userspace.c:1.19 php-src/main/streams/userspace.c:1.20
--- php-src/main/streams/userspace.c:1.19   Wed Jan 21 05:17:12 2004
+++ php-src/main/streams/userspace.cMon Jan 26 22:20:35 2004
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: userspace.c,v 1.19 2004/01/21 10:17:12 hholzgra Exp $ */
+/* $Id: userspace.c,v 1.20 2004/01/27 03:20:35 iliaa Exp $ */
 
 #include php.h
 #include php_globals.h
@@ -1202,7 +1202,6 @@
 {
zval func_name;
zval *retval = NULL;
-   zval **args[1];
php_userstream_data_t *us = (php_userstream_data_t *)stream-abstract;
 
ZVAL_STRINGL(func_name, USERSTREAM_DIR_REWIND, 
sizeof(USERSTREAM_DIR_REWIND)-1, 0);

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

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

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

[PHP-CVS] cvs: php-src /ext/mysqli mysqli_api.c mysqli_nonapi.c

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

[PHP-CVS] cvs: php-src /ext/dba README

[PHP-CVS] cvs: php-src(PHP_4_3) /ext/dba README

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

[PHP-CVS] cvs: php-src /ext/mysqli mysqli_api.c mysqli_fe.c

[PHP-CVS] cvs: php-src /ext/yaz config.m4 php_yaz.c php_yaz.h

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

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

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

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

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

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

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

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

[PHP-CVS] cvs: CVSROOT / avail

[PHP-CVS] cvs: CVSROOT / modules

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

[PHP-CVS] cvs: php-src / NEWS /ext/spl spl_iterators.c /ext/spl/tests limititerator.phpt

[PHP-CVS] cvs: php-src /ext/spl/tests limititerator.phpt

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

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

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

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

26 matches

Site Navigation

Mail list logo

Footer information