date:20031009

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

2003-10-09 Thread changelog

changelog   Thu Oct  9 20:33:50 2003 EDT

  Modified files:  
/php-srcChangeLog 
  Log:
  ChangeLog update
  
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.1412 php-src/ChangeLog:1.1413
--- php-src/ChangeLog:1.1412Wed Oct  8 20:33:42 2003
+++ php-src/ChangeLog   Thu Oct  9 20:33:48 2003
@@ -1,3 +1,57 @@
+2003-10-09  Zeev Suraski  [EMAIL PROTECTED]
+
+* ZendEngine2/zend_compile.c
+  ZendEngine2/zend_execute.c
+  ZendEngine2/zend_language_parser.y:
+  Allow foo::$bar()
+
+2003-10-09  Andrey Hristov  [EMAIL PROTECTED]
+
+* NEWS:
+  typo
+
+2003-10-09  Jani Taskinen  [EMAIL PROTECTED]
+
+* NEWS:
+  cleanup
+
+2003-10-09  Andrey Hristov  [EMAIL PROTECTED]
+
+* ext/standard/array.c
+  ext/standard/basic_functions.c
+  ext/standard/php_array.h
+  ext/standard/tests/array/array_intersect_1.phpt:
+  New array functions for doing intersection of arrays that are complementary
+  to array_*diff* family of functions. Namely array_uintersect(),
+  array_uintersect_assoc(),
+  array_intersect_uassoc() and array_uintersect_uassoc(). Test case is also
+  included.
+
+* NEWS:
+  new functions NEWS entry
+
+2003-10-09  Shane Caraveo  [EMAIL PROTECTED]
+
+* ext/dom/examples/note.xml:
+  add the valid xml test
+
+* ext/dom/examples/note-invalid.xml
+  ext/dom/examples/note.dtd
+  ext/dom/examples/note.php:
+  add a DTD example
+
+2003-10-09  Ilia Alshanetsky  [EMAIL PROTECTED]
+
+* (PHP_4_3)
+  NEWS
+  main/main.c:
+  MFH: Fixed bug #25746 (Do not bail out when unable to chdir original dir on
+  systems with broken getcwd()).
+
+* main/main.c:
+  Fixed bug #25746 (Do not bail out when unable to chdir original dir on
+  systems with broken getcwd()).
+
 2003-10-08  Wez Furlong  [EMAIL PROTECTED]
 
 * ext/openssl/xp_ssl.c:

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

2003-10-09 Thread changelog

changelog   Thu Oct  9 20:33:54 2003 EDT

  Modified files:  
/ZendEngine2ChangeLog 
  Log:
  ChangeLog update
  
Index: ZendEngine2/ChangeLog
diff -u ZendEngine2/ChangeLog:1.314 ZendEngine2/ChangeLog:1.315
--- ZendEngine2/ChangeLog:1.314 Tue Oct  7 20:33:46 2003
+++ ZendEngine2/ChangeLog   Thu Oct  9 20:33:53 2003
@@ -1,3 +1,10 @@
+2003-10-09  Zeev Suraski  [EMAIL PROTECTED]
+
+* zend_compile.c
+  zend_execute.c
+  zend_language_parser.y:
+  Allow foo::$bar()
+
 2003-10-07  Rasmus Lerdorf  [EMAIL PROTECTED]
 
 * Zend.m4:
@@ -1728,7 +1735,7 @@
 2003-06-10  Jani Taskinen  [EMAIL PROTECTED]
 
 * zend_multiply.h:
-  - Missing $Id: ChangeLog,v 1.314 2003/10/08 00:33:46 changelog Exp $ tag
+  - Missing $Id: ChangeLog,v 1.315 2003/10/10 00:33:53 changelog Exp $ tag
 
 2003-06-10  James Cox  [EMAIL PROTECTED]
 
@@ -3452,7 +3459,7 @@
   zend_types.h
   zend_variables.c
   zend_variables.h:
-  - Added some missing CVS $Id: ChangeLog,v 1.314 2003/10/08 00:33:46 changelog 
Exp $ tags, headers and footers.
+  - Added some missing CVS $Id: ChangeLog,v 1.315 2003/10/10 00:33:53 changelog 
Exp $ tags, headers and footers.
 
 2003-01-30  Ilia Alshanetsky  [EMAIL PROTECTED]

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

2003-10-09 Thread Andrey Hristov

andrey  Thu Oct  9 03:35:19 2003 EDT

  Modified files:  
/php-srcNEWS 
  Log:
  new functions NEWS entry
  
  
Index: php-src/NEWS
diff -u php-src/NEWS:1.1474 php-src/NEWS:1.1475
--- php-src/NEWS:1.1474 Wed Oct  8 07:16:54 2003
+++ php-src/NEWSThu Oct  9 03:35:18 2003
@@ -4,6 +4,11 @@
 
 ?? ??? 2003, PHP 5 Beta 2
 - Added new COM extension with integrated .Net support. (Wez)
+- Added new array functions : 
+  . array_udiff()(Andrey)
+  . array_udiff_assoc()  (Andrey)
+  . array_udiff_uassoc() (Andrey)
+  . array_diff_uassoc()  (Andrey)
 - Improved the DBX extension: (Marc)
   . Added DBX_RESULT_UNBUFFERED flag for dbx_query().
   . Added dbx_fetch_row()

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

[PHP-CVS] cvs: php-src /ext/standard array.c basic_functions.c php_array.h /ext/standard/tests/array array_intersect_1.phpt

2003-10-09 Thread Andrey Hristov

andrey  Thu Oct  9 04:10:40 2003 EDT

  Added files: 
/php-src/ext/standard/tests/array   array_intersect_1.phpt 

  Modified files:  
/php-src/ext/standard   array.c basic_functions.c php_array.h 
  Log:
  New array functions for doing intersection of arrays that are complementary
  to array_*diff* family of functions. Namely array_uintersect(), 
array_uintersect_assoc(), 
  array_intersect_uassoc() and array_uintersect_uassoc(). Test case is also included.
  #docs and news entry later.
  
  Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.253 php-src/ext/standard/array.c:1.254
--- php-src/ext/standard/array.c:1.253  Sun Oct  5 15:37:02 2003
+++ php-src/ext/standard/array.cThu Oct  9 04:10:37 2003
@@ -21,7 +21,7 @@
+--+
 */
 
-/* $Id: array.c,v 1.253 2003/10/05 19:37:02 iliaa Exp $ */
+/* $Id: array.c,v 1.254 2003/10/09 08:10:37 andrey Exp $ */
 
 #include php.h
 #include php_ini.h
@@ -84,6 +84,10 @@
 
 #define INTERSECT_NORMAL   0
 #define INTERSECT_ASSOC1
+#define INTERSECT_COMP_DATA_INTERNAL 0
+#define INTERSECT_COMP_DATA_USER 1
+#define INTERSECT_COMP_KEY_INTERNAL  0
+#define INTERSECT_COMP_KEY_USER  1
 
 #define DOUBLE_DRIFT_FIX   0.001
 
@@ -2712,47 +2716,177 @@
 }
 /* }}} */
 
-static void php_array_intersect(INTERNAL_FUNCTION_PARAMETERS, int behavior)
+static void php_array_intersect(INTERNAL_FUNCTION_PARAMETERS, int behavior, int 
data_compare_type, int key_compare_type)
 {
zval ***args = NULL;
HashTable *hash;
-   int argc, i, c = 0;
+   int argc, arr_argc, i, c = 0;
Bucket ***lists, **list, ***ptrs, *p;
+   
+   char *callback_name;
+   zval **old_compare_func;
+   
+   int (*intersect_key_compare_func)(const void *, const void * TSRMLS_DC);
+   int (*intersect_data_compare_func)(const void *, const void * TSRMLS_DC);
 
-   /* Get the argument count and check it */   
+   /* Get the argument count */
argc = ZEND_NUM_ARGS();
-   if (argc  2) {
-   WRONG_PARAM_COUNT;
-   }
/* Allocate arguments array and get the arguments, checking for errors. */
args = (zval ***)safe_emalloc(argc, sizeof(zval **), 0);
if (zend_get_parameters_array_ex(argc, args) == FAILURE) {
efree(args);
WRONG_PARAM_COUNT;
}
+
+   old_compare_func = BG(user_compare_func_name);
+
+   if (behavior == INTERSECT_NORMAL) {
+   intersect_key_compare_func = array_key_compare;
+   if (data_compare_type == INTERSECT_COMP_DATA_INTERNAL) {
+   /* array_intersect() */
+
+   if (argc  2) {
+   efree(args);
+   WRONG_PARAM_COUNT;
+   }
+   arr_argc = argc;
+   intersect_data_compare_func = array_data_compare;
+   } else if (data_compare_type == INTERSECT_COMP_DATA_USER) {
+   /* array_uintersect() */
+   if (argc  3) {
+   efree(args);
+   WRONG_PARAM_COUNT;
+   }
+   arr_argc = argc - 1;
+   intersect_data_compare_func = array_user_compare;
+   if (!zend_is_callable(*args[arr_argc], 0, callback_name)) {
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Not a 
valid callback %s, callback_name);
+   efree(callback_name);
+   efree(args);
+   return;
+   }
+   efree(callback_name);
+   
+   BG(user_compare_func_name) = args[arr_argc];
+   } else {
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, data_compare_type 
is %d. This should never happen. Please report as a bug, data_compare_type);
+   return;
+   }
+   } else if (behavior == INTERSECT_ASSOC) {
+   intersect_key_compare_func = array_key_compare;
+   if (data_compare_type == INTERSECT_COMP_DATA_INTERNAL
+   
+   key_compare_type == INTERSECT_COMP_KEY_INTERNAL) {
+   /* array_intersect_assoc() */
+   
+   if (argc  2) {
+   efree(args);
+   WRONG_PARAM_COUNT;
+   }
+   arr_argc = argc;
+   intersect_key_compare_func = array_key_compare;
+   intersect_data_compare_func = array_data_compare;
+   } else if (data_compare_type ==

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

2003-10-09 Thread Jani Taskinen

sniper  Thu Oct  9 07:05:22 2003 EDT

  Modified files:  
/php-srcNEWS 
  Log:
  cleanup
  
Index: php-src/NEWS
diff -u php-src/NEWS:1.1475 php-src/NEWS:1.1476
--- php-src/NEWS:1.1475 Thu Oct  9 03:35:18 2003
+++ php-src/NEWSThu Oct  9 07:05:21 2003
@@ -3,12 +3,6 @@
 ?? ??? 200?, Version 5.0.0
 
 ?? ??? 2003, PHP 5 Beta 2
-- Added new COM extension with integrated .Net support. (Wez)
-- Added new array functions : 
-  . array_udiff()(Andrey)
-  . array_udiff_assoc()  (Andrey)
-  . array_udiff_uassoc() (Andrey)
-  . array_diff_uassoc()  (Andrey)
 - Improved the DBX extension: (Marc)
   . Added DBX_RESULT_UNBUFFERED flag for dbx_query().
   . Added dbx_fetch_row()
@@ -26,19 +20,23 @@
   . Added ibase_param_info()
   . Added ibase_wait_event()
   . Added ibase_set_event_handler() and ibase_free_event_handler()
-- Added misc. new functions:
+- Added new COM extension with integrated .Net support. (Wez)
+- Added new functions:
   . setrawcookie(). (Brian)
   . pg_version(). (Marcus)
   . dbase_get_header_info(). (Zak)
   . snmp_read_mib(). (Jani)
   . http_build_query(). (Sara)
   . ftp_alloc(). (Sara)
-- Changed fgetcsv() in order for the second parameter to be optional.
-  (Moriyoshi)
+  . array_udiff(). (Andrey)
+  . array_udiff_assoc(). (Andrey)
+  . array_udiff_uassoc(). (Andrey)
+  . array_diff_uassoc(). (Andrey)
 - Added resume_pos context option to ftp://; wrapper. (Sara)
 - Added optional parameter to OCIWriteTemporaryLob() to specify the type of LOB
   (Patch by Novicky Marek [EMAIL PROTECTED]). (Thies)
 - Added reflection API. (Andrei, George, Timm)
+- Changed length parameter in fgetcsv() to be optional. (Moriyoshi)
 - Fixed fgetcsv() to correctly handle international (non-ascii) characters.
   (Moriyoshi)
 - Fixed support for ![CDATA[]] fields within XML documents in ext/xml. 

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

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

2003-10-09 Thread Andrey Hristov

andrey  Thu Oct  9 07:26:41 2003 EDT

  Modified files:  
/php-srcNEWS 
  Log:
  typo
  
  
Index: php-src/NEWS
diff -u php-src/NEWS:1.1476 php-src/NEWS:1.1477
--- php-src/NEWS:1.1476 Thu Oct  9 07:05:21 2003
+++ php-src/NEWSThu Oct  9 07:26:40 2003
@@ -47,7 +47,7 @@
 - Fixed bug #24766 (strange result array from unpack()). (Moriyoshi)
 - Fixed bug #24729 ($obj = new $className; causes crash when $className is not 
   set). (Marcus)
-- Fixed bug #24565 (cannot read array elements recived via $_REQUEST). (Zeev)
+- Fixed bug #24565 (cannot read array elements received via $_REQUEST). (Zeev)
 - Fixed bug #24445 (get_parent_class() returns different values).
   (Sterling, Stanislav)
 - Fixed bug #24403 (preg_replace() problem: Using $this when not in object 

-- 
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 /ext/standard file.c

2003-10-09 Thread Ilia Alshanetsky

iliaa   Thu Oct  9 21:38:04 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/standard   file.c 
/php-srcNEWS 
  Log:
  Fixed bug #25814 (Make flock() return correct value when 3rd argument is
  used).
  
  # This bug is 4.3.X specific, no need to MFB into 5.X tree.
  
  
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.279.2.37 php-src/ext/standard/file.c:1.279.2.38
--- php-src/ext/standard/file.c:1.279.2.37  Mon Sep 29 10:04:16 2003
+++ php-src/ext/standard/file.c Thu Oct  9 21:38:01 2003
@@ -21,7 +21,7 @@
+--+
  */
 
-/* $Id: file.c,v 1.279.2.37 2003/09/29 14:04:16 stas Exp $ */
+/* $Id: file.c,v 1.279.2.38 2003/10/10 01:38:01 iliaa Exp $ */
 
 /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
 
@@ -226,7 +226,7 @@
 PHP_FUNCTION(flock)
 {
zval **arg1, **arg2, **arg3;
-   int fd, act, ret, arg_count = ZEND_NUM_ARGS();
+   int fd, act, arg_count = ZEND_NUM_ARGS();
php_stream *stream;
 
if (arg_count  2 || arg_count  3 || zend_get_parameters_ex(arg_count, arg1, 
arg2, arg3) == FAILURE) {
@@ -250,11 +250,12 @@
/* flock_values contains all possible actions
   if (arg2  4) we won't block on the lock */
act = flock_values[act - 1] | (Z_LVAL_PP(arg2)  4 ? LOCK_NB : 0);
-   if ((ret=flock(fd, act)) == -1) {
-   RETURN_FALSE;
-   }
-   if(ret == -1  errno == EWOULDBLOCK  arg_count == 3) {
-   ZVAL_LONG(*arg3, 1);
+   if (flock(fd, act)) {
+   if (errno == EWOULDBLOCK  arg_count == 3) {
+   ZVAL_LONG(*arg3, 1);
+   } else {
+   RETURN_FALSE;
+   }   
}
RETURN_TRUE;
 }
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.432 php-src/NEWS:1.1247.2.433
--- php-src/NEWS:1.1247.2.432   Wed Oct  8 22:59:02 2003
+++ php-src/NEWSThu Oct  9 21:38:02 2003
@@ -3,6 +3,8 @@
 ?? Oct 2003, Version 4.3.4RC2
 - Fixed multibyte regex engine to properly handle .* pattern under
   POSIX compatible mode. (K.Kosako kosako at sofnec.co.jp, Moriyoshi)
+- Fixed bug #25814 (Make flock() return correct value when 3rd argument is
+  used). (Ilia)
 - Fixed bug #25780 (ext/session: invalid session.cookie_lifetime makes 
   session_start() to crash in win32). (Jani)
 - Fixed bug #25770 (Segfault with PHP and bison 1.875). ([EMAIL PROTECTED], Marcus)

-- 
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 / NEWS

[PHP-CVS] cvs: php-src /ext/standard array.c basic_functions.c php_array.h /ext/standard/tests/array array_intersect_1.phpt

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

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

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

7 matches

Site Navigation

Mail list logo

Footer information