date:20051024

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

2005-10-24 Thread changelog

changelog   Tue Oct 25 01:46:22 2005 EDT

  Modified files:  
/php-srcChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/diff.php/php-src/ChangeLog?r1=1.2142r2=1.2143ty=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.2142 php-src/ChangeLog:1.2143
--- php-src/ChangeLog:1.2142Mon Oct 24 01:39:02 2005
+++ php-src/ChangeLog   Tue Oct 25 01:45:43 2005
@@ -1,3 +1,53 @@
+2005-10-24  Jani Taskinen  [EMAIL PROTECTED]
+
+* ext/ldap/config.m4:
+  fix build
+
+2005-10-24  Antony Dovgal  [EMAIL PROTECTED]
+
+* (PHP_5_0)
+  ext/ldap/config.m4
+  ext/ldap/config.m4:
+  MFH: fix #34970 (ldap configuration issues)
+
+* ext/ldap/config.m4:
+  fix #34970 (ldap configuration issues)
+
+2005-10-24  Rolland Santimano  [EMAIL PROTECTED]
+
+* unicode-progress.txt:
+  - strip_tags(), str[c]spn(), strpbrk(), strrchr(), strrpos(), strtok()
+
+* ext/standard/string.c:
+  - Unicode impl of strrchr()
+
+2005-10-24  Marcus Boerger  [EMAIL PROTECTED]
+
+* (PHP_5_1)
+  ext/simplexml/simplexml.c
+  ext/simplexml/tests/023.phpt:
+  - Fix issue with entities in attributes
+
+2005-10-24  Dmitry Stogov  [EMAIL PROTECTED]
+
+* (PHP_5_0)
+  NEWS
+  NEWS:
+  Fixed bug #34950 (Unable to get WSDL through proxy)
+
+* ZendEngine2/zend_language_scanner.l:
+  Unicode support (bug #31341)
+
+* ext/standard/array.c
+  ext/standard/tests/array/bug34934.phpt:
+  Reverted fix for bug #34934. The bug marked as bogus.
+
+* (PHP_5_1)
+  NEWS
+  ext/standard/array.c
+  ext/standard/tests/array/bug34934.phpt:
+  Reverted patch for bug #34934. Bug is marked as bogus.
+
 2005-10-23  Marcus Boerger  [EMAIL PROTECTED]
 
 * ext/simplexml/simplexml.c
@@ -14680,7 +14730,7 @@
 
 * (PHP_4_3)
   ext/standard/url_scanner_ex.re:
-  Missing $Id: ChangeLog,v 1.2142 2005/10/24 05:39:02 changelog Exp $ tag
+  Missing $Id: ChangeLog,v 1.2143 2005/10/25 05:45:43 changelog Exp $ tag
 
 * (PHP_5_0)
   ext/standard/url_scanner_ex.c:
@@ -18081,7 +18131,7 @@
   ext/session/mod_mm.h
   ext/session/mod_user.h
   ext/session/php_session.h:
-  - Missing $Id: ChangeLog,v 1.2142 2005/10/24 05:39:02 changelog Exp $ 
tags
+  - Missing $Id: ChangeLog,v 1.2143 2005/10/25 05:45:43 changelog Exp $ 
tags
 
 * (PHP_4_3)
   ext/session/session.c:
@@ -18562,7 +18612,7 @@
 
 * (PHP_4_3)
   Zend/zend_ini_scanner.l:
-  Missing $Id: ChangeLog,v 1.2142 2005/10/24 05:39:02 changelog Exp $ tag 
+ ws fix
+  Missing $Id: ChangeLog,v 1.2143 2005/10/25 05:45:43 changelog Exp $ tag 
+ ws fix
 
 * ZendEngine2/zend_ini_scanner.l
   ZendEngine2/zend_ini_scanner.l:
@@ -20036,7 +20086,7 @@
   ext/standard/url_scanner_ex.c
   ext/standard/url_scanner_ex.h
   ext/standard/url_scanner_ex.re:
-  Missing $Id: ChangeLog,v 1.2142 2005/10/24 05:39:02 changelog Exp $ tag
+  Missing $Id: ChangeLog,v 1.2143 2005/10/25 05:45:43 changelog Exp $ tag
 
 * ext/standard/credits_ext.h
   ext/standard/credits_sapi.h:

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

2005-10-24 Thread changelog

changelog   Tue Oct 25 01:47:14 2005 EDT

  Modified files:  
/ZendEngine2ChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/diff.php/ZendEngine2/ChangeLog?r1=1.798r2=1.799ty=u
Index: ZendEngine2/ChangeLog
diff -u ZendEngine2/ChangeLog:1.798 ZendEngine2/ChangeLog:1.799
--- ZendEngine2/ChangeLog:1.798 Sat Oct 22 01:39:36 2005
+++ ZendEngine2/ChangeLog   Tue Oct 25 01:47:13 2005
@@ -1,3 +1,8 @@
+2005-10-24  Dmitry Stogov  [EMAIL PROTECTED]
+
+* zend_language_scanner.l:
+  Unicode support (bug #31341)
+
 2005-10-21  Dmitry Stogov  [EMAIL PROTECTED]
 
 * zend_language_scanner.l
@@ -10843,7 +10848,7 @@
 2003-06-10  Jani Taskinen  [EMAIL PROTECTED]
 
 * zend_multiply.h:
-  - Missing $Id: ChangeLog,v 1.798 2005/10/22 05:39:36 changelog Exp $ tag
+  - Missing $Id: ChangeLog,v 1.799 2005/10/25 05:47:13 changelog Exp $ tag
 
 2003-06-10  James Cox  [EMAIL PROTECTED]
 
@@ -12567,7 +12572,7 @@
   zend_types.h
   zend_variables.c
   zend_variables.h:
-  - Added some missing CVS $Id: ChangeLog,v 1.798 2005/10/22 05:39:36 
changelog Exp $ tags, headers and footers.
+  - Added some missing CVS $Id: ChangeLog,v 1.799 2005/10/25 05:47:13 
changelog Exp $ tags, headers and footers.
 
 2003-01-30  Ilia Alshanetsky  [EMAIL PROTECTED]

[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/standard array.c /ext/standard/tests/array bug34934.phpt

2005-10-24 Thread Dmitry Stogov

dmitry  Mon Oct 24 02:58:42 2005 EDT

  Removed files:   (Branch: PHP_5_1)
/php-src/ext/standard/tests/array   bug34934.phpt 

  Modified files:  
/php-srcNEWS 
/php-src/ext/standard   array.c 
  Log:
  Reverted patch for bug #34934. Bug is marked as bogus.
  
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.155r2=1.2027.2.156ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.155 php-src/NEWS:1.2027.2.156
--- php-src/NEWS:1.2027.2.155   Sun Oct 23 14:34:25 2005
+++ php-src/NEWSMon Oct 24 02:58:39 2005
@@ -5,7 +5,6 @@
 - Fixed bug #34957 (PHP doesn't respect ACLs for access checks). (Wez)
 - Fixed bug #34938 (dns_get_record() doesn't resolve long hostnames and 
   leaks). (Tony)
-- Fixed bug #34934 (offsetExists is not called from array_key_exists). (Dmitry)
 - Fixed bug #34905 (Digest authentication does not work with Apache 1). (Ilia)
 - Fixed bug #34902 (mysqli::character_set_name() - undefined method). (Tony)
 - Fixed bug #34893 (PHP5.1 overloading, Cannot access private property).
http://cvs.php.net/diff.php/php-src/ext/standard/array.c?r1=1.308.2.8r2=1.308.2.9ty=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.308.2.8 
php-src/ext/standard/array.c:1.308.2.9
--- php-src/ext/standard/array.c:1.308.2.8  Fri Oct 21 11:53:22 2005
+++ php-src/ext/standard/array.cMon Oct 24 02:58:41 2005
@@ -21,7 +21,7 @@
+--+
 */
 
-/* $Id: array.c,v 1.308.2.8 2005/10/21 15:53:22 tony2001 Exp $ */
+/* $Id: array.c,v 1.308.2.9 2005/10/24 06:58:41 dmitry Exp $ */
 
 #include php.h
 #include php_ini.h
@@ -4390,17 +4390,6 @@
RETURN_FALSE;
}
 
-   if (Z_TYPE_PP(array) == IS_OBJECT 
-   Z_OBJ_HT_PP(array)-has_dimension 
-   (Z_OBJ_HT_PP(array)-has_dimension != 
std_object_handlers.has_dimension ||
-instanceof_function_ex(Z_OBJCE_PP(array), zend_ce_arrayaccess, 1 
TSRMLS_CC))) {
-   if (Z_OBJ_HT_PP(array)-has_dimension(*array, *key, 0 
TSRMLS_CC)) {
-   RETURN_TRUE;
-   } else {
-   RETURN_FALSE;
-   }
-   }
-
switch (Z_TYPE_PP(key)) {
case IS_STRING:
if (zend_symtable_exists(HASH_OF(*array), 
Z_STRVAL_PP(key), Z_STRLEN_PP(key)+1)) {

-- 
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 /ext/standard/tests/array bug34934.phpt

2005-10-24 Thread Dmitry Stogov

dmitry  Mon Oct 24 03:01:44 2005 EDT

  Removed files:   
/php-src/ext/standard/tests/array   bug34934.phpt 

  Modified files:  
/php-src/ext/standard   array.c 
  Log:
  Reverted fix for bug #34934. The bug marked as bogus.
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/array.c?r1=1.329r2=1.330ty=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.329 php-src/ext/standard/array.c:1.330
--- php-src/ext/standard/array.c:1.329  Fri Oct 21 11:54:46 2005
+++ php-src/ext/standard/array.cMon Oct 24 03:01:42 2005
@@ -21,7 +21,7 @@
+--+
 */
 
-/* $Id: array.c,v 1.329 2005/10/21 15:54:46 tony2001 Exp $ */
+/* $Id: array.c,v 1.330 2005/10/24 07:01:42 dmitry Exp $ */
 
 #include php.h
 #include php_ini.h
@@ -4658,17 +4658,6 @@
RETURN_FALSE;
}
 
-   if (Z_TYPE_PP(array) == IS_OBJECT 
-   Z_OBJ_HT_PP(array)-has_dimension 
-   (Z_OBJ_HT_PP(array)-has_dimension != 
std_object_handlers.has_dimension ||
-instanceof_function_ex(Z_OBJCE_PP(array), 
U_CLASS_ENTRY(zend_ce_arrayaccess), 1 TSRMLS_CC))) {
-   if (Z_OBJ_HT_PP(array)-has_dimension(*array, *key, 0 
TSRMLS_CC)) {
-   RETURN_TRUE;
-   } else {
-   RETURN_FALSE;
-   }
-   }
-
switch (Z_TYPE_PP(key)) {
case IS_STRING:
case IS_UNICODE:

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

RE: [PHP-CVS] cvs: php-src /ext/standard array.c /ext/standard/tests/array bug34934.phpt

2005-10-24 Thread Dmitry Stogov

Hi Marcus,

Thank you for catch.
I reverted the patch and marked bug as bogus.

Dmitry.

 -Original Message-
 From: Marcus Boerger [mailto:[EMAIL PROTECTED] 
 Sent: Friday, October 21, 2005 10:01 PM
 To: Dmitry Stogov
 Cc: php-cvs@lists.php.net
 Subject: Re: [PHP-CVS] cvs: php-src /ext/standard array.c 
 /ext/standard/tests/array bug34934.phpt
 
 
 Hello Dmitry,
 
   this is wrong! We agreed upon not allowing ArrayAccess in 
 array* functions. If you change this then change the macros 
 in array.c from Z_ARRVAL to HASH_OF and ensure that all 
 functions also work with ArrayAccess. Since you cannot do 
 that you might probably explain why the bug report is bogus!
 
 marcus
   
 
 Friday, October 21, 2005, 5:20:31 PM, you wrote:
 
  dmitry  Fri Oct 21 11:20:31 2005 EDT
 
Modified files:  
  /php-src/ext/standard   array.c 
  /php-src/ext/standard/tests/array   bug34934.phpt 
Log:
Fixed bug #34934 (offsetExists is not called from 
 array_key_exists)


  
 http://cvs.php.net/diff.php/php-src/ext/standard/array.c?r1=1.327r2=1
  .328ty=u
  Index: php-src/ext/standard/array.c
  diff -u php-src/ext/standard/array.c:1.327 
 php-src/ext/standard/array.c:1.328
  --- php-src/ext/standard/array.c:1.327  Tue Oct  4 16:47:48 2005
  +++ php-src/ext/standard/array.cFri Oct 21 11:20:30 2005
  @@ -21,7 +21,7 @@
  
  
 +-
 -+
   */
   
  -/* $Id: array.c,v 1.327 2005/10/04 20:47:48 tony2001 Exp $ */
  +/* $Id: array.c,v 1.328 2005/10/21 15:20:30 dmitry Exp $ */
   
   #include php.h
   #include php_ini.h
  @@ -4658,6 +4658,17 @@
  RETURN_FALSE;
  }
   
  +   if (Z_TYPE_PP(array) == IS_OBJECT 
  +   Z_OBJ_HT_PP(array)-has_dimension 
  +   (Z_OBJ_HT_PP(array)-has_dimension != 
 std_object_handlers.has_dimension ||
  +instanceof_function_ex(Z_OBJCE_PP(array),
  U_CLASS_ENTRY(zend_ce_arrayaccess), 1 TSRMLS_CC))) {
  + if (Z_OBJ_HT_PP(array)-has_dimension(*array, 
 *key, 0 TSRMLS_CC)) {
  +   RETURN_TRUE;
  + } else {
  +   RETURN_FALSE;
  + }
  +   }
  +
  switch (Z_TYPE_PP(key)) {
  case IS_STRING:
  case IS_UNICODE: 
  
 http://cvs.php.net/diff.php/php-src/ext/standard/tests/array/bug34934.
  phpt?r1=1.1r2=1.2ty=u
  Index: php-src/ext/standard/tests/array/bug34934.phpt
  diff -u /dev/null php-src/ext/standard/tests/array/bug34934.phpt:1.2
  --- /dev/null   Fri Oct 21 11:20:31 2005
  +++ php-src/ext/standard/tests/array/bug34934.phpt  Fri 
 Oct 21 11:20:30 2005
  @@ -0,0 +1,18 @@
  +--TEST--
  +Bug #34934 (offsetExists is not called from array_key_exists)
  +--FILE--
  +?php
  +class MyArray extends ArrayObject {
  +  function offsetExists($mKey) { 
  +   echo __METHOD__ . ($mKey)\n;
  +   return true;
  +  }
  +}
  +
  +$a = new MyArray();
  +
  +var_dump(array_key_exists(test, $a));
 +?
  +--EXPECT--
  +MyArray::offsetExists(test)
  +bool(true)
 
 
 
 
 Best regards,
  Marcus
 
 

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

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

2005-10-24 Thread Dmitry Stogov

dmitry  Mon Oct 24 03:43:51 2005 EDT

  Modified files:  
/php-src/ext/soap   php_sdl.c 
  Log:
  Fixed bug #34950 (Unable to get WSDL through proxy)
  
  
http://cvs.php.net/diff.php/php-src/ext/soap/php_sdl.c?r1=1.88r2=1.89ty=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.88 php-src/ext/soap/php_sdl.c:1.89
--- php-src/ext/soap/php_sdl.c:1.88 Wed Aug  3 10:07:48 2005
+++ php-src/ext/soap/php_sdl.c  Mon Oct 24 03:43:48 2005
@@ -17,7 +17,7 @@
   |  Dmitry Stogov [EMAIL PROTECTED] |
   +--+
 */
-/* $Id: php_sdl.c,v 1.88 2005/08/03 14:07:48 sniper Exp $ */
+/* $Id: php_sdl.c,v 1.89 2005/10/24 07:43:48 dmitry Exp $ */
 
 #include php_soap.h
 #include ext/libxml/php_libxml.h
@@ -2235,6 +2235,7 @@
smart_str_appends(proxy,Z_STRVAL_PP(proxy_host));
smart_str_appends(proxy,:);
smart_str_appends(proxy,Z_STRVAL(str_port));
+   smart_str_0(proxy);
zval_dtor(str_port);
MAKE_STD_ZVAL(str_proxy);
ZVAL_STRING(str_proxy, proxy.c, 1);
@@ -2246,6 +2247,11 @@
php_stream_context_set_option(context, http, proxy, 
str_proxy);
zval_ptr_dtor(str_proxy);
 
+   MAKE_STD_ZVAL(str_proxy);
+   ZVAL_BOOL(str_proxy, 1);
+   php_stream_context_set_option(context, http, 
request_fulluri, str_proxy);
+   zval_ptr_dtor(str_proxy);
+
proxy_authentication(this_ptr, headers 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_5_1) / NEWS /ext/soap php_sdl.c

2005-10-24 Thread Dmitry Stogov

dmitry  Mon Oct 24 03:44:17 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-srcNEWS 
/php-src/ext/soap   php_sdl.c 
  Log:
  Fixed bug #34950 (Unable to get WSDL through proxy)
  
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.156r2=1.2027.2.157ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.156 php-src/NEWS:1.2027.2.157
--- php-src/NEWS:1.2027.2.156   Mon Oct 24 02:58:39 2005
+++ php-src/NEWSMon Oct 24 03:44:11 2005
@@ -3,6 +3,7 @@
 ?? Oct 2005, PHP 5.1 Release Candidate 4
 - Fixed fgetcsv() and fputcsv() inconsistency. (Dmitry)
 - Fixed bug #34957 (PHP doesn't respect ACLs for access checks). (Wez)
+- Fixed bug #34950 (Unable to get WSDL through proxy). (Dmitry)
 - Fixed bug #34938 (dns_get_record() doesn't resolve long hostnames and 
   leaks). (Tony)
 - Fixed bug #34905 (Digest authentication does not work with Apache 1). (Ilia)
http://cvs.php.net/diff.php/php-src/ext/soap/php_sdl.c?r1=1.88r2=1.88.2.1ty=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.88 php-src/ext/soap/php_sdl.c:1.88.2.1
--- php-src/ext/soap/php_sdl.c:1.88 Wed Aug  3 10:07:48 2005
+++ php-src/ext/soap/php_sdl.c  Mon Oct 24 03:44:17 2005
@@ -17,7 +17,7 @@
   |  Dmitry Stogov [EMAIL PROTECTED] |
   +--+
 */
-/* $Id: php_sdl.c,v 1.88 2005/08/03 14:07:48 sniper Exp $ */
+/* $Id: php_sdl.c,v 1.88.2.1 2005/10/24 07:44:17 dmitry Exp $ */
 
 #include php_soap.h
 #include ext/libxml/php_libxml.h
@@ -2235,6 +2235,7 @@
smart_str_appends(proxy,Z_STRVAL_PP(proxy_host));
smart_str_appends(proxy,:);
smart_str_appends(proxy,Z_STRVAL(str_port));
+   smart_str_0(proxy);
zval_dtor(str_port);
MAKE_STD_ZVAL(str_proxy);
ZVAL_STRING(str_proxy, proxy.c, 1);
@@ -2246,6 +2247,11 @@
php_stream_context_set_option(context, http, proxy, 
str_proxy);
zval_ptr_dtor(str_proxy);
 
+   MAKE_STD_ZVAL(str_proxy);
+   ZVAL_BOOL(str_proxy, 1);
+   php_stream_context_set_option(context, http, 
request_fulluri, str_proxy);
+   zval_ptr_dtor(str_proxy);
+
proxy_authentication(this_ptr, headers 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_5_0) / NEWS /ext/soap php_sdl.c

2005-10-24 Thread Dmitry Stogov

dmitry  Mon Oct 24 03:45:50 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-srcNEWS 
/php-src/ext/soap   php_sdl.c 
  Log:
  Fixed bug #34950 (Unable to get WSDL through proxy)
  
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.504r2=1.1760.2.505ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.504 php-src/NEWS:1.1760.2.505
--- php-src/NEWS:1.1760.2.504   Sun Oct 23 14:35:19 2005
+++ php-src/NEWSMon Oct 24 03:45:48 2005
@@ -4,6 +4,7 @@
 - Fixed an error in mysqli_fetch_fields (returned NULL instead of an
   array when row number  field_count). (Georg)
 - Renamed CachingRecursiveIterator to RecursiveCachingIterator. (Marcus)
+- Fixed bug #34950 (Unable to get WSDL through proxy). (Dmitry)
 - Fixed bug #34938 (dns_get_record() doesn't resolve long hostnames and 
   leaks). (Tony)
 - Fixed bug #34856 (configure fails to detect libiconv's type). (Tony)
http://cvs.php.net/diff.php/php-src/ext/soap/php_sdl.c?r1=1.70.2.12r2=1.70.2.13ty=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.70.2.12 
php-src/ext/soap/php_sdl.c:1.70.2.13
--- php-src/ext/soap/php_sdl.c:1.70.2.12Fri Jul  8 05:36:42 2005
+++ php-src/ext/soap/php_sdl.c  Mon Oct 24 03:45:49 2005
@@ -17,7 +17,7 @@
   |  Dmitry Stogov [EMAIL PROTECTED] |
   +--+
 */
-/* $Id: php_sdl.c,v 1.70.2.12 2005/07/08 09:36:42 dmitry Exp $ */
+/* $Id: php_sdl.c,v 1.70.2.13 2005/10/24 07:45:49 dmitry Exp $ */
 
 #include php_soap.h
 #include ext/libxml/php_libxml.h
@@ -2230,6 +2230,7 @@
smart_str_appends(proxy,Z_STRVAL_PP(proxy_host));
smart_str_appends(proxy,:);
smart_str_appends(proxy,Z_STRVAL(str_port));
+   smart_str_0(proxy);
zval_dtor(str_port);
MAKE_STD_ZVAL(str_proxy);
ZVAL_STRING(str_proxy, proxy.c, 1);
@@ -2239,6 +2240,11 @@
php_stream_context_set_option(context, http, proxy, 
str_proxy);
zval_ptr_dtor(str_proxy);
 
+   MAKE_STD_ZVAL(str_proxy);
+   ZVAL_BOOL(str_proxy, 1);
+   php_stream_context_set_option(context, http, 
request_fulluri, str_proxy);
+   zval_ptr_dtor(str_proxy);
+
proxy_authentication(this_ptr, headers 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_5_1) /ext/simplexml simplexml.c /ext/simplexml/tests 023.phpt

2005-10-24 Thread Marcus Boerger

helly   Mon Oct 24 04:29:37 2005 EDT

  Added files: (Branch: PHP_5_1)
/php-src/ext/simplexml/tests023.phpt 

  Modified files:  
/php-src/ext/simplexml  simplexml.c 
  Log:
  - Fix issue with entities in attributes
  
  
http://cvs.php.net/diff.php/php-src/ext/simplexml/simplexml.c?r1=1.151.2.3r2=1.151.2.4ty=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.151.2.3 
php-src/ext/simplexml/simplexml.c:1.151.2.4
--- php-src/ext/simplexml/simplexml.c:1.151.2.3 Mon Oct  3 12:05:08 2005
+++ php-src/ext/simplexml/simplexml.c   Mon Oct 24 04:29:32 2005
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: simplexml.c,v 1.151.2.3 2005/10/03 16:05:08 helly Exp $ */
+/* $Id: simplexml.c,v 1.151.2.4 2005/10/24 08:29:32 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -689,10 +689,15 @@
 
GET_NODE(sxe, node);
node = php_sxe_get_first_node(sxe, node TSRMLS_CC);
-
-   if (node) {
-   node = node-children;
-
+   if (node  sxe-iter.type != SXE_ITER_ATTRLIST) {
+   if (node-type == XML_ATTRIBUTE_NODE) {
+   MAKE_STD_ZVAL(value);
+   ZVAL_STRING(value, xmlNodeListGetString(node-doc, 
node-children, 1), 1);
+   zend_hash_next_index_insert(rv, value, sizeof(zval *), 
NULL);
+   node = NULL;
+   } else {
+   node = node-children;
+   }
while (node) {
if (node-children != NULL || node-prev != NULL || 
node-next != NULL) {
SKIP_TEXT(node);
@@ -1738,7 +1743,7 @@
 {
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
-   php_info_print_table_row(2, Revision, $Revision: 1.151.2.3 $);
+   php_info_print_table_row(2, Revision, $Revision: 1.151.2.4 $);
php_info_print_table_row(2, Schema support,
 #ifdef LIBXML_SCHEMAS_ENABLED
enabled);

http://cvs.php.net/co.php/php-src/ext/simplexml/tests/023.phpt?r=1.1p=1
Index: php-src/ext/simplexml/tests/023.phpt
+++ php-src/ext/simplexml/tests/023.phpt
--TEST--
SimpleXML: Attributes with entities
--SKIPIF--
?php if (!extension_loaded(simplexml)) print skip; ?
--FILE--
?php 

$xml =EOF
?xml version='1.0'?
!DOCTYPE talks SYSTEM nbsp.dtd [
!ELEMENT root  EMPTY
!ATTLIST root  attr1 CDATA #IMPLIED
!ENTITY  nbsp   #38;#x00A0;
]
root attr='foonbsp;barnbsp;baz'/root
EOF;

$sxe = simplexml_load_string($xml);

var_dump($sxe);
var_dump($sxe['attr']);
?
===DONE===
--EXPECTF--
object(SimpleXMLElement)#1 (1) {
  [attr]=
  string(%d) foo%sbar%sbaz
}
object(SimpleXMLElement)#2 (1) {
  [0]=
  string(%d) foo%sbar%sbaz
}
===DONE===

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

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

2005-10-24 Thread Rolland Santimano

rolland Mon Oct 24 10:35:05 2005 EDT

  Modified files:  
/php-src/ext/standard   string.c 
  Log:
  - Unicode impl of strrchr()
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/string.c?r1=1.503r2=1.504ty=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.503 php-src/ext/standard/string.c:1.504
--- php-src/ext/standard/string.c:1.503 Sat Oct 22 09:36:55 2005
+++ php-src/ext/standard/string.c   Mon Oct 24 10:35:02 2005
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: string.c,v 1.503 2005/10/22 13:36:55 rolland Exp $ */
+/* $Id: string.c,v 1.504 2005/10/24 14:35:02 rolland Exp $ */
 
 /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
 
@@ -2714,30 +2714,82 @@
 }
 /* }}} */
 
+/* {{{ php_u_strrchr
+ */
+UChar *php_u_strrchr(UChar *s, UChar32 ch, int32_t s_len)
+{
+   UChar32 ch1;
+   int32_t i = s_len;
+
+   while (i  0) {
+   U16_PREV(s, 0, i, ch1);
+   if (ch1 == ch) {
+   return (s+i);
+   }
+   }
+   return NULL;
+}
+/* }}} */
+
 /* {{{ proto string strrchr(string haystack, string needle)
Finds the last occurrence of a character in a string within another */
 PHP_FUNCTION(strrchr)
 {
-   zval **haystack, **needle;
-   char *found = NULL;
-   long found_offset;
-   
-   if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, haystack, 
needle) ==
-   FAILURE) {
+   zval *haystack, *needle;
+   zend_uchar str_type;
+   UChar32 ch;
+   void *found = NULL;
+   int32_t found_offset;
+
+   if (ZEND_NUM_ARGS() != 2 || zend_parse_parameters(2 TSRMLS_CC, zz, 
haystack, needle) == FAILURE) {
WRONG_PARAM_COUNT;
}
-   convert_to_string_ex(haystack);
+   if (Z_TYPE_P(haystack) != IS_UNICODE || Z_TYPE_P(haystack) != IS_BINARY 
|| Z_TYPE_P(haystack) != IS_STRING) {
+   convert_to_string(haystack);
+   }
 
-   if (Z_TYPE_PP(needle) == IS_STRING) {
-   found = strrchr(Z_STRVAL_PP(haystack), *Z_STRVAL_PP(needle));
+   if (Z_TYPE_P(needle) == IS_UNICODE || Z_TYPE_P(needle) == IS_BINARY || 
Z_TYPE_P(needle) == IS_STRING) {
+   if (Z_TYPE_P(needle) != Z_TYPE_P(haystack)) {
+   str_type = zend_get_unified_string_type(2 TSRMLS_CC, 
Z_TYPE_P(haystack), Z_TYPE_P(needle));
+   if (str_type == (zend_uchar)-1) {
+   convert_to_explicit_type(haystack, IS_BINARY);
+   convert_to_explicit_type(needle, IS_BINARY);
+   } else {
+   convert_to_explicit_type(haystack, str_type);
+   convert_to_explicit_type(needle, str_type);
+   }
+   }
+   if (Z_TYPE_P(haystack) == IS_UNICODE) {
+   U16_GET(Z_USTRVAL_P(needle), 0, 0, Z_USTRLEN_P(needle), 
ch);
+   found = php_u_strrchr(Z_USTRVAL_P(haystack), ch, 
Z_USTRLEN_P(haystack));
+   } else {
+   found = strrchr(Z_STRVAL_P(haystack), 
*Z_STRVAL_P(needle));
+   }
} else {
-   convert_to_long_ex(needle);
-   found = strrchr(Z_STRVAL_PP(haystack), (char) 
Z_LVAL_PP(needle));
+   convert_to_long(needle);
+   if (Z_TYPE_P(haystack) == IS_UNICODE) {
+   if (Z_LVAL_P(needle)  0 || Z_LVAL_P(needle)  
0x10) {
+   php_error(E_WARNING, Needle argument codepoint 
value out of range (0 - 0x10));
+   RETURN_FALSE;
+   }
+   found = php_u_strrchr(Z_USTRVAL_P(haystack), 
(UChar32)Z_LVAL_P(needle), Z_USTRLEN_P(haystack));
+   } else {
+   found = strrchr(Z_STRVAL_P(haystack), 
(char)Z_LVAL_P(needle));
+   }
}
 
if (found) {
-   found_offset = found - Z_STRVAL_PP(haystack);
-   RETURN_STRINGL(found, Z_STRLEN_PP(haystack) - found_offset, 1);
+   if (Z_TYPE_P(haystack) == IS_UNICODE) {
+   found_offset = (UChar *)found - Z_USTRVAL_P(haystack);
+   RETURN_UNICODEL((UChar *)found, Z_USTRLEN_P(haystack) - 
found_offset, 1);
+   } else {
+   found_offset = (char *)found - Z_STRVAL_P(haystack);
+   if (Z_TYPE_P(haystack) == IS_BINARY) {
+   RETURN_BINARYL((char *)found, 
Z_BINLEN_P(haystack) - found_offset, 1);
+   } else {
+   RETURN_STRINGL((char *)found, 
Z_STRLEN_P(haystack) - found_offset, 1);
+   }
+   }
} else {
RETURN_FALSE;
}

-- 
PHP CVS Mailing List (http://www.php.net/)

[PHP-CVS] cvs: php-src / unicode-progress.txt

2005-10-24 Thread Rolland Santimano

rolland Mon Oct 24 10:51:18 2005 EDT

  Modified files:  
/php-srcunicode-progress.txt 
  Log:
  - strip_tags(), str[c]spn(), strpbrk(), strrchr(), strrpos(), strtok()
  
  
  
http://cvs.php.net/diff.php/php-src/unicode-progress.txt?r1=1.10r2=1.11ty=u
Index: php-src/unicode-progress.txt
diff -u php-src/unicode-progress.txt:1.10 php-src/unicode-progress.txt:1.11
--- php-src/unicode-progress.txt:1.10   Mon Oct  3 02:19:51 2005
+++ php-src/unicode-progress.txtMon Oct 24 10:51:17 2005
@@ -17,16 +17,23 @@
 similar_text()
 str_pad()
 str_repeat()
+strip_tags()
+strcspn()
 stripslashes()
+strpbrk()
 strpos()
+strrchr()
 strrev()
+strrpos()
+strspn()
 strstr()
+strtok()
 substr()
 substr_count()
 substr_replace()
 trim()
-ucwords()
 ucfirst()
+ucwords()
 
 
 Zend Engine

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

[PHP-CVS] cvs: CVSROOT / avail

2005-10-24 Thread Wez Furlong

wez Mon Oct 24 11:56:58 2005 EDT

  Modified files:  
/CVSROOTavail 
  Log:
  php-src karma for mike
  
http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.1042r2=1.1043ty=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1042 CVSROOT/avail:1.1043
--- CVSROOT/avail:1.1042Tue Oct 18 11:56:17 2005
+++ CVSROOT/avail   Mon Oct 24 11:56:54 2005
@@ -17,7 +17,7 @@
 # The PHP Developers have full access to the full source trees for
 # PHP and PEAR, as well as the documentation.
 
-avail|rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,sniper,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,mlwmohawk,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johannes,dbs,skoduru,nrathna|phpfi,php3,php-src,pecl,non-pecl,pear,peardoc,spl,phpdoc,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa_IR,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-ca
+avail|mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,sniper,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,mlwmohawk,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johannes,dbs,skoduru,nrathna|phpfi,php3,php-src,pecl,non-pecl,pear,peardoc,spl,phpdoc,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa_IR,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-ca
 
 # fastcgi implementation for IIS
 avail|shane,wez,edink|fastcgi-isapi

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

[PHP-CVS] cvs: php-src /ext/ldap config.m4

2005-10-24 Thread Antony Dovgal

tony2001Mon Oct 24 16:24:10 2005 EDT

  Modified files:  
/php-src/ext/ldap   config.m4 
  Log:
  fix #34970 (ldap configuration issues)
  
  
http://cvs.php.net/diff.php/php-src/ext/ldap/config.m4?r1=1.39r2=1.40ty=u
Index: php-src/ext/ldap/config.m4
diff -u php-src/ext/ldap/config.m4:1.39 php-src/ext/ldap/config.m4:1.40
--- php-src/ext/ldap/config.m4:1.39 Sun May 29 19:16:41 2005
+++ php-src/ext/ldap/config.m4  Mon Oct 24 16:24:05 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.39 2005/05/29 23:16:41 sniper Exp $
+dnl $Id: config.m4,v 1.40 2005/10/24 20:24:05 tony2001 Exp $
 dnl
 
 AC_DEFUN([PHP_LDAP_CHECKS], [
@@ -95,7 +95,7 @@
 LDAP_PTHREAD=
   fi
 
-  if test -f $LDAP_LIBDIR/liblber.a -o -f 
$LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME; then
+  if test -f $LDAP_LIBDIR/liblber.a || -f 
$LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME; then
 PHP_ADD_LIBRARY_WITH_PATH(lber, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
 PHP_ADD_LIBRARY_WITH_PATH(ldap, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
 

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

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/ldap config.m4

2005-10-24 Thread Antony Dovgal

tony2001Mon Oct 24 16:24:35 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/ldap   config.m4 
  Log:
  MFH: fix #34970 (ldap configuration issues)
  
  
http://cvs.php.net/diff.php/php-src/ext/ldap/config.m4?r1=1.39.2.2r2=1.39.2.3ty=u
Index: php-src/ext/ldap/config.m4
diff -u php-src/ext/ldap/config.m4:1.39.2.2 php-src/ext/ldap/config.m4:1.39.2.3
--- php-src/ext/ldap/config.m4:1.39.2.2 Fri Sep 16 08:09:17 2005
+++ php-src/ext/ldap/config.m4  Mon Oct 24 16:24:35 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.39.2.2 2005/09/16 12:09:17 sniper Exp $
+dnl $Id: config.m4,v 1.39.2.3 2005/10/24 20:24:35 tony2001 Exp $
 dnl
 
 AC_DEFUN([PHP_LDAP_CHECKS], [
@@ -95,7 +95,7 @@
 LDAP_PTHREAD=
   fi
 
-  if test -f $LDAP_LIBDIR/liblber.a -o -f 
$LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME; then
+  if test -f $LDAP_LIBDIR/liblber.a || -f 
$LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME; then
 PHP_ADD_LIBRARY_WITH_PATH(lber, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
 PHP_ADD_LIBRARY_WITH_PATH(ldap, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
 

-- 
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/ldap config.m4

2005-10-24 Thread Antony Dovgal

tony2001Mon Oct 24 16:24:55 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/ldap   config.m4 
  Log:
  MFH: fix #34970 (ldap configuration issues)
  
  
http://cvs.php.net/diff.php/php-src/ext/ldap/config.m4?r1=1.34.2.3r2=1.34.2.4ty=u
Index: php-src/ext/ldap/config.m4
diff -u php-src/ext/ldap/config.m4:1.34.2.3 php-src/ext/ldap/config.m4:1.34.2.4
--- php-src/ext/ldap/config.m4:1.34.2.3 Sun May  8 11:59:18 2005
+++ php-src/ext/ldap/config.m4  Mon Oct 24 16:24:53 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.34.2.3 2005/05/08 15:59:18 sniper Exp $
+dnl $Id: config.m4,v 1.34.2.4 2005/10/24 20:24:53 tony2001 Exp $
 dnl
 
 AC_DEFUN([PHP_LDAP_CHECKS], [
@@ -95,7 +95,7 @@
 LDAP_PTHREAD=
   fi
 
-  if test -f $LDAP_LIBDIR/liblber.a -o -f 
$LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME; then
+  if test -f $LDAP_LIBDIR/liblber.a || -f 
$LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME; then
 PHP_ADD_LIBRARY_WITH_PATH(lber, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
 PHP_ADD_LIBRARY_WITH_PATH(ldap, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
 

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

[PHP-CVS] cvs: php-src /ext/ldap config.m4

2005-10-24 Thread Jani Taskinen

sniper  Mon Oct 24 18:45:58 2005 EDT

  Modified files:  
/php-src/ext/ldap   config.m4 
  Log:
  fix build
  
http://cvs.php.net/diff.php/php-src/ext/ldap/config.m4?r1=1.40r2=1.41ty=u
Index: php-src/ext/ldap/config.m4
diff -u php-src/ext/ldap/config.m4:1.40 php-src/ext/ldap/config.m4:1.41
--- php-src/ext/ldap/config.m4:1.40 Mon Oct 24 16:24:05 2005
+++ php-src/ext/ldap/config.m4  Mon Oct 24 18:45:54 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.40 2005/10/24 20:24:05 tony2001 Exp $
+dnl $Id: config.m4,v 1.41 2005/10/24 22:45:54 sniper Exp $
 dnl
 
 AC_DEFUN([PHP_LDAP_CHECKS], [
@@ -95,7 +95,7 @@
 LDAP_PTHREAD=
   fi
 
-  if test -f $LDAP_LIBDIR/liblber.a || -f 
$LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME; then
+  if test -f $LDAP_LIBDIR/liblber.a || test -f 
$LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME; then
 PHP_ADD_LIBRARY_WITH_PATH(lber, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
 PHP_ADD_LIBRARY_WITH_PATH(ldap, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
 

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

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/ldap config.m4

2005-10-24 Thread Jani Taskinen

sniper  Mon Oct 24 18:46:27 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/ldap   config.m4 
  Log:
  MFH
  
http://cvs.php.net/diff.php/php-src/ext/ldap/config.m4?r1=1.39.2.3r2=1.39.2.4ty=u
Index: php-src/ext/ldap/config.m4
diff -u php-src/ext/ldap/config.m4:1.39.2.3 php-src/ext/ldap/config.m4:1.39.2.4
--- php-src/ext/ldap/config.m4:1.39.2.3 Mon Oct 24 16:24:35 2005
+++ php-src/ext/ldap/config.m4  Mon Oct 24 18:46:26 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.39.2.3 2005/10/24 20:24:35 tony2001 Exp $
+dnl $Id: config.m4,v 1.39.2.4 2005/10/24 22:46:26 sniper Exp $
 dnl
 
 AC_DEFUN([PHP_LDAP_CHECKS], [
@@ -95,7 +95,7 @@
 LDAP_PTHREAD=
   fi
 
-  if test -f $LDAP_LIBDIR/liblber.a || -f 
$LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME; then
+  if test -f $LDAP_LIBDIR/liblber.a || test -f 
$LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME; then
 PHP_ADD_LIBRARY_WITH_PATH(lber, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
 PHP_ADD_LIBRARY_WITH_PATH(ldap, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
 

-- 
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/ldap config.m4

2005-10-24 Thread Antony Dovgal

tony2001Mon Oct 24 18:56:36 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/ldap   config.m4 
  Log:
  MFH
  
  
http://cvs.php.net/diff.php/php-src/ext/ldap/config.m4?r1=1.34.2.4r2=1.34.2.5ty=u
Index: php-src/ext/ldap/config.m4
diff -u php-src/ext/ldap/config.m4:1.34.2.4 php-src/ext/ldap/config.m4:1.34.2.5
--- php-src/ext/ldap/config.m4:1.34.2.4 Mon Oct 24 16:24:53 2005
+++ php-src/ext/ldap/config.m4  Mon Oct 24 18:56:33 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.34.2.4 2005/10/24 20:24:53 tony2001 Exp $
+dnl $Id: config.m4,v 1.34.2.5 2005/10/24 22:56:33 tony2001 Exp $
 dnl
 
 AC_DEFUN([PHP_LDAP_CHECKS], [
@@ -95,7 +95,7 @@
 LDAP_PTHREAD=
   fi
 
-  if test -f $LDAP_LIBDIR/liblber.a || -f 
$LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME; then
+  if test -f $LDAP_LIBDIR/liblber.a || test -f 
$LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME; then
 PHP_ADD_LIBRARY_WITH_PATH(lber, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
 PHP_ADD_LIBRARY_WITH_PATH(ldap, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
 

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

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo pdo_stmt.c

2005-10-24 Thread Ilia Alshanetsky

iliaa   Mon Oct 24 23:53:26 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/pdopdo_stmt.c 
  Log:
  Fixed compiler warning
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.8r2=1.118.2.9ty=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.8 
php-src/ext/pdo/pdo_stmt.c:1.118.2.9
--- php-src/ext/pdo/pdo_stmt.c:1.118.2.8Mon Oct 10 10:44:16 2005
+++ php-src/ext/pdo/pdo_stmt.c  Mon Oct 24 23:53:25 2005
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: pdo_stmt.c,v 1.118.2.8 2005/10/10 14:44:16 iliaa Exp $ */
+/* $Id: pdo_stmt.c,v 1.118.2.9 2005/10/25 03:53:25 iliaa Exp $ */
 
 /* The PDO Statement Handle Class */
 
@@ -556,7 +556,7 @@
zval_dtor(param-parameter);
 
/* set new value */
-   fetch_value(stmt, param-parameter, 
param-paramno, param-param_type TSRMLS_CC);
+   fetch_value(stmt, param-parameter, 
param-paramno, (int *)param-param_type TSRMLS_CC);
 
/* TODO: some smart thing that avoids 
duplicating the value in the
 * general loop below.  For now, if you're 
binding output columns,

-- 
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(PHP_5_1) / NEWS /ext/standard array.c /ext/standard/tests/array bug34934.phpt

[PHP-CVS] cvs: php-src /ext/standard array.c /ext/standard/tests/array bug34934.phpt

RE: [PHP-CVS] cvs: php-src /ext/standard array.c /ext/standard/tests/array bug34934.phpt

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

[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/soap php_sdl.c

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

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/simplexml simplexml.c /ext/simplexml/tests 023.phpt

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

[PHP-CVS] cvs: php-src / unicode-progress.txt

[PHP-CVS] cvs: CVSROOT / avail

[PHP-CVS] cvs: php-src /ext/ldap config.m4

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/ldap config.m4

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/ldap config.m4

[PHP-CVS] cvs: php-src /ext/ldap config.m4

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/ldap config.m4

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/ldap config.m4

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo pdo_stmt.c

19 matches

Site Navigation

Mail list logo

Footer information