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

2006-12-19 Thread changelog
changelog   Wed Dec 20 01:31:02 2006 UTC

  Modified files:  
/php-srcChangeLog 
  Log:
  ChangeLog update
  http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2546r2=1.2547diff_format=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.2546 php-src/ChangeLog:1.2547
--- php-src/ChangeLog:1.2546Tue Dec 19 01:30:56 2006
+++ php-src/ChangeLog   Wed Dec 20 01:31:02 2006
@@ -1,3 +1,361 @@
+2006-12-19  Andrei Zmievski  [EMAIL PROTECTED]
+
+* ext/standard/mail.c:
+  Unicode support in ezmlm_hash().
+  
+
+2006-12-19  Marcus Boerger  [EMAIL PROTECTED]
+
+* ext/spl/php_spl.c:
+  - Use new 'x' parameter parsing
+
+* ext/spl/php_spl.c:
+  - Make spl_autoload_call() unicode safe
+
+* ZendEngine2/zend_interfaces.c:
+  - Changed macro once again
+
+* README.PARAMETER_PARSING_API:
+  - x was added toparameter parsing api
+
+* ZendEngine2/zend_API.c:
+  - Implement parameter parsing 'x'
+
+* ZendEngine2/zend_interfaces.c:
+  - Fix macro param order
+
+* ZendEngine2/zend_interfaces.c
+  ZendEngine2/zend_interfaces.h:
+  - Implement zend_u_call_method to deal with situations where the function
+name type is already known
+
+2006-12-19  Andrei Zmievski  [EMAIL PROTECTED]
+
+* ext/standard/basic_functions.c:
+  Unicode support in set_include_path().
+
+2006-12-19  Nuno Lopes  [EMAIL PROTECTED]
+
+* ext/pcre/tests/005.phpt:
+  new test
+
+* ext/pcre/tests/005.phpt
+  ext/pcre/tests/005.phpt:
+  
+  file 005.phpt was initially added on branch PHP_5_2.
+
+2006-12-19  Michael Wallner  [EMAIL PROTECTED]
+
+* (PHP_5_2)
+  ext/curl/interface.c:
+  MFH: check CRYPTO_get_id_callback() if anyone else already set thread 
lock
+  callbacks
+
+* ext/curl/interface.c:
+  - check CRYPTO_get_id_callback() if anyone else already set thread lock
+  callbacks
+
+2006-12-19  Antony Dovgal  [EMAIL PROTECTED]
+
+* ext/soap/tests/bugs/bug39815.phpt:
+  MFB
+
+2006-12-19  Andrei Zmievski  [EMAIL PROTECTED]
+
+* README.UNICODE-UPGRADES:
+  Update.
+
+2006-12-19  Antony Dovgal  [EMAIL PROTECTED]
+
+* (PHP_5_2)
+  ext/soap/tests/bugs/bug39815.phpt:
+  on FreeBSD these locales have different names
+
+2006-12-19  Andrei Zmievski  [EMAIL PROTECTED]
+
+* ZendEngine2/zend_API.h
+  ZendEngine2/zend_execute_API.c
+  ext/reflection/php_reflection.c
+  ext/standard/array.c
+  ext/standard/basic_functions.c
+  ext/standard/string.c:
+  - Marcus was too quick. Let's put type before zstr in the macros.
+  - Also mark get_include_path() and restore_include_path() with U.
+
+2006-12-19  Marcus Boerger  [EMAIL PROTECTED]
+
+* README.UNICODE-UPGRADES
+  ZendEngine2/zend_API.h
+  ZendEngine2/zend_execute_API.c
+  ext/reflection/php_reflection.c
+  ext/standard/array.c:
+  - Fix ZVAL_ZSTRL
+
+2006-12-19  Antony Dovgal  [EMAIL PROTECTED]
+
+* ext/soap/tests/bugs/bug39815.phpt:
+  add check for setlocale() and sv_SE to SKIPIF section
+
+2006-12-19  Andrei Zmievski  [EMAIL PROTECTED]
+
+* ext/standard/formatted_print.c:
+  Unicode support in *printf() functions. (Antony, Andrei)
+
+* (PHP_5_2)
+  ZendEngine2/zend_language_scanner.l:
+  Support 'b' prefix in front of string literals for forward compatibility
+  with PHP 6.
+
+2006-12-19  Nuno Lopes  [EMAIL PROTECTED]
+
+* ext/json/json.c:
+  MFB: little cleanup in json_determine_array_type()
+
+* (PHP_5_2)
+  ext/json/json.c:
+  remove NOP code in json_determine_array_type(), as we already know the 
zval
+  passed is an array (based on patch by Ron Korving)
+
+2006-12-19  Antony Dovgal  [EMAIL PROTECTED]
+
+* ext/filter/tests/004.phpt
+  ext/filter/tests/004.phpt
+  ext/filter/tests/006.phpt
+  ext/filter/tests/006.phpt
+  ext/filter/tests/007.phpt
+  ext/filter/tests/007.phpt
+  ext/filter/tests/008.phpt
+  ext/filter/tests/008.phpt
+  ext/filter/tests/009.phpt
+  ext/filter/tests/009.phpt
+  ext/filter/tests/010.phpt
+  ext/filter/tests/010.phpt
+  ext/filter/tests/011.phpt
+  ext/filter/tests/011.phpt
+  ext/filter/tests/012.phpt
+  ext/filter/tests/012.phpt
+  ext/filter/tests/013.phpt
+  ext/filter/tests/013.phpt
+  ext/filter/tests/014.phpt
+  ext/filter/tests/014.phpt
+  ext/filter/tests/015.phpt
+  ext/filter/tests/015.phpt
+  ext/filter/tests/016.phpt
+  ext/filter/tests/016.phpt
+  ext/filter/tests/017.phpt
+  ext/filter/tests/017.phpt
+  ext/filter/tests/018.phpt
+  ext/filter/tests/018.phpt
+  ext/filter/tests/019.phpt
+  ext/filter/tests/019.phpt
+  ext/filter/tests/020.phpt
+  ext/filter/tests/020.phpt
+  ext/filter/tests/021.phpt
+  ext/filter/tests/021.phpt
+  ext/filter/tests/022.phpt
+  ext/filter/tests/022.phpt
+  ext/filter/tests/023.phpt
+

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

2006-12-19 Thread changelog
changelog   Wed Dec 20 01:31:04 2006 UTC

  Modified files:  
/ZendEngine2ChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1038r2=1.1039diff_format=u
Index: ZendEngine2/ChangeLog
diff -u ZendEngine2/ChangeLog:1.1038 ZendEngine2/ChangeLog:1.1039
--- ZendEngine2/ChangeLog:1.1038Tue Dec 19 01:31:00 2006
+++ ZendEngine2/ChangeLog   Wed Dec 20 01:31:04 2006
@@ -1,3 +1,45 @@
+2006-12-19  Marcus Boerger  [EMAIL PROTECTED]
+
+* zend_interfaces.c:
+  - Changed macro once again
+
+* zend_API.c:
+  - Implement parameter parsing 'x'
+
+* zend_interfaces.c:
+  - Fix macro param order
+
+* zend_interfaces.c
+  zend_interfaces.h:
+  - Implement zend_u_call_method to deal with situations where the function
+name type is already known
+
+2006-12-19  Andrei Zmievski  [EMAIL PROTECTED]
+
+* zend_API.h
+  zend_execute_API.c:
+  - Marcus was too quick. Let's put type before zstr in the macros.
+  - Also mark get_include_path() and restore_include_path() with U.
+
+2006-12-19  Marcus Boerger  [EMAIL PROTECTED]
+
+* zend_API.h
+  zend_execute_API.c:
+  - Fix ZVAL_ZSTRL
+
+2006-12-19  Andrei Zmievski  [EMAIL PROTECTED]
+
+* (PHP_5_2)
+  zend_language_scanner.l:
+  Support 'b' prefix in front of string literals for forward compatibility
+  with PHP 6.
+
+2006-12-19  Hannes Magnusson  [EMAIL PROTECTED]
+
+* (PHP_5_2)
+  tests/bug34617.phpt:
+  Fix tests
+
 2006-12-18  Dmitry Stogov  [EMAIL PROTECTED]
 
 * Zend.m4
@@ -16112,7 +16154,7 @@
 2003-06-10  Jani Taskinen  [EMAIL PROTECTED]
 
 * zend_multiply.h:
-  - Missing $Id: ChangeLog,v 1.1038 2006/12/19 01:31:00 changelog Exp $ tag
+  - Missing $Id: ChangeLog,v 1.1039 2006/12/20 01:31:04 changelog Exp $ tag
 
 2003-06-10  James Cox  [EMAIL PROTECTED]
 
@@ -17836,7 +17878,7 @@
   zend_types.h
   zend_variables.c
   zend_variables.h:
-  - Added some missing CVS $Id: ChangeLog,v 1.1038 2006/12/19 01:31:00 
changelog Exp $ tags, headers and footers.
+  - Added some missing CVS $Id: ChangeLog,v 1.1039 2006/12/20 01:31:04 
changelog Exp $ tags, headers and footers.
 
 2003-01-30  Ilia Alshanetsky  [EMAIL PROTECTED]
 


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

2006-12-19 Thread Brian Shire
shire   Tue Dec 19 08:02:48 2006 UTC

  Modified files:  
/php-src/ext/standard   array.c 
/php-src/ext/standard/tests/array   bug30074.phpt 
  Log:
  -Fixed bug #30074 (apparent symbol table error with extract($blah, 
EXTR_REFS)) 
  # appoligies, I did this in reverse (applied to PHP_5_2) I should have MFH.  
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.397r2=1.398diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.397 php-src/ext/standard/array.c:1.398
--- php-src/ext/standard/array.c:1.397  Wed Dec  6 17:42:47 2006
+++ php-src/ext/standard/array.cTue Dec 19 08:02:48 2006
@@ -21,7 +21,7 @@
+--+
 */
 
-/* $Id: array.c,v 1.397 2006/12/06 17:42:47 tony2001 Exp $ */
+/* $Id: array.c,v 1.398 2006/12/19 08:02:48 shire Exp $ */
 
 #include php.h
 #include php_ini.h
@@ -1492,7 +1492,7 @@
 
*orig_var = *entry;
} else {
-   if (var_array-refcount  1) {
+   if (var_array-refcount  1 || *entry 
== EG(uninitialized_zval_ptr)) {

SEPARATE_ZVAL_TO_MAKE_IS_REF(entry);
} else {
(*entry)-is_ref = 1;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/bug30074.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/array/bug30074.phpt
diff -u /dev/null php-src/ext/standard/tests/array/bug30074.phpt:1.2
--- /dev/null   Tue Dec 19 08:02:48 2006
+++ php-src/ext/standard/tests/array/bug30074.phpt  Tue Dec 19 08:02:48 2006
@@ -0,0 +1,15 @@
+--TEST--
+Bug #30074 (EG(uninitialized_zval_ptr) gets set to reference using EXTR_REFS, 
affecting later values)
+--FILE--
+?php
+error_reporting(E_ALL  ~E_NOTICE);   // We don't want the notice for 
$undefined
+$result = extract(array('a'=$undefined), EXTR_REFS); 
+var_dump(array($a));
+echo Done\n;
+?
+--EXPECT--
+array(1) {
+  [0]=
+  NULL
+}
+Done

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



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

2006-12-19 Thread Brian Shire
shire   Tue Dec 19 08:18:48 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  BFN 
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.439r2=1.2027.2.547.2.440diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.439 php-src/NEWS:1.2027.2.547.2.440
--- php-src/NEWS:1.2027.2.547.2.439 Mon Dec 18 17:56:25 2006
+++ php-src/NEWSTue Dec 19 08:18:47 2006
@@ -204,6 +204,8 @@
 - Fixed bug #36644 (possible crash in variant_date_from_timestamp()). (Ilia)
 - Fixed bug #33282 (Re-assignment by reference does not clear the is_ref flag)
   (Ilia,Dmitry, Matt Wilmas)
+- Fixed bug #30074 (apparent symbol table error with extract($blah, 
EXTR_REFS)) 
+  (shire)
 - Fixed bug #29840 (is_executable() does not honor safe_mode_exec_dir
   setting). (Ilia)
 

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



[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/standard basic_functions.c file.c streamsfuncs.c streamsfuncs.h /ext/standard/tests/network shutdown.phpt /main/streams php_stream_transport.h transports

2006-12-19 Thread Dmitry Stogov
dmitry  Tue Dec 19 08:58:59 2006 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/network shutdown.phpt 

  Modified files:  
/php-srcNEWS 
/php-src/main/streams   php_stream_transport.h transports.c 
xp_socket.c 
/php-src/ext/standard   basic_functions.c file.c streamsfuncs.c 
streamsfuncs.h 
  Log:
  Added function stream_socket_shutdown(). It is a wraper for system shutdown() 
function, that shut downs part of a full-duplex connection
  
  http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.440r2=1.2027.2.547.2.441diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.440 php-src/NEWS:1.2027.2.547.2.441
--- php-src/NEWS:1.2027.2.547.2.440 Tue Dec 19 08:18:47 2006
+++ php-src/NEWSTue Dec 19 08:58:58 2006
@@ -1,6 +1,8 @@
 PHPNEWS
 |||
 ?? Dec 2006, PHP 5.2.1RC2
+- Added function stream_socket_shutdown(). It is a wraper for system shutdown()
+  function, that shut downs part of a full-duplex connection. (Dmitry)
 - Added internal heap protection (Dmitry)
   . safe unlinking
   . cookies
http://cvs.php.net/viewvc.cgi/php-src/main/streams/php_stream_transport.h?r1=1.10.2.1r2=1.10.2.1.2.1diff_format=u
Index: php-src/main/streams/php_stream_transport.h
diff -u php-src/main/streams/php_stream_transport.h:1.10.2.1 
php-src/main/streams/php_stream_transport.h:1.10.2.1.2.1
--- php-src/main/streams/php_stream_transport.h:1.10.2.1Sun Jan  1 
12:50:18 2006
+++ php-src/main/streams/php_stream_transport.h Tue Dec 19 08:58:58 2006
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: php_stream_transport.h,v 1.10.2.1 2006/01/01 12:50:18 sniper Exp $ */
+/* $Id: php_stream_transport.h,v 1.10.2.1.2.1 2006/12/19 08:58:58 dmitry Exp $ 
*/
 
 #if HAVE_SYS_SOCKET_H
 # include sys/socket.h
@@ -104,8 +104,19 @@
  * sending it as OOB data */
 PHPAPI int php_stream_xport_sendto(php_stream *stream, const char *buf, size_t 
buflen,
long flags, void *addr, socklen_t addrlen TSRMLS_DC);
+
+typedef enum {
+   STREAM_SHUT_RD,
+   STREAM_SHUT_WR,
+   STREAM_SHUT_RDWR
+} stream_shutdown_t;
+
+/* Similar to shutdown() system call; shut down part of a full-duplex
+ * connection */
+PHPAPI int php_stream_xport_shutdown(php_stream *stream, stream_shutdown_t how 
TSRMLS_DC);
 END_EXTERN_C()
 
+
 /* Structure definition for the set_option interface that the above functions 
wrap */
 
 typedef struct _php_stream_xport_param {
@@ -116,11 +127,13 @@
STREAM_XPORT_OP_GET_NAME,
STREAM_XPORT_OP_GET_PEER_NAME,
STREAM_XPORT_OP_RECV,
-   STREAM_XPORT_OP_SEND
+   STREAM_XPORT_OP_SEND,
+   STREAM_XPORT_OP_SHUTDOWN
} op;
unsigned int want_addr:1;
unsigned int want_textaddr:1;
unsigned int want_errortext:1;
+   stream_shutdown_t how:3;
 
struct {
char *name;
http://cvs.php.net/viewvc.cgi/php-src/main/streams/transports.c?r1=1.16.2.1r2=1.16.2.1.2.1diff_format=u
Index: php-src/main/streams/transports.c
diff -u php-src/main/streams/transports.c:1.16.2.1 
php-src/main/streams/transports.c:1.16.2.1.2.1
--- php-src/main/streams/transports.c:1.16.2.1  Sun Jan  1 12:50:18 2006
+++ php-src/main/streams/transports.c   Tue Dec 19 08:58:58 2006
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: transports.c,v 1.16.2.1 2006/01/01 12:50:18 sniper Exp $ */
+/* $Id: transports.c,v 1.16.2.1.2.1 2006/12/19 08:58:58 dmitry Exp $ */
 
 #include php.h
 #include php_streams_int.h
@@ -486,6 +486,25 @@
return -1;
 }
 
+/* Similar to shutdown() system call; shut down part of a full-duplex
+ * connection */
+PHPAPI int php_stream_xport_shutdown(php_stream *stream, stream_shutdown_t how 
TSRMLS_DC)
+{
+   php_stream_xport_param param;
+   int ret = 0;
+
+   memset(param, 0, sizeof(param));
+
+   param.op = STREAM_XPORT_OP_SHUTDOWN;
+   param.how = how;
+   
+   ret = php_stream_set_option(stream, PHP_STREAM_OPTION_XPORT_API, 0, 
param);
+
+   if (ret == PHP_STREAM_OPTION_RETURN_OK) {
+   return param.outputs.returncode;
+   }
+   return -1;
+}
 
 /*
  * Local variables:
http://cvs.php.net/viewvc.cgi/php-src/main/streams/xp_socket.c?r1=1.33.2.2.2.1r2=1.33.2.2.2.2diff_format=u
Index: php-src/main/streams/xp_socket.c
diff -u php-src/main/streams/xp_socket.c:1.33.2.2.2.1 
php-src/main/streams/xp_socket.c:1.33.2.2.2.2
--- php-src/main/streams/xp_socket.c:1.33.2.2.2.1   Wed Oct 11 12:53:56 2006
+++ php-src/main/streams/xp_socket.cTue Dec 19 08:58:58 2006
@@ -16,7 +16,7 @@
   

[PHP-CVS] cvs: php-src /ext/standard basic_functions.c file.c streamsfuncs.c streamsfuncs.h /ext/standard/tests/network shutdown.phpt /main/streams php_stream_transport.h transports.c xp_socket.c

2006-12-19 Thread Dmitry Stogov
dmitry  Tue Dec 19 08:59:27 2006 UTC

  Modified files:  
/php-src/main/streams   php_stream_transport.h transports.c 
xp_socket.c 
/php-src/ext/standard   basic_functions.c file.c streamsfuncs.c 
streamsfuncs.h 
/php-src/ext/standard/tests/network shutdown.phpt 
  Log:
  Added function stream_socket_shutdown(). It is a wraper for system shutdown() 
function, that shut downs part of a full-duplex connection
  
  http://cvs.php.net/viewvc.cgi/php-src/main/streams/php_stream_transport.h?r1=1.11r2=1.12diff_format=u
Index: php-src/main/streams/php_stream_transport.h
diff -u php-src/main/streams/php_stream_transport.h:1.11 
php-src/main/streams/php_stream_transport.h:1.12
--- php-src/main/streams/php_stream_transport.h:1.11Sun Jan  1 13:09:57 2006
+++ php-src/main/streams/php_stream_transport.h Tue Dec 19 08:59:26 2006
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: php_stream_transport.h,v 1.11 2006/01/01 13:09:57 sniper Exp $ */
+/* $Id: php_stream_transport.h,v 1.12 2006/12/19 08:59:26 dmitry Exp $ */
 
 #if HAVE_SYS_SOCKET_H
 # include sys/socket.h
@@ -104,8 +104,19 @@
  * sending it as OOB data */
 PHPAPI int php_stream_xport_sendto(php_stream *stream, const char *buf, size_t 
buflen,
long flags, void *addr, socklen_t addrlen TSRMLS_DC);
+
+typedef enum {
+   STREAM_SHUT_RD,
+   STREAM_SHUT_WR,
+   STREAM_SHUT_RDWR
+} stream_shutdown_t;
+
+/* Similar to shutdown() system call; shut down part of a full-duplex
+ * connection */
+PHPAPI int php_stream_xport_shutdown(php_stream *stream, stream_shutdown_t how 
TSRMLS_DC);
 END_EXTERN_C()
 
+
 /* Structure definition for the set_option interface that the above functions 
wrap */
 
 typedef struct _php_stream_xport_param {
@@ -116,11 +127,13 @@
STREAM_XPORT_OP_GET_NAME,
STREAM_XPORT_OP_GET_PEER_NAME,
STREAM_XPORT_OP_RECV,
-   STREAM_XPORT_OP_SEND
+   STREAM_XPORT_OP_SEND,
+   STREAM_XPORT_OP_SHUTDOWN
} op;
unsigned int want_addr:1;
unsigned int want_textaddr:1;
unsigned int want_errortext:1;
+   stream_shutdown_t how:3;
 
struct {
char *name;
http://cvs.php.net/viewvc.cgi/php-src/main/streams/transports.c?r1=1.17r2=1.18diff_format=u
Index: php-src/main/streams/transports.c
diff -u php-src/main/streams/transports.c:1.17 
php-src/main/streams/transports.c:1.18
--- php-src/main/streams/transports.c:1.17  Sun Jan  1 13:09:57 2006
+++ php-src/main/streams/transports.c   Tue Dec 19 08:59:26 2006
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: transports.c,v 1.17 2006/01/01 13:09:57 sniper Exp $ */
+/* $Id: transports.c,v 1.18 2006/12/19 08:59:26 dmitry Exp $ */
 
 #include php.h
 #include php_streams_int.h
@@ -486,6 +486,25 @@
return -1;
 }
 
+/* Similar to shutdown() system call; shut down part of a full-duplex
+ * connection */
+PHPAPI int php_stream_xport_shutdown(php_stream *stream, stream_shutdown_t how 
TSRMLS_DC)
+{
+   php_stream_xport_param param;
+   int ret = 0;
+
+   memset(param, 0, sizeof(param));
+
+   param.op = STREAM_XPORT_OP_SHUTDOWN;
+   param.how = how;
+   
+   ret = php_stream_set_option(stream, PHP_STREAM_OPTION_XPORT_API, 0, 
param);
+
+   if (ret == PHP_STREAM_OPTION_RETURN_OK) {
+   return param.outputs.returncode;
+   }
+   return -1;
+}
 
 /*
  * Local variables:
http://cvs.php.net/viewvc.cgi/php-src/main/streams/xp_socket.c?r1=1.37r2=1.38diff_format=u
Index: php-src/main/streams/xp_socket.c
diff -u php-src/main/streams/xp_socket.c:1.37 
php-src/main/streams/xp_socket.c:1.38
--- php-src/main/streams/xp_socket.c:1.37   Wed Oct 11 12:53:38 2006
+++ php-src/main/streams/xp_socket.cTue Dec 19 08:59:26 2006
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: xp_socket.c,v 1.37 2006/10/11 12:53:38 tony2001 Exp $ */
+/* $Id: xp_socket.c,v 1.38 2006/12/19 08:59:26 dmitry Exp $ */
 
 #include php.h
 #include ext/standard/file.h
@@ -369,6 +369,24 @@
return PHP_STREAM_OPTION_RETURN_OK;
 
 
+#ifdef HAVE_SHUTDOWN
+# ifndef SHUT_RD
+#  define SHUT_RD 0
+# endif
+# ifndef SHUT_WR
+#  define SHUT_WR 1
+# endif
+# ifndef SHUT_RDWR
+#  define SHUT_RDWR 2
+# endif
+   case STREAM_XPORT_OP_SHUTDOWN: {
+   static const int shutdown_how[] = 
{SHUT_RD, SHUT_WR, SHUT_RDWR};
+
+   xparam-outputs.returncode = 
shutdown(sock-socket, shutdown_how[xparam-how]);
+   return PHP_STREAM_OPTION_RETURN_OK;
+   }
+#endif
+   
 

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /sapi/cgi fastcgi.c

2006-12-19 Thread Dmitry Stogov
dmitry  Tue Dec 19 09:17:04 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
/php-src/sapi/cgi   fastcgi.c 
  Log:
  Fixed bug #39869 (safe_read does not initialize errno). (michiel at boland 
dot org)
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.441r2=1.2027.2.547.2.442diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.441 php-src/NEWS:1.2027.2.547.2.442
--- php-src/NEWS:1.2027.2.547.2.441 Tue Dec 19 08:58:58 2006
+++ php-src/NEWSTue Dec 19 09:17:04 2006
@@ -8,6 +8,8 @@
   . cookies
   . canary protection (debug build only)
   . random generation of cookies and canaries
+- Fixed bug #39869 (safe_read does not initialize errno).
+  (michiel at boland dot org, Dmitry)
 - Fixed bug #39850 (SplFileObject throws contradictory/wrong error messages 
   when trying to open php://wrong). (Tony)
 - Fixed bug #39832 (SOAP Server: parameter not matching the WSDL specified type
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/fastcgi.c?r1=1.4.2.13.2.12r2=1.4.2.13.2.13diff_format=u
Index: php-src/sapi/cgi/fastcgi.c
diff -u php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.12 
php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.13
--- php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.12Tue Dec  5 08:55:15 2006
+++ php-src/sapi/cgi/fastcgi.c  Tue Dec 19 09:17:04 2006
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: fastcgi.c,v 1.4.2.13.2.12 2006/12/05 08:55:15 dmitry Exp $ */
+/* $Id: fastcgi.c,v 1.4.2.13.2.13 2006/12/19 09:17:04 dmitry Exp $ */
 
 #include php.h
 #include fastcgi.h
@@ -347,6 +347,7 @@
size_t n = 0;
 
do {
+   errno = 0;
ret = write(req-fd, ((char*)buf)+n, count-n);
if (ret  0) {
n += ret;
@@ -363,6 +364,7 @@
size_t n = 0;
 
do {
+   errno = 0;
ret = read(req-fd, ((char*)buf)+n, count-n);
if (ret  0) {
n += ret;

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



[PHP-CVS] cvs: php-src /sapi/cgi fastcgi.c

2006-12-19 Thread Dmitry Stogov
dmitry  Tue Dec 19 09:17:28 2006 UTC

  Modified files:  
/php-src/sapi/cgi   fastcgi.c 
  Log:
  Fixed bug #39869 (safe_read does not initialize errno). (michiel at boland 
dot org)
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/fastcgi.c?r1=1.26r2=1.27diff_format=u
Index: php-src/sapi/cgi/fastcgi.c
diff -u php-src/sapi/cgi/fastcgi.c:1.26 php-src/sapi/cgi/fastcgi.c:1.27
--- php-src/sapi/cgi/fastcgi.c:1.26 Tue Dec  5 08:55:34 2006
+++ php-src/sapi/cgi/fastcgi.c  Tue Dec 19 09:17:28 2006
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: fastcgi.c,v 1.26 2006/12/05 08:55:34 dmitry Exp $ */
+/* $Id: fastcgi.c,v 1.27 2006/12/19 09:17:28 dmitry Exp $ */
 
 #include php.h
 #include fastcgi.h
@@ -347,6 +347,7 @@
size_t n = 0;
 
do {
+   errno = 0;
ret = write(req-fd, ((char*)buf)+n, count-n);
if (ret  0) {
n += ret;
@@ -363,6 +364,7 @@
size_t n = 0;
 
do {
+   errno = 0;
ret = read(req-fd, ((char*)buf)+n, count-n);
if (ret  0) {
n += ret;

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



[PHP-CVS] cvs: php-src(PHP_5_2) /win32/build Makefile config.w32 confutils.js mkdist.php

2006-12-19 Thread Edin Kadribasic
edink   Tue Dec 19 10:26:02 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/win32/buildMakefile config.w32 confutils.js mkdist.php 
  Log:
  Enable full build with newer Microsoft compilers
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/Makefile?r1=1.35.2.1.2.1r2=1.35.2.1.2.2diff_format=u
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.35.2.1.2.1 
php-src/win32/build/Makefile:1.35.2.1.2.2
--- php-src/win32/build/Makefile:1.35.2.1.2.1   Fri Nov 10 10:30:46 2006
+++ php-src/win32/build/MakefileTue Dec 19 10:26:01 2006
@@ -14,12 +14,13 @@
 #  | Author: Wez Furlong [EMAIL PROTECTED]   |
 #  +--+
 #
-# $Id: Makefile,v 1.35.2.1.2.1 2006/11/10 10:30:46 dmitry Exp $
+# $Id: Makefile,v 1.35.2.1.2.2 2006/12/19 10:26:01 edink Exp $
 # This is the makefile template for the win32 build
 
 CC=$(CL)
 LD=$(LINK)
 MC=$(MC)
+MT=$(MT)
 
 MCFILE=$(BUILD_DIR)\wsyslog.rc
 
@@ -54,6 +55,9 @@
 
 #  $(RC) /fo $(MCFILE) $(BUILD_DIR)\wsyslog.rc
 
+_VC_MANIFEST_EMBED_EXE= $(MT) -manifest [EMAIL PROTECTED] -outputresource:$@;1
+_VC_MANIFEST_EMBED_DLL= $(MT) -manifest [EMAIL PROTECTED] -outputresource:$@;2
+
 $(PHPDLL_RES): win32\build\template.rc
$(RC) /fo $(PHPDLL_RES) /d FILE_DESCRIPTION=\PHP Script 
Interpreter\ \
/d FILE_NAME=\$(PHPDLL)\ /d PRODUCT_NAME=\PHP Script 
Interpreter\ \
@@ -62,6 +66,7 @@
 
 $(BUILD_DIR)\$(PHPDLL): generated_files $(PHPDEF) $(PHP_GLOBAL_OBJS) 
$(STATIC_EXT_OBJS) $(PHPDLL_RES) $(MCFILE)
@$(CC) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(STATIC_EXT_LIBS) $(LIBS) 
$(PHPDLL_RES) /link /out:$(BUILD_DIR)\$(PHPDLL) $(PHP_LDFLAGS) $(LDFLAGS) 
$(STATIC_EXT_LDFLAGS)
+   [EMAIL PROTECTED](_VC_MANIFEST_EMBED_DLL)

 $(BUILD_DIR)\$(PHPLIB): $(BUILD_DIR)\$(PHPDLL)

http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.40.2.8.2.5r2=1.40.2.8.2.6diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.40.2.8.2.5 
php-src/win32/build/config.w32:1.40.2.8.2.6
--- php-src/win32/build/config.w32:1.40.2.8.2.5 Tue Dec  5 08:07:57 2006
+++ php-src/win32/build/config.w32  Tue Dec 19 10:26:01 2006
@@ -1,5 +1,5 @@
 // vim:ft=javascript
-// $Id: config.w32,v 1.40.2.8.2.5 2006/12/05 08:07:57 dmitry Exp $
+// $Id: config.w32,v 1.40.2.8.2.6 2006/12/19 10:26:01 edink Exp $
 // Master config file; think of it as a configure.in
 // equivalent.
 
@@ -49,6 +49,9 @@
 // avoid picking up midnight commander from cygwin
 PATH_PROG('mc', WshShell.Environment(Process).Item(PATH));
 
+// Try locating manifest tool
+PATH_PROG('mt', WshShell.Environment(Process).Item(PATH));
+
 // stick objects somewhere outside of the source tree
 ARG_ENABLE('object-out-dir', 'Alternate location for binary objects during 
build', '');
 if (PHP_OBJECT_OUT_DIR.length) {
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.3r2=1.60.2.1.2.4diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.60.2.1.2.3 
php-src/win32/build/confutils.js:1.60.2.1.2.4
--- php-src/win32/build/confutils.js:1.60.2.1.2.3   Fri Nov 10 10:38:07 2006
+++ php-src/win32/build/confutils.jsTue Dec 19 10:26:01 2006
@@ -17,7 +17,7 @@
   +--+
 */
 
-// $Id: confutils.js,v 1.60.2.1.2.3 2006/11/10 10:38:07 dmitry Exp $
+// $Id: confutils.js,v 1.60.2.1.2.4 2006/12/19 10:26:01 edink Exp $
 
 var STDOUT = WScript.StdOut;
 var STDERR = WScript.StdErr;
@@ -877,6 +877,7 @@
var ldflags;
var resname;
var ld;
+   var manifest;
 
if (typeof(obj_dir) == undefined) {
sapiname_for_printing = configure_module_dirname;
@@ -908,11 +909,13 @@
 
if (makefiletarget.match(new RegExp(\\.dll$))) {
ldflags = /dll $(LDFLAGS);
+   manifest = [EMAIL PROTECTED](_VC_MANIFEST_EMBED_DLL);
} else if (makefiletarget.match(new RegExp(\\.lib$))) {
ldflags = $(LDFLAGS);
ld = $(MAKE_LIB);
} else {
ldflags = $(LDFLAGS);
+   manifest = [EMAIL PROTECTED](_VC_MANIFEST_EMBED_EXE);
}
 
if (ld) {
@@ -922,6 +925,10 @@
MFO.WriteLine(\t + ld +  /nologo  +  $( + SAPI + 
_GLOBAL_OBJS) $(BUILD_DIR)\\$(PHPLIB) $(LIBS_ + SAPI + ) $(BUILD_DIR)\\ + 
resname +  /link /out:$(BUILD_DIR)\\ + makefiletarget +   + ldflags +  
$(LDFLAGS_ + SAPI + ));
}
 
+   if (manifest) {
+   MFO.WriteLine(\t + manifest);
+   }
+   
DEFINE('CFLAGS_' + SAPI + '_OBJ', '$(CFLAGS_' + SAPI + ')');
 
if (configure_module_dirname.match(pecl)) {
@@ -998,7 +1005,7 @@
var objs = null;
var EXT = extname.toUpperCase();
var extname_for_printing;
-
+   
if (shared == null) {

[PHP-CVS] cvs: php-src /win32/build Makefile config.w32 confutils.js mkdist.php

2006-12-19 Thread Edin Kadribasic
edink   Tue Dec 19 10:26:44 2006 UTC

  Modified files:  
/php-src/win32/buildMakefile config.w32 confutils.js mkdist.php 
  Log:
  MFB: Enable full build with newer Microsoft compilers
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/Makefile?r1=1.39r2=1.40diff_format=u
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.39 php-src/win32/build/Makefile:1.40
--- php-src/win32/build/Makefile:1.39   Fri Nov 10 10:30:56 2006
+++ php-src/win32/build/MakefileTue Dec 19 10:26:44 2006
@@ -14,12 +14,13 @@
 #  | Author: Wez Furlong [EMAIL PROTECTED]   |
 #  +--+
 #
-# $Id: Makefile,v 1.39 2006/11/10 10:30:56 dmitry Exp $
+# $Id: Makefile,v 1.40 2006/12/19 10:26:44 edink Exp $
 # This is the makefile template for the win32 build
 
 CC=$(CL)
 LD=$(LINK)
 MC=$(MC)
+MT=$(MT)
 
 MCFILE=$(BUILD_DIR)\wsyslog.rc
 
@@ -54,6 +55,9 @@
 
 #  $(RC) /fo $(MCFILE) $(BUILD_DIR)\wsyslog.rc
 
+_VC_MANIFEST_EMBED_EXE= $(MT) -manifest [EMAIL PROTECTED] -outputresource:$@;1
+_VC_MANIFEST_EMBED_DLL= $(MT) -manifest [EMAIL PROTECTED] -outputresource:$@;2
+
 $(PHPDLL_RES): win32\build\template.rc
$(RC) /fo $(PHPDLL_RES) /d FILE_DESCRIPTION=\PHP Script 
Interpreter\ \
/d FILE_NAME=\$(PHPDLL)\ /d PRODUCT_NAME=\PHP Script 
Interpreter\ \
@@ -62,6 +66,7 @@
 
 $(BUILD_DIR)\$(PHPDLL): generated_files $(PHPDEF) $(PHP_GLOBAL_OBJS) 
$(STATIC_EXT_OBJS) $(PHPDLL_RES) $(MCFILE)
@$(CC) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(STATIC_EXT_LIBS) $(LIBS) 
$(PHPDLL_RES) /link /out:$(BUILD_DIR)\$(PHPDLL) $(PHP_LDFLAGS) $(LDFLAGS) 
$(STATIC_EXT_LDFLAGS)
+   [EMAIL PROTECTED](_VC_MANIFEST_EMBED_DLL)

 $(BUILD_DIR)\$(PHPLIB): $(BUILD_DIR)\$(PHPDLL)

http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.60r2=1.61diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.60 php-src/win32/build/config.w32:1.61
--- php-src/win32/build/config.w32:1.60 Tue Dec  5 08:08:33 2006
+++ php-src/win32/build/config.w32  Tue Dec 19 10:26:44 2006
@@ -1,5 +1,5 @@
 // vim:ft=javascript
-// $Id: config.w32,v 1.60 2006/12/05 08:08:33 dmitry Exp $
+// $Id: config.w32,v 1.61 2006/12/19 10:26:44 edink Exp $
 // Master config file; think of it as a configure.in
 // equivalent.
 
@@ -48,6 +48,9 @@
 // avoid picking up midnight commander from cygwin
 PATH_PROG('mc', WshShell.Environment(Process).Item(PATH));
 
+// Try locating manifest tool
+PATH_PROG('mt', WshShell.Environment(Process).Item(PATH));
+
 // stick objects somewhere outside of the source tree
 ARG_ENABLE('object-out-dir', 'Alternate location for binary objects during 
build', '');
 if (PHP_OBJECT_OUT_DIR.length) {
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.64r2=1.65diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.64 
php-src/win32/build/confutils.js:1.65
--- php-src/win32/build/confutils.js:1.64   Fri Nov 10 10:38:23 2006
+++ php-src/win32/build/confutils.jsTue Dec 19 10:26:44 2006
@@ -17,7 +17,7 @@
   +--+
 */
 
-// $Id: confutils.js,v 1.64 2006/11/10 10:38:23 dmitry Exp $
+// $Id: confutils.js,v 1.65 2006/12/19 10:26:44 edink Exp $
 
 var STDOUT = WScript.StdOut;
 var STDERR = WScript.StdErr;
@@ -877,6 +877,7 @@
var ldflags;
var resname;
var ld;
+   var manifest;
 
if (typeof(obj_dir) == undefined) {
sapiname_for_printing = configure_module_dirname;
@@ -908,11 +909,13 @@
 
if (makefiletarget.match(new RegExp(\\.dll$))) {
ldflags = /dll $(LDFLAGS);
+   manifest = [EMAIL PROTECTED](_VC_MANIFEST_EMBED_DLL);
} else if (makefiletarget.match(new RegExp(\\.lib$))) {
ldflags = $(LDFLAGS);
ld = $(MAKE_LIB);
} else {
ldflags = $(LDFLAGS);
+   manifest = [EMAIL PROTECTED](_VC_MANIFEST_EMBED_EXE);
}
 
if (ld) {
@@ -922,6 +925,10 @@
MFO.WriteLine(\t + ld +  /nologo  +  $( + SAPI + 
_GLOBAL_OBJS) $(BUILD_DIR)\\$(PHPLIB) $(LIBS_ + SAPI + ) $(BUILD_DIR)\\ + 
resname +  /link /out:$(BUILD_DIR)\\ + makefiletarget +   + ldflags +  
$(LDFLAGS_ + SAPI + ));
}
 
+   if (manifest) {
+   MFO.WriteLine(\t + manifest);
+   }
+   
DEFINE('CFLAGS_' + SAPI + '_OBJ', '$(CFLAGS_' + SAPI + ')');
 
if (configure_module_dirname.match(pecl)) {
@@ -998,7 +1005,7 @@
var objs = null;
var EXT = extname.toUpperCase();
var extname_for_printing;
-
+   
if (shared == null) {
eval(shared = PHP_ + EXT + _SHARED;);
}
@@ -1040,6 +1047,7 @@
 
MFO.WriteLine($(BUILD_DIR)\\ + dllname +  $(BUILD_DIR)\\ + 
libname + : $(DEPS_ + EXT + ) $( + EXT 

[PHP-CVS] cvs: php-src(PHP_5_2) / php.ini-dist php.ini-recommended

2006-12-19 Thread Edin Kadribasic
edink   Tue Dec 19 10:34:10 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  Updated list of available extensions in dlls.
  Updated oci extension ini settings.
  -- christopher.jones at oracle dot com
  
  
http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.231.2.10.2.12r2=1.231.2.10.2.13diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.231.2.10.2.12 
php-src/php.ini-dist:1.231.2.10.2.13
--- php-src/php.ini-dist:1.231.2.10.2.12Sat Oct 14 15:06:11 2006
+++ php-src/php.ini-distTue Dec 19 10:34:10 2006
@@ -583,40 +583,51 @@
 ; extension folders as well as the separate PECL DLL download (PHP 5).
 ; Be sure to appropriately set the extension_dir directive.
 
-;extension=php_mbstring.dll
 ;extension=php_bz2.dll
 ;extension=php_curl.dll
 ;extension=php_dba.dll
 ;extension=php_dbase.dll
 ;extension=php_exif.dll
 ;extension=php_fdf.dll
-;extension=php_filepro.dll
 ;extension=php_gd2.dll
 ;extension=php_gettext.dll
+;extension=php_gmp.dll
 ;extension=php_ifx.dll
 ;extension=php_imap.dll
 ;extension=php_interbase.dll
 ;extension=php_ldap.dll
+;extension=php_mbstring.dll
 ;extension=php_mcrypt.dll
 ;extension=php_mhash.dll
 ;extension=php_mime_magic.dll
 ;extension=php_ming.dll
-;extension=php_mssql.dll
 ;extension=php_msql.dll
+;extension=php_mssql.dll
 ;extension=php_mysql.dll
+;extension=php_mysqli.dll
 ;extension=php_oci8.dll
 ;extension=php_openssl.dll
-;extension=php_oracle.dll
+;extension=php_pdo.dll
+;extension=php_pdo_firebird.dll
+;extension=php_pdo_mssql.dll
+;extension=php_pdo_mysql.dll
+;extension=php_pdo_oci.dll
+;extension=php_pdo_oci8.dll
+;extension=php_pdo_odbc.dll
+;extension=php_pdo_pgsql.dll
+;extension=php_pdo_sqlite.dll
 ;extension=php_pgsql.dll
+;extension=php_pspell.dll
 ;extension=php_shmop.dll
 ;extension=php_snmp.dll
+;extension=php_soap.dll
 ;extension=php_sockets.dll
 ;extension=php_sqlite.dll
 ;extension=php_sybase_ct.dll
 ;extension=php_tidy.dll
 ;extension=php_xmlrpc.dll
 ;extension=php_xsl.dll
-
+;extension=php_zip.dll
 
 ;;;
 ; Module Settings ;
@@ -784,6 +795,37 @@
 ; Maximum number of links (persistent+non persistent).  -1 means no limit.
 msql.max_links = -1
 
+[OCI8]
+; enables privileged connections using external credentials (OCI_SYSOPER, 
OCI_SYSDBA)
+;oci8.privileged_connect = Off
+
+; Connection: The maximum number of persistent OCI8 connections per
+; process. Using -1 means no limit.
+;oci8.max_persistent = -1
+
+; Connection: The maximum number of seconds a process is allowed to
+; maintain an idle persistent connection. Using -1 means idle
+; persistent connections will be maintained forever.
+;oci8.persistent_timeout = -1
+
+; Connection: The number of seconds that must pass before issuing a
+; ping during oci_pconnect() to check the connection validity. When
+; set to 0, each oci_pconnect() will cause a ping. Using -1 disables
+; pings completely.
+;oci8.ping_interval = 60
+
+; Tuning: This option enables statement caching, and specifies how
+; many statements to cache. Using 0 disables statement caching.
+;oci8.statement_cache_size = 20
+
+; Tuning: Enables statement prefetching and sets the default number of
+; rows that will be fetched automatically after statement execution.
+;oci8.default_prefetch = 10
+
+; Compatibility. Using On means oci_close() will not close
+; oci_connect() and oci_new_connect() connections.
+;oci8.old_oci_close_semantics = Off
+
 [PostgresSQL]
 ; Allow or prevent persistent links.
 pgsql.allow_persistent = On
http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.179.2.11.2.12r2=1.179.2.11.2.13diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.179.2.11.2.12 
php-src/php.ini-recommended:1.179.2.11.2.13
--- php-src/php.ini-recommended:1.179.2.11.2.12 Sat Oct 14 15:06:11 2006
+++ php-src/php.ini-recommended Tue Dec 19 10:34:10 2006
@@ -628,40 +628,51 @@
 ; extension folders as well as the separate PECL DLL download (PHP 5).
 ; Be sure to appropriately set the extension_dir directive.
 
-;extension=php_mbstring.dll
 ;extension=php_bz2.dll
 ;extension=php_curl.dll
 ;extension=php_dba.dll
 ;extension=php_dbase.dll
 ;extension=php_exif.dll
 ;extension=php_fdf.dll
-;extension=php_filepro.dll
 ;extension=php_gd2.dll
 ;extension=php_gettext.dll
+;extension=php_gmp.dll
 ;extension=php_ifx.dll
 ;extension=php_imap.dll
 ;extension=php_interbase.dll
 ;extension=php_ldap.dll
+;extension=php_mbstring.dll
 ;extension=php_mcrypt.dll
 ;extension=php_mhash.dll
 ;extension=php_mime_magic.dll
 ;extension=php_ming.dll
-;extension=php_mssql.dll
 ;extension=php_msql.dll
+;extension=php_mssql.dll
 ;extension=php_mysql.dll
+;extension=php_mysqli.dll
 ;extension=php_oci8.dll
 ;extension=php_openssl.dll
-;extension=php_oracle.dll
+;extension=php_pdo.dll
+;extension=php_pdo_firebird.dll
+;extension=php_pdo_mssql.dll
+;extension=php_pdo_mysql.dll
+;extension=php_pdo_oci.dll

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

2006-12-19 Thread Edin Kadribasic
edink   Tue Dec 19 10:34:58 2006 UTC

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  MFB
  
http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.257r2=1.258diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.257 php-src/php.ini-dist:1.258
--- php-src/php.ini-dist:1.257  Sat Oct 14 15:07:36 2006
+++ php-src/php.ini-distTue Dec 19 10:34:58 2006
@@ -509,40 +509,51 @@
 ; extension folders as well as the separate PECL DLL download (PHP 5).
 ; Be sure to appropriately set the extension_dir directive.
 
-;extension=php_mbstring.dll
 ;extension=php_bz2.dll
 ;extension=php_curl.dll
 ;extension=php_dba.dll
 ;extension=php_dbase.dll
 ;extension=php_exif.dll
 ;extension=php_fdf.dll
-;extension=php_filepro.dll
 ;extension=php_gd2.dll
 ;extension=php_gettext.dll
+;extension=php_gmp.dll
 ;extension=php_ifx.dll
 ;extension=php_imap.dll
 ;extension=php_interbase.dll
 ;extension=php_ldap.dll
+;extension=php_mbstring.dll
 ;extension=php_mcrypt.dll
 ;extension=php_mhash.dll
 ;extension=php_mime_magic.dll
 ;extension=php_ming.dll
-;extension=php_mssql.dll
 ;extension=php_msql.dll
+;extension=php_mssql.dll
 ;extension=php_mysql.dll
+;extension=php_mysqli.dll
 ;extension=php_oci8.dll
 ;extension=php_openssl.dll
-;extension=php_oracle.dll
+;extension=php_pdo.dll
+;extension=php_pdo_firebird.dll
+;extension=php_pdo_mssql.dll
+;extension=php_pdo_mysql.dll
+;extension=php_pdo_oci.dll
+;extension=php_pdo_oci8.dll
+;extension=php_pdo_odbc.dll
+;extension=php_pdo_pgsql.dll
+;extension=php_pdo_sqlite.dll
 ;extension=php_pgsql.dll
+;extension=php_pspell.dll
 ;extension=php_shmop.dll
 ;extension=php_snmp.dll
+;extension=php_soap.dll
 ;extension=php_sockets.dll
 ;extension=php_sqlite.dll
 ;extension=php_sybase_ct.dll
 ;extension=php_tidy.dll
 ;extension=php_xmlrpc.dll
 ;extension=php_xsl.dll
-
+;extension=php_zip.dll
 
 ;;;
 ; Module Settings ;
@@ -710,6 +721,37 @@
 ; Maximum number of links (persistent+non persistent).  -1 means no limit.
 msql.max_links = -1
 
+[OCI8]
+; enables privileged connections using external credentials (OCI_SYSOPER, 
OCI_SYSDBA)
+;oci8.privileged_connect = Off
+
+; Connection: The maximum number of persistent OCI8 connections per
+; process. Using -1 means no limit.
+;oci8.max_persistent = -1
+
+; Connection: The maximum number of seconds a process is allowed to
+; maintain an idle persistent connection. Using -1 means idle
+; persistent connections will be maintained forever.
+;oci8.persistent_timeout = -1
+
+; Connection: The number of seconds that must pass before issuing a
+; ping during oci_pconnect() to check the connection validity. When
+; set to 0, each oci_pconnect() will cause a ping. Using -1 disables
+; pings completely.
+;oci8.ping_interval = 60
+
+; Tuning: This option enables statement caching, and specifies how
+; many statements to cache. Using 0 disables statement caching.
+;oci8.statement_cache_size = 20
+
+; Tuning: Enables statement prefetching and sets the default number of
+; rows that will be fetched automatically after statement execution.
+;oci8.default_prefetch = 10
+
+; Compatibility. Using On means oci_close() will not close
+; oci_connect() and oci_new_connect() connections.
+;oci8.old_oci_close_semantics = Off
+
 [PostgresSQL]
 ; Allow or prevent persistent links.
 pgsql.allow_persistent = On
http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.206r2=1.207diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.206 php-src/php.ini-recommended:1.207
--- php-src/php.ini-recommended:1.206   Sat Oct 14 15:07:36 2006
+++ php-src/php.ini-recommended Tue Dec 19 10:34:58 2006
@@ -540,40 +540,51 @@
 ; extension folders as well as the separate PECL DLL download (PHP 5).
 ; Be sure to appropriately set the extension_dir directive.
 
-;extension=php_mbstring.dll
 ;extension=php_bz2.dll
 ;extension=php_curl.dll
 ;extension=php_dba.dll
 ;extension=php_dbase.dll
 ;extension=php_exif.dll
 ;extension=php_fdf.dll
-;extension=php_filepro.dll
 ;extension=php_gd2.dll
 ;extension=php_gettext.dll
+;extension=php_gmp.dll
 ;extension=php_ifx.dll
 ;extension=php_imap.dll
 ;extension=php_interbase.dll
 ;extension=php_ldap.dll
+;extension=php_mbstring.dll
 ;extension=php_mcrypt.dll
 ;extension=php_mhash.dll
 ;extension=php_mime_magic.dll
 ;extension=php_ming.dll
-;extension=php_mssql.dll
 ;extension=php_msql.dll
+;extension=php_mssql.dll
 ;extension=php_mysql.dll
+;extension=php_mysqli.dll
 ;extension=php_oci8.dll
 ;extension=php_openssl.dll
-;extension=php_oracle.dll
+;extension=php_pdo.dll
+;extension=php_pdo_firebird.dll
+;extension=php_pdo_mssql.dll
+;extension=php_pdo_mysql.dll
+;extension=php_pdo_oci.dll
+;extension=php_pdo_oci8.dll
+;extension=php_pdo_odbc.dll
+;extension=php_pdo_pgsql.dll
+;extension=php_pdo_sqlite.dll
 ;extension=php_pgsql.dll
+;extension=php_pspell.dll
 ;extension=php_shmop.dll
 ;extension=php_snmp.dll
+;extension=php_soap.dll
 

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/soap php_encoding.c /ext/soap/tests/bugs bug39815.phpt /ext/soap/tests/interop/Round3/GroupD r3_groupD_compound2_001w.phpt /ext/standard formatted_print

2006-12-19 Thread Dmitry Stogov
dmitry  Tue Dec 19 11:54:38 2006 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/soap/tests/bugsbug39815.phpt 

  Modified files:  
/php-srcNEWS 
/php-src/main   snprintf.c snprintf.h spprintf.c 
/php-src/ext/standard   formatted_print.c 
/php-src/ext/soap   php_encoding.c 
/php-src/ext/soap/tests/interop/Round3/GroupD   

r3_groupD_compound2_001w.phpt 
  Log:
  Fixed bug #39815 (SOAP double encoding is not locale-independent)
  
  http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.442r2=1.2027.2.547.2.443diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.442 php-src/NEWS:1.2027.2.547.2.443
--- php-src/NEWS:1.2027.2.547.2.442 Tue Dec 19 09:17:04 2006
+++ php-src/NEWSTue Dec 19 11:54:37 2006
@@ -14,6 +14,7 @@
   when trying to open php://wrong). (Tony)
 - Fixed bug #39832 (SOAP Server: parameter not matching the WSDL specified type
   are set to 0). (Dmitry)
+- Fixed bug #39815 (SOAP double encoding is not locale-independent). (Dmitry)
 
 14 Dec 2006, PHP 5.2.1RC1
 - Added a meta tag to phpinfo() output to prevent search engines from indexing 
http://cvs.php.net/viewvc.cgi/php-src/main/snprintf.c?r1=1.37.2.4.2.3r2=1.37.2.4.2.4diff_format=u
Index: php-src/main/snprintf.c
diff -u php-src/main/snprintf.c:1.37.2.4.2.3 
php-src/main/snprintf.c:1.37.2.4.2.4
--- php-src/main/snprintf.c:1.37.2.4.2.3Mon Dec 18 09:26:54 2006
+++ php-src/main/snprintf.c Tue Dec 19 11:54:38 2006
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: snprintf.c,v 1.37.2.4.2.3 2006/12/18 09:26:54 bjori Exp $ */
+/* $Id: snprintf.c,v 1.37.2.4.2.4 2006/12/19 11:54:38 dmitry Exp $ */
 
 
 #include php.h
@@ -115,23 +115,20 @@
return(s);
 }
 
-char *bsd_ecvt(double value, int ndigit, int *decpt, int *sign)
+static inline char *php_ecvt(double value, int ndigit, int *decpt, int *sign)
 {
return(__cvt(value, ndigit, decpt, sign, 0, 1));
 }
 
-char *bsd_fcvt(double value, int ndigit, int *decpt, int *sign)
+static inline char *php_fcvt(double value, int ndigit, int *decpt, int *sign)
 {
 return(__cvt(value, ndigit, decpt, sign, 1, 1));
 }
 
-char *bsd_gcvt(double value, int ndigit, char *buf)
+PHPAPI char *php_gcvt(double value, int ndigit, char dec_point, char exponent, 
char *buf)
 {
char *digits, *dst, *src;
int i, decpt, sign;
-   struct lconv *lconv;
-
-   lconv = localeconv();
 
digits = zend_dtoa(value, 2, ndigit, decpt, sign, NULL);
if (decpt == ) {
@@ -161,7 +158,7 @@
sign = 0;
src = digits;
*dst++ = *src++;
-   *dst++ = *lconv-decimal_point;
+   *dst++ = dec_point;
if (*src == '\0') {
*dst++ = '0';
} else {
@@ -169,7 +166,7 @@
*dst++ = *src++;
} while (*src != '\0');
}
-   *dst++ = 'e';
+   *dst++ = exponent;
if (sign)
*dst++ = '-';
else
@@ -190,7 +187,7 @@
} else if (decpt  0) {
/* standard format 0. */
*dst++ = '0';   /* zero before decimal point */
-   *dst++ = *lconv-decimal_point;
+   *dst++ = dec_point;
do {
*dst++ = '0';
} while (++decpt  0);
@@ -210,7 +207,7 @@
if (*src != '\0') {
if (src == digits)
*dst++ = '0';   /* zero before decimal point */
-   *dst++ = *lconv-decimal_point;
+   *dst++ = dec_point;
for (i = decpt; digits[i] != '\0'; i++) {
 *dst++ = digits[i];
 }
@@ -357,29 +354,21 @@
  * The sign is returned in the is_negative argument (and is not placed
  * in buf).
  */
-char * ap_php_conv_fp(register char format, register double num,
-boolean_e add_dp, int precision, bool_int * is_negative, char 
*buf, int *len)
+PHPAPI char * php_conv_fp(register char format, register double num,
+boolean_e add_dp, int precision, char dec_point, bool_int * 
is_negative, char *buf, int *len)
 {
register char *s = buf;
register char *p, *p_orig;
int decimal_point;
-   char dec_point = '.';
-
-   if (format == 'f') {
-   struct lconv *lconv;
-   lconv = localeconv();
-   dec_point = *lconv-decimal_point;
-   format = 'F';
-   }
 
if (precision = NDIG - 1) {
precision = NDIG - 2;
}
 
if (format == 'F')
-   p_orig = p = bsd_fcvt(num, precision, decimal_point, 
is_negative);
+   p_orig = p = 

[PHP-CVS] cvs: php-src /ext/soap php_encoding.c /ext/soap/tests/bugs bug39815.phpt /ext/soap/tests/interop/Round3/GroupD r3_groupD_compound2_001w.phpt /ext/standard formatted_print.c /main snprint

2006-12-19 Thread Dmitry Stogov
dmitry  Tue Dec 19 11:55:17 2006 UTC

  Modified files:  
/php-src/main   snprintf.c snprintf.h spprintf.c 
/php-src/ext/standard   formatted_print.c 
/php-src/ext/soap   php_encoding.c 
/php-src/ext/soap/tests/bugsbug39815.phpt 
/php-src/ext/soap/tests/interop/Round3/GroupD   

r3_groupD_compound2_001w.phpt 
  Log:
  Fixed bug #39815 (SOAP double encoding is not locale-independent)
  
  http://cvs.php.net/viewvc.cgi/php-src/main/snprintf.c?r1=1.44r2=1.45diff_format=u
Index: php-src/main/snprintf.c
diff -u php-src/main/snprintf.c:1.44 php-src/main/snprintf.c:1.45
--- php-src/main/snprintf.c:1.44Mon Dec 18 09:25:32 2006
+++ php-src/main/snprintf.c Tue Dec 19 11:55:16 2006
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: snprintf.c,v 1.44 2006/12/18 09:25:32 bjori Exp $ */
+/* $Id: snprintf.c,v 1.45 2006/12/19 11:55:16 dmitry Exp $ */
 
 
 #include php.h
@@ -115,23 +115,20 @@
return(s);
 }
 
-char *bsd_ecvt(double value, int ndigit, int *decpt, int *sign)
+static inline char *php_ecvt(double value, int ndigit, int *decpt, int *sign)
 {
return(__cvt(value, ndigit, decpt, sign, 0, 1));
 }
 
-char *bsd_fcvt(double value, int ndigit, int *decpt, int *sign)
+static inline char *php_fcvt(double value, int ndigit, int *decpt, int *sign)
 {
 return(__cvt(value, ndigit, decpt, sign, 1, 1));
 }
 
-char *bsd_gcvt(double value, int ndigit, char *buf)
+PHPAPI char *php_gcvt(double value, int ndigit, char dec_point, char exponent, 
char *buf)
 {
char *digits, *dst, *src;
int i, decpt, sign;
-   struct lconv *lconv;
-
-   lconv = localeconv();
 
digits = zend_dtoa(value, 2, ndigit, decpt, sign, NULL);
if (decpt == ) {
@@ -161,7 +158,7 @@
sign = 0;
src = digits;
*dst++ = *src++;
-   *dst++ = *lconv-decimal_point;
+   *dst++ = dec_point;
if (*src == '\0') {
*dst++ = '0';
} else {
@@ -169,7 +166,7 @@
*dst++ = *src++;
} while (*src != '\0');
}
-   *dst++ = 'e';
+   *dst++ = exponent;
if (sign)
*dst++ = '-';
else
@@ -190,7 +187,7 @@
} else if (decpt  0) {
/* standard format 0. */
*dst++ = '0';   /* zero before decimal point */
-   *dst++ = *lconv-decimal_point;
+   *dst++ = dec_point;
do {
*dst++ = '0';
} while (++decpt  0);
@@ -210,7 +207,7 @@
if (*src != '\0') {
if (src == digits)
*dst++ = '0';   /* zero before decimal point */
-   *dst++ = *lconv-decimal_point;
+   *dst++ = dec_point;
for (i = decpt; digits[i] != '\0'; i++) {
 *dst++ = digits[i];
 }
@@ -357,29 +354,21 @@
  * The sign is returned in the is_negative argument (and is not placed
  * in buf).
  */
-char * ap_php_conv_fp(register char format, register double num,
-boolean_e add_dp, int precision, bool_int * is_negative, char 
*buf, int *len)
+PHPAPI char * php_conv_fp(register char format, register double num,
+boolean_e add_dp, int precision, char dec_point, bool_int * 
is_negative, char *buf, int *len)
 {
register char *s = buf;
register char *p, *p_orig;
int decimal_point;
-   char dec_point = '.';
-
-   if (format == 'f') {
-   struct lconv *lconv;
-   lconv = localeconv();
-   dec_point = *lconv-decimal_point;
-   format = 'F';
-   }
 
if (precision = NDIG - 1) {
precision = NDIG - 2;
}
 
if (format == 'F')
-   p_orig = p = bsd_fcvt(num, precision, decimal_point, 
is_negative);
+   p_orig = p = php_fcvt(num, precision, decimal_point, 
is_negative);
else/* either e or E format 
*/
-   p_orig = p = bsd_ecvt(num, precision + 1, decimal_point, 
is_negative);
+   p_orig = p = php_ecvt(num, precision + 1, decimal_point, 
is_negative);
 
/*
 * Check for Infinity and NaN
@@ -595,6 +584,8 @@
char num_buf[NUM_BUF_SIZE];
char char_buf[2];   /* for printing %% and 
%unknown */
 
+   struct lconv *lconv = NULL;
+
/*
 * Flag variables
 */
@@ -929,6 +920,7 @@
 

case 'f':
+   case 'F':
case 'e':
   

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard var.c

2006-12-19 Thread Antony Dovgal
tony2001Tue Dec 19 12:36:44 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard   var.c 
  Log:
  serialize() should use '.' as decimal point irrespectively to locale
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var.c?r1=1.203.2.7.2.10r2=1.203.2.7.2.11diff_format=u
Index: php-src/ext/standard/var.c
diff -u php-src/ext/standard/var.c:1.203.2.7.2.10 
php-src/ext/standard/var.c:1.203.2.7.2.11
--- php-src/ext/standard/var.c:1.203.2.7.2.10   Fri Dec  8 21:18:43 2006
+++ php-src/ext/standard/var.c  Tue Dec 19 12:36:44 2006
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: var.c,v 1.203.2.7.2.10 2006/12/08 21:18:43 tony2001 Exp $ */
+/* $Id: var.c,v 1.203.2.7.2.11 2006/12/19 12:36:44 tony2001 Exp $ */
 
 
 
@@ -689,10 +689,12 @@
 
case IS_DOUBLE: {
char *s;
-   ulong slen;
 
-   slen = spprintf(s, 0, d:%.*G;, (int) 
PG(serialize_precision), Z_DVAL_P(struc));
-   smart_str_appendl(buf, s, slen);
+   smart_str_appendl(buf, d:, 2);
+   s = (char *) emalloc(MAX_LENGTH_OF_DOUBLE + 
PG(serialize_precision) + 1);
+   php_gcvt(Z_DVAL_P(struc), 
PG(serialize_precision), '.', 'E', s);
+   smart_str_appends(buf, s);
+   smart_str_appendc(buf, ';');
efree(s);
return;
}

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



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

2006-12-19 Thread Antony Dovgal
tony2001Tue Dec 19 12:44:26 2006 UTC

  Modified files:  
/php-src/ext/standard   var.c 
  Log:
  MFB: serialize() should use '.' as decimal point irrespectively to locale
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var.c?r1=1.252r2=1.253diff_format=u
Index: php-src/ext/standard/var.c
diff -u php-src/ext/standard/var.c:1.252 php-src/ext/standard/var.c:1.253
--- php-src/ext/standard/var.c:1.252Thu Dec 14 23:41:57 2006
+++ php-src/ext/standard/var.c  Tue Dec 19 12:44:26 2006
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: var.c,v 1.252 2006/12/14 23:41:57 andrei Exp $ */
+/* $Id: var.c,v 1.253 2006/12/19 12:44:26 tony2001 Exp $ */
 
 
 
@@ -942,10 +942,12 @@
 
case IS_DOUBLE: {
char *s;
-   ulong slen;
 
-   slen = spprintf(s, 0, d:%.*G;, (int) 
PG(serialize_precision), Z_DVAL_P(struc));
-   smart_str_appendl(buf, s, slen);
+   smart_str_appendl(buf, d:, 2);
+   s = (char *) emalloc(MAX_LENGTH_OF_DOUBLE + 
PG(serialize_precision) + 1);
+   php_gcvt(Z_DVAL_P(struc), 
PG(serialize_precision), '.', 'E', s);
+   smart_str_appends(buf, s);
+   smart_str_appendc(buf, ';');
efree(s);
return;
}

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



[PHP-CVS] cvs: php-src(PHP_5_2) /sapi/cli/tests 011.phpt

2006-12-19 Thread Antony Dovgal
tony2001Tue Dec 19 13:08:36 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/sapi/cli/tests 011.phpt 
  Log:
  fix test on MacOS
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/011.phpt?r1=1.1.2.4r2=1.1.2.5diff_format=u
Index: php-src/sapi/cli/tests/011.phpt
diff -u php-src/sapi/cli/tests/011.phpt:1.1.2.4 
php-src/sapi/cli/tests/011.phpt:1.1.2.5
--- php-src/sapi/cli/tests/011.phpt:1.1.2.4 Mon Dec  4 17:48:52 2006
+++ php-src/sapi/cli/tests/011.phpt Tue Dec 19 13:08:35 2006
@@ -52,7 +52,7 @@
 Could not open input file: some.unknown
 NULL
 string(%d) 
-Parse error: %s error, unexpected T_PRIVATE, expecting '{' in %s on line %d
+Parse error: %s expecting %s{%s in %s on line %d
 Errors parsing %s011.test.php
 
 Done

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



[PHP-CVS] cvs: php-src /sapi/cli/tests 011.phpt

2006-12-19 Thread Antony Dovgal
tony2001Tue Dec 19 13:08:23 2006 UTC

  Modified files:  
/php-src/sapi/cli/tests 011.phpt 
  Log:
  fix test on MacOS
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/011.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/sapi/cli/tests/011.phpt
diff -u php-src/sapi/cli/tests/011.phpt:1.3 php-src/sapi/cli/tests/011.phpt:1.4
--- php-src/sapi/cli/tests/011.phpt:1.3 Mon Dec  4 17:48:27 2006
+++ php-src/sapi/cli/tests/011.phpt Tue Dec 19 13:08:23 2006
@@ -52,7 +52,7 @@
 string(40) Could not open input file: some.unknown
 
 string(%d) 
-Parse error: %s error, unexpected T_PRIVATE, expecting '{' in %s on line %d
+Parse error: %s expecting %s{%s in %s on line %d
 Errors parsing %s011.test.php
 
 Done

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



[PHP-CVS] cvs: php-src /ext/pcre/tests 002.phpt

2006-12-19 Thread Antony Dovgal
tony2001Tue Dec 19 13:11:30 2006 UTC

  Modified files:  
/php-src/ext/pcre/tests 002.phpt 
  Log:
  fix test on MacOS
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/002.phpt?r1=1.4r2=1.5diff_format=u
Index: php-src/ext/pcre/tests/002.phpt
diff -u php-src/ext/pcre/tests/002.phpt:1.4 php-src/ext/pcre/tests/002.phpt:1.5
--- php-src/ext/pcre/tests/002.phpt:1.4 Sun Dec  3 11:20:32 2006
+++ php-src/ext/pcre/tests/002.phpt Tue Dec 19 13:11:30 2006
@@ -57,7 +57,7 @@
 Warning: preg_replace(): Compilation failed: missing terminating ] for 
character class at offset 8 in %s002.php on line 11
 NULL
 
-Parse error: %s, unexpected T_FOR in %s002.php(12) : regexp code on line 1
+Parse error: %s in %s002.php(12) : regexp code on line 1
 
 Fatal error: preg_replace(): Failed evaluating code: 
 for ($ in %s002.php on line 12

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



[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pcre/tests 002.phpt

2006-12-19 Thread Antony Dovgal
tony2001Tue Dec 19 13:11:32 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/pcre/tests 002.phpt 
  Log:
  MFH
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/002.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/pcre/tests/002.phpt
diff -u php-src/ext/pcre/tests/002.phpt:1.1.2.2 
php-src/ext/pcre/tests/002.phpt:1.1.2.3
--- php-src/ext/pcre/tests/002.phpt:1.1.2.2 Sun Dec  3 08:04:57 2006
+++ php-src/ext/pcre/tests/002.phpt Tue Dec 19 13:11:32 2006
@@ -34,7 +34,7 @@
 Warning: preg_replace(): Compilation failed: missing terminating ] for 
character class at offset 8 in %s002.php on line 11
 NULL
 
-Parse error: %s, unexpected T_FOR in %s002.php(12) : regexp code on line 1
+Parse error: %s in %s002.php(12) : regexp code on line 1
 
 Fatal error: preg_replace(): Failed evaluating code: 
 for ($ in %s002.php on line 12

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



[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard formatted_print.c /main snprintf.c spprintf.c

2006-12-19 Thread Dmitry Stogov
dmitry  Tue Dec 19 13:13:29 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/main   snprintf.c spprintf.c 
/php-src/ext/standard   formatted_print.c 
  Log:
  Support for systems without locale.h
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/snprintf.c?r1=1.37.2.4.2.4r2=1.37.2.4.2.5diff_format=u
Index: php-src/main/snprintf.c
diff -u php-src/main/snprintf.c:1.37.2.4.2.4 
php-src/main/snprintf.c:1.37.2.4.2.5
--- php-src/main/snprintf.c:1.37.2.4.2.4Tue Dec 19 11:54:38 2006
+++ php-src/main/snprintf.c Tue Dec 19 13:13:28 2006
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: snprintf.c,v 1.37.2.4.2.4 2006/12/19 11:54:38 dmitry Exp $ */
+/* $Id: snprintf.c,v 1.37.2.4.2.5 2006/12/19 13:13:28 dmitry Exp $ */
 
 
 #include php.h
@@ -38,6 +38,9 @@
 
 #ifdef HAVE_LOCALE_H
 #include locale.h
+#define LCONV_DECIMAL_POINT (*lconv-decimal_point)
+#else
+#define LCONV_DECIMAL_POINT '.'
 #endif
 
 /*
@@ -584,7 +587,9 @@
char num_buf[NUM_BUF_SIZE];
char char_buf[2];   /* for printing %% and 
%unknown */
 
+#ifdef HAVE_LOCALE_H
struct lconv *lconv = NULL;
+#endif
 
/*
 * Flag variables
@@ -942,12 +947,14 @@
s = inf;
s_len = 3;
} else {
+#ifdef HAVE_LOCALE_H
if (!lconv) {
lconv = localeconv();
}
+#endif
s = php_conv_fp((*fmt == 
'f')?'F':*fmt, fp_num, alternate_form,
 (adjust_precision == NO) ? 
FLOAT_DIGITS : precision,
-(*fmt == 
'f')?(*lconv-decimal_point):'.',
+(*fmt == 
'f')?LCONV_DECIMAL_POINT:'.',

is_negative, num_buf[1], s_len);
if (is_negative)
prefix_char = '-';
@@ -994,10 +1001,12 @@
/*
 * * We use num_buf[ 1 ], so that we 
have room for the sign
 */
+#ifdef HAVE_LOCALE_H
if (!lconv) {
lconv = localeconv();
}
-   s = php_gcvt(fp_num, precision, 
*lconv-decimal_point, (*fmt == 'G')?'E':'e', num_buf[1]);
+#endif
+   s = php_gcvt(fp_num, precision, 
LCONV_DECIMAL_POINT, (*fmt == 'G')?'E':'e', num_buf[1]);
if (*s == '-')
prefix_char = *s++;
else if (print_sign)
http://cvs.php.net/viewvc.cgi/php-src/main/spprintf.c?r1=1.25.2.2.2.3r2=1.25.2.2.2.4diff_format=u
Index: php-src/main/spprintf.c
diff -u php-src/main/spprintf.c:1.25.2.2.2.3 
php-src/main/spprintf.c:1.25.2.2.2.4
--- php-src/main/spprintf.c:1.25.2.2.2.3Tue Dec 19 11:54:38 2006
+++ php-src/main/spprintf.c Tue Dec 19 13:13:28 2006
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: spprintf.c,v 1.25.2.2.2.3 2006/12/19 11:54:38 dmitry Exp $ */
+/* $Id: spprintf.c,v 1.25.2.2.2.4 2006/12/19 13:13:28 dmitry Exp $ */
 
 /* This is the spprintf implementation.
  * It has emerged from apache snprintf. See original header:
@@ -92,6 +92,9 @@
 
 #ifdef HAVE_LOCALE_H
 #include locale.h
+#define LCONV_DECIMAL_POINT (*lconv-decimal_point)
+#else
+#define LCONV_DECIMAL_POINT '.'
 #endif
 
 #include snprintf.h
@@ -199,7 +202,9 @@
char num_buf[NUM_BUF_SIZE];
char char_buf[2];   /* for printing %% and 
%unknown */
 
+#ifdef HAVE_LOCALE_H
struct lconv *lconv = NULL;
+#endif
 
/*
 * Flag variables
@@ -554,9 +559,11 @@
s = inf;
s_len = 3;
} else {
+#ifdef HAVE_LOCALE_H
if (!lconv) {
lconv = localeconv();
}
+#endif
s = php_conv_fp((*fmt == 
'f')?'F':*fmt, fp_num, alternate_form,
 (adjust_precision == NO) ? 
FLOAT_DIGITS : precision,
 (*fmt == 

[PHP-CVS] cvs: php-src /ext/standard formatted_print.c /main snprintf.c spprintf.c

2006-12-19 Thread Dmitry Stogov
dmitry  Tue Dec 19 13:13:48 2006 UTC

  Modified files:  
/php-src/main   snprintf.c spprintf.c 
/php-src/ext/standard   formatted_print.c 
  Log:
  Support for systems without locale.h
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/snprintf.c?r1=1.45r2=1.46diff_format=u
Index: php-src/main/snprintf.c
diff -u php-src/main/snprintf.c:1.45 php-src/main/snprintf.c:1.46
--- php-src/main/snprintf.c:1.45Tue Dec 19 11:55:16 2006
+++ php-src/main/snprintf.c Tue Dec 19 13:13:48 2006
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: snprintf.c,v 1.45 2006/12/19 11:55:16 dmitry Exp $ */
+/* $Id: snprintf.c,v 1.46 2006/12/19 13:13:48 dmitry Exp $ */
 
 
 #include php.h
@@ -38,6 +38,9 @@
 
 #ifdef HAVE_LOCALE_H
 #include locale.h
+#define LCONV_DECIMAL_POINT (*lconv-decimal_point)
+#else
+#define LCONV_DECIMAL_POINT '.'
 #endif
 
 /*
@@ -584,7 +587,9 @@
char num_buf[NUM_BUF_SIZE];
char char_buf[2];   /* for printing %% and 
%unknown */
 
+#ifdef HAVE_LOCALE_H
struct lconv *lconv = NULL;
+#endif
 
/*
 * Flag variables
@@ -941,12 +946,14 @@
s = inf;
s_len = 3;
} else {
+#ifdef HAVE_LOCALE_H
if (!lconv) {
lconv = localeconv();
}
+#endif
s = php_conv_fp((*fmt == 
'f')?'F':*fmt, fp_num, alternate_form,
 (adjust_precision == NO) ? 
FLOAT_DIGITS : precision,
-(*fmt == 
'f')?(*lconv-decimal_point):'.',
+(*fmt == 
'f')?LCONV_DECIMAL_POINT:'.',

is_negative, num_buf[1], s_len);
if (is_negative)
prefix_char = '-';
@@ -993,10 +1000,12 @@
/*
 * * We use num_buf[ 1 ], so that we 
have room for the sign
 */
+#ifdef HAVE_LOCALE_H
if (!lconv) {
lconv = localeconv();
}
-   s = php_gcvt(fp_num, precision, 
*lconv-decimal_point, (*fmt == 'G')?'E':'e', num_buf[1]);
+#endif
+   s = php_gcvt(fp_num, precision, 
LCONV_DECIMAL_POINT, (*fmt == 'G')?'E':'e', num_buf[1]);
if (*s == '-')
prefix_char = *s++;
else if (print_sign)
http://cvs.php.net/viewvc.cgi/php-src/main/spprintf.c?r1=1.39r2=1.40diff_format=u
Index: php-src/main/spprintf.c
diff -u php-src/main/spprintf.c:1.39 php-src/main/spprintf.c:1.40
--- php-src/main/spprintf.c:1.39Tue Dec 19 11:55:16 2006
+++ php-src/main/spprintf.c Tue Dec 19 13:13:48 2006
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: spprintf.c,v 1.39 2006/12/19 11:55:16 dmitry Exp $ */
+/* $Id: spprintf.c,v 1.40 2006/12/19 13:13:48 dmitry Exp $ */
 
 /* This is the spprintf implementation.
  * It has emerged from apache snprintf. See original header:
@@ -93,6 +93,9 @@
 
 #ifdef HAVE_LOCALE_H
 #include locale.h
+#define LCONV_DECIMAL_POINT (*lconv-decimal_point)
+#else
+#define LCONV_DECIMAL_POINT '.'
 #endif
 
 #include snprintf.h
@@ -230,7 +233,9 @@
char char_buf[2];   /* for printing %% and 
%unknown */
zend_bool free_s; /* free string if allocated here */
 
+#ifdef HAVE_LOCALE_H
struct lconv *lconv = NULL;
+#endif
 
/*
 * Flag variables
@@ -644,12 +649,14 @@
s = inf;
s_len = 3;
} else {
+#ifdef HAVE_LOCALE_H
if (!lconv) {
lconv = localeconv();
}
+#endif
s = php_conv_fp((*fmt == 
'f')?'F':*fmt, fp_num, alternate_form,
 (adjust_precision == NO) ? 
FLOAT_DIGITS : precision,
-(*fmt == 
'f')?(*lconv-decimal_point):'.',
+(*fmt == 
'f')?LCONV_DECIMAL_POINT:'.',
  

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

2006-12-19 Thread Antony Dovgal
tony2001Tue Dec 19 13:15:30 2006 UTC

  Modified files:  
/php-src/main   snprintf.c 
  Log:
  inf-INF
  nan-NAN
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/snprintf.c?r1=1.46r2=1.47diff_format=u
Index: php-src/main/snprintf.c
diff -u php-src/main/snprintf.c:1.46 php-src/main/snprintf.c:1.47
--- php-src/main/snprintf.c:1.46Tue Dec 19 13:13:48 2006
+++ php-src/main/snprintf.c Tue Dec 19 13:15:30 2006
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: snprintf.c,v 1.46 2006/12/19 13:13:48 dmitry Exp $ */
+/* $Id: snprintf.c,v 1.47 2006/12/19 13:15:30 tony2001 Exp $ */
 
 
 #include php.h
@@ -93,7 +93,7 @@
*decpt = 0;
c = *p;
zend_freedtoa(p);
-   return(c == 'I' ? inf : nan);
+   return(c == 'I' ? INF : NAN);
}
/* Make a local copy and adjust rve to be in terms of s */
if (pad  fmode)
@@ -140,7 +140,7 @@
 * We assume the buffer is at least ndigit long.
 */
snprintf(buf, ndigit + 1, %s%s, sign ? - : ,
-   *digits == 'I' ? inf : nan);
+   *digits == 'I' ? INF : NAN);
zend_freedtoa(digits);
return (buf);
}
@@ -940,10 +940,10 @@
}
 
if (zend_isnan(fp_num)) {
-   s = nan;
+   s = NAN;
s_len = 3;
} else if (zend_isinf(fp_num)) {
-   s = inf;
+   s = INF;
s_len = 3;
} else {
 #ifdef HAVE_LOCALE_H

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



[PHP-CVS] cvs: php-src(PHP_5_2) /main snprintf.c

2006-12-19 Thread Antony Dovgal
tony2001Tue Dec 19 13:15:40 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/main   snprintf.c 
  Log:
  MFH
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/snprintf.c?r1=1.37.2.4.2.5r2=1.37.2.4.2.6diff_format=u
Index: php-src/main/snprintf.c
diff -u php-src/main/snprintf.c:1.37.2.4.2.5 
php-src/main/snprintf.c:1.37.2.4.2.6
--- php-src/main/snprintf.c:1.37.2.4.2.5Tue Dec 19 13:13:28 2006
+++ php-src/main/snprintf.c Tue Dec 19 13:15:39 2006
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: snprintf.c,v 1.37.2.4.2.5 2006/12/19 13:13:28 dmitry Exp $ */
+/* $Id: snprintf.c,v 1.37.2.4.2.6 2006/12/19 13:15:39 tony2001 Exp $ */
 
 
 #include php.h
@@ -93,7 +93,7 @@
*decpt = 0;
c = *p;
zend_freedtoa(p);
-   return(c == 'I' ? inf : nan);
+   return(c == 'I' ? INF : NAN);
}
/* Make a local copy and adjust rve to be in terms of s */
if (pad  fmode)
@@ -140,7 +140,7 @@
 * We assume the buffer is at least ndigit long.
 */
snprintf(buf, ndigit + 1, %s%s, sign ? - : ,
-   *digits == 'I' ? inf : nan);
+   *digits == 'I' ? INF : NAN);
zend_freedtoa(digits);
return (buf);
}
@@ -941,10 +941,10 @@
}
 
if (zend_isnan(fp_num)) {
-   s = nan;
+   s = NAN;
s_len = 3;
} else if (zend_isinf(fp_num)) {
-   s = inf;
+   s = INF;
s_len = 3;
} else {
 #ifdef HAVE_LOCALE_H

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



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

2006-12-19 Thread Antony Dovgal
tony2001Tue Dec 19 13:26:39 2006 UTC

  Modified files:  
/php-src/main   snprintf.c 
  Log:
  -NAN should not be possible
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/snprintf.c?r1=1.47r2=1.48diff_format=u
Index: php-src/main/snprintf.c
diff -u php-src/main/snprintf.c:1.47 php-src/main/snprintf.c:1.48
--- php-src/main/snprintf.c:1.47Tue Dec 19 13:15:30 2006
+++ php-src/main/snprintf.c Tue Dec 19 13:26:39 2006
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: snprintf.c,v 1.47 2006/12/19 13:15:30 tony2001 Exp $ */
+/* $Id: snprintf.c,v 1.48 2006/12/19 13:26:39 tony2001 Exp $ */
 
 
 #include php.h
@@ -139,7 +139,7 @@
 * Infinity or NaN, convert to inf or nan with sign.
 * We assume the buffer is at least ndigit long.
 */
-   snprintf(buf, ndigit + 1, %s%s, sign ? - : ,
+   snprintf(buf, ndigit + 1, %s%s, (sign  *digits == 'I') ? 
- : ,
*digits == 'I' ? INF : NAN);
zend_freedtoa(digits);
return (buf);

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



[PHP-CVS] cvs: php-src(PHP_5_2) /main snprintf.c

2006-12-19 Thread Antony Dovgal
tony2001Tue Dec 19 13:27:09 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/main   snprintf.c 
  Log:
  MFH
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/snprintf.c?r1=1.37.2.4.2.6r2=1.37.2.4.2.7diff_format=u
Index: php-src/main/snprintf.c
diff -u php-src/main/snprintf.c:1.37.2.4.2.6 
php-src/main/snprintf.c:1.37.2.4.2.7
--- php-src/main/snprintf.c:1.37.2.4.2.6Tue Dec 19 13:15:39 2006
+++ php-src/main/snprintf.c Tue Dec 19 13:27:09 2006
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: snprintf.c,v 1.37.2.4.2.6 2006/12/19 13:15:39 tony2001 Exp $ */
+/* $Id: snprintf.c,v 1.37.2.4.2.7 2006/12/19 13:27:09 tony2001 Exp $ */
 
 
 #include php.h
@@ -139,7 +139,7 @@
 * Infinity or NaN, convert to inf or nan with sign.
 * We assume the buffer is at least ndigit long.
 */
-   snprintf(buf, ndigit + 1, %s%s, sign ? - : ,
+   snprintf(buf, ndigit + 1, %s%s, (sign  *digits == 'I') ? 
- : ,
*digits == 'I' ? INF : NAN);
zend_freedtoa(digits);
return (buf);

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



[PHP-CVS] cvs: php-src /ext/filter/tests 004.phpt 006.phpt 007.phpt 008.phpt 009.phpt 010.phpt 011.phpt 012.phpt 013.phpt 014.phpt 015.phpt 016.phpt 017.phpt 018.phpt 019.phpt 020.phpt 021.phpt 022.ph

2006-12-19 Thread Antony Dovgal
tony2001Tue Dec 19 14:16:08 2006 UTC

  Modified files:  
/php-src/ext/filter/tests   004.phpt 006.phpt 007.phpt 008.phpt 
009.phpt 010.phpt 011.phpt 012.phpt 
013.phpt 014.phpt 015.phpt 016.phpt 
017.phpt 018.phpt 019.phpt 020.phpt 
021.phpt 022.phpt 023.phpt 024.phpt 
025.phpt 026.phpt 027.phpt 028.phpt 
029.phpt 030.phpt 031.phpt 032.phpt 
033.phpt 034.phpt 035.phpt 037.phpt 
038.phpt 040.phpt 041.phpt 042.phpt 
043.phpt 044.phpt bug39846.phpt 
bug7586.phpt bug7715.phpt bug7733.phpt 
bug8315.phpt 
callback_non_modified_var.phpt 
filter_data.phpt 
  Log:
  add missing SKIPIF sections
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/004.phpt?r1=1.4r2=1.5diff_format=u
Index: php-src/ext/filter/tests/004.phpt
diff -u php-src/ext/filter/tests/004.phpt:1.4 
php-src/ext/filter/tests/004.phpt:1.5
--- php-src/ext/filter/tests/004.phpt:1.4   Sat Dec  9 03:07:49 2006
+++ php-src/ext/filter/tests/004.phpt   Tue Dec 19 14:16:07 2006
@@ -1,5 +1,7 @@
 --TEST--
 GET/POST/REQUEST Test with filtered data
+--SKIPIF--
+?php if (!extension_loaded(filter)) die(skip); ?
 --INI--
 filter.default=special_chars
 --POST--
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/006.phpt?r1=1.5r2=1.6diff_format=u
Index: php-src/ext/filter/tests/006.phpt
diff -u php-src/ext/filter/tests/006.phpt:1.5 
php-src/ext/filter/tests/006.phpt:1.6
--- php-src/ext/filter/tests/006.phpt:1.5   Wed Oct  4 11:56:15 2006
+++ php-src/ext/filter/tests/006.phpt   Tue Dec 19 14:16:07 2006
@@ -1,5 +1,7 @@
 --TEST--
 filter() test
+--SKIPIF--
+?php if (!extension_loaded(filter)) die(skip); ?
 --POST--
 foo=babc/b
 --FILE--
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/007.phpt?r1=1.4r2=1.5diff_format=u
Index: php-src/ext/filter/tests/007.phpt
diff -u php-src/ext/filter/tests/007.phpt:1.4 
php-src/ext/filter/tests/007.phpt:1.5
--- php-src/ext/filter/tests/007.phpt:1.4   Sat Dec  9 03:18:21 2006
+++ php-src/ext/filter/tests/007.phpt   Tue Dec 19 14:16:07 2006
@@ -1,5 +1,7 @@
 --TEST--
 filter_has_var()
+--SKIPIF--
+?php if (!extension_loaded(filter)) die(skip); ?
 --GET--
 a=qweabc=ahref/a
 --POST--
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/008.phpt?r1=1.6r2=1.7diff_format=u
Index: php-src/ext/filter/tests/008.phpt
diff -u php-src/ext/filter/tests/008.phpt:1.6 
php-src/ext/filter/tests/008.phpt:1.7
--- php-src/ext/filter/tests/008.phpt:1.6   Mon Dec  4 21:23:02 2006
+++ php-src/ext/filter/tests/008.phpt   Tue Dec 19 14:16:07 2006
@@ -1,5 +1,7 @@
 --TEST--
 filter_list()
+--SKIPIF--
+?php if (!extension_loaded(filter)) die(skip); ?
 --FILE--
 ?php
 
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/009.phpt?r1=1.7r2=1.8diff_format=u
Index: php-src/ext/filter/tests/009.phpt
diff -u php-src/ext/filter/tests/009.phpt:1.7 
php-src/ext/filter/tests/009.phpt:1.8
--- php-src/ext/filter/tests/009.phpt:1.7   Mon Dec  4 21:22:26 2006
+++ php-src/ext/filter/tests/009.phpt   Tue Dec 19 14:16:07 2006
@@ -1,5 +1,7 @@
 --TEST--
 filter_id()
+--SKIPIF--
+?php if (!extension_loaded(filter)) die(skip); ?
 --FILE--
 ?php
 
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/010.phpt?r1=1.10r2=1.11diff_format=u
Index: php-src/ext/filter/tests/010.phpt
diff -u php-src/ext/filter/tests/010.phpt:1.10 
php-src/ext/filter/tests/010.phpt:1.11
--- php-src/ext/filter/tests/010.phpt:1.10  Tue Dec  5 01:23:42 2006
+++ php-src/ext/filter/tests/010.phpt   Tue Dec 19 14:16:07 2006
@@ -1,5 +1,7 @@
 --TEST--
 filter_var()
+--SKIPIF--
+?php if (!extension_loaded(filter)) die(skip); ?
 --FILE--
 ?php
 
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/011.phpt?r1=1.5r2=1.6diff_format=u
Index: php-src/ext/filter/tests/011.phpt
diff -u php-src/ext/filter/tests/011.phpt:1.5 
php-src/ext/filter/tests/011.phpt:1.6
--- php-src/ext/filter/tests/011.phpt:1.5   Sat Dec  9 03:18:21 2006
+++ php-src/ext/filter/tests/011.phpt   Tue Dec 19 14:16:07 2006
@@ -1,5 +1,7 @@
 --TEST--
 input_get()
+--SKIPIF--
+?php if (!extension_loaded(filter)) die(skip); ?
 --GET--
 a=btest/bb=http://example.com
 --POST--
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/012.phpt?r1=1.4r2=1.5diff_format=u
Index: php-src/ext/filter/tests/012.phpt
diff -u php-src/ext/filter/tests/012.phpt:1.4 
php-src/ext/filter/tests/012.phpt:1.5
--- php-src/ext/filter/tests/012.phpt:1.4   Tue Oct 17 15:26:42 2006
+++ php-src/ext/filter/tests/012.phpt   Tue Dec 19 14:16:07 2006
@@ -1,5 +1,7 @@
 --TEST--
 filter_input()
+--SKIPIF--
+?php if (!extension_loaded(filter)) die(skip); ?
 --FILE--
 ?php
 

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/filter/tests 004.phpt 006.phpt 007.phpt 008.phpt 009.phpt 010.phpt 011.phpt 012.phpt 013.phpt 014.phpt 015.phpt 016.phpt 017.phpt 018.phpt 019.phpt 020.phpt 021.ph

2006-12-19 Thread Antony Dovgal
tony2001Tue Dec 19 14:16:24 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/filter/tests   004.phpt 006.phpt 007.phpt 008.phpt 
009.phpt 010.phpt 011.phpt 012.phpt 
013.phpt 014.phpt 015.phpt 016.phpt 
017.phpt 018.phpt 019.phpt 020.phpt 
021.phpt 022.phpt 023.phpt 024.phpt 
025.phpt 026.phpt 027.phpt 028.phpt 
029.phpt 030.phpt 031.phpt 032.phpt 
033.phpt 034.phpt 035.phpt 037.phpt 
038.phpt 040.phpt 041.phpt 042.phpt 
043.phpt 044.phpt bug39846.phpt 
bug7586.phpt bug7715.phpt bug7733.phpt 
bug8315.phpt 
callback_non_modified_var.phpt 
filter_data.phpt 
  Log:
  add missing SKIPIF sections
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/004.phpt?r1=1.2.2.2r2=1.2.2.3diff_format=u
Index: php-src/ext/filter/tests/004.phpt
diff -u php-src/ext/filter/tests/004.phpt:1.2.2.2 
php-src/ext/filter/tests/004.phpt:1.2.2.3
--- php-src/ext/filter/tests/004.phpt:1.2.2.2   Sat Dec  9 03:07:32 2006
+++ php-src/ext/filter/tests/004.phpt   Tue Dec 19 14:16:23 2006
@@ -1,5 +1,7 @@
 --TEST--
 GET/POST/REQUEST Test with filtered data
+--SKIPIF--
+?php if (!extension_loaded(filter)) die(skip); ?
 --INI--
 filter.default=special_chars
 --POST--
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/006.phpt?r1=1.4.2.1r2=1.4.2.2diff_format=u
Index: php-src/ext/filter/tests/006.phpt
diff -u php-src/ext/filter/tests/006.phpt:1.4.2.1 
php-src/ext/filter/tests/006.phpt:1.4.2.2
--- php-src/ext/filter/tests/006.phpt:1.4.2.1   Tue Oct  3 02:16:52 2006
+++ php-src/ext/filter/tests/006.phpt   Tue Dec 19 14:16:23 2006
@@ -1,5 +1,7 @@
 --TEST--
 filter() test
+--SKIPIF--
+?php if (!extension_loaded(filter)) die(skip); ?
 --POST--
 foo=babc/b
 --FILE--
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/007.phpt?r1=1.1.2.3r2=1.1.2.4diff_format=u
Index: php-src/ext/filter/tests/007.phpt
diff -u php-src/ext/filter/tests/007.phpt:1.1.2.3 
php-src/ext/filter/tests/007.phpt:1.1.2.4
--- php-src/ext/filter/tests/007.phpt:1.1.2.3   Sat Dec  9 03:17:49 2006
+++ php-src/ext/filter/tests/007.phpt   Tue Dec 19 14:16:23 2006
@@ -1,5 +1,7 @@
 --TEST--
 filter_has_var()
+--SKIPIF--
+?php if (!extension_loaded(filter)) die(skip); ?
 --GET--
 a=qweabc=ahref/a
 --POST--
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/008.phpt?r1=1.2.2.2r2=1.2.2.3diff_format=u
Index: php-src/ext/filter/tests/008.phpt
diff -u php-src/ext/filter/tests/008.phpt:1.2.2.2 
php-src/ext/filter/tests/008.phpt:1.2.2.3
--- php-src/ext/filter/tests/008.phpt:1.2.2.2   Tue Oct  3 08:44:01 2006
+++ php-src/ext/filter/tests/008.phpt   Tue Dec 19 14:16:23 2006
@@ -1,5 +1,7 @@
 --TEST--
 filter_list()
+--SKIPIF--
+?php if (!extension_loaded(filter)) die(skip); ?
 --FILE--
 ?php
 
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/009.phpt?r1=1.2.2.1r2=1.2.2.2diff_format=u
Index: php-src/ext/filter/tests/009.phpt
diff -u php-src/ext/filter/tests/009.phpt:1.2.2.1 
php-src/ext/filter/tests/009.phpt:1.2.2.2
--- php-src/ext/filter/tests/009.phpt:1.2.2.1   Tue Oct  3 02:16:52 2006
+++ php-src/ext/filter/tests/009.phpt   Tue Dec 19 14:16:23 2006
@@ -1,5 +1,7 @@
 --TEST--
 filter_id()
+--SKIPIF--
+?php if (!extension_loaded(filter)) die(skip); ?
 --FILE--
 ?php
 
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/010.phpt?r1=1.4.2.6r2=1.4.2.7diff_format=u
Index: php-src/ext/filter/tests/010.phpt
diff -u php-src/ext/filter/tests/010.phpt:1.4.2.6 
php-src/ext/filter/tests/010.phpt:1.4.2.7
--- php-src/ext/filter/tests/010.phpt:1.4.2.6   Tue Dec  5 01:24:18 2006
+++ php-src/ext/filter/tests/010.phpt   Tue Dec 19 14:16:23 2006
@@ -1,5 +1,7 @@
 --TEST--
 filter_var()
+--SKIPIF--
+?php if (!extension_loaded(filter)) die(skip); ?
 --FILE--
 ?php
 
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/011.phpt?r1=1.2.2.3r2=1.2.2.4diff_format=u
Index: php-src/ext/filter/tests/011.phpt
diff -u php-src/ext/filter/tests/011.phpt:1.2.2.3 
php-src/ext/filter/tests/011.phpt:1.2.2.4
--- php-src/ext/filter/tests/011.phpt:1.2.2.3   Sat Dec  9 03:17:49 2006
+++ php-src/ext/filter/tests/011.phpt   Tue Dec 19 14:16:23 2006
@@ -1,5 +1,7 @@
 --TEST--
 input_get()
+--SKIPIF--
+?php if (!extension_loaded(filter)) die(skip); ?
 --GET--
 a=btest/bb=http://example.com
 --POST--
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/012.phpt?r1=1.2.2.2r2=1.2.2.3diff_format=u
Index: php-src/ext/filter/tests/012.phpt
diff -u php-src/ext/filter/tests/012.phpt:1.2.2.2 
php-src/ext/filter/tests/012.phpt:1.2.2.3
--- php-src/ext/filter/tests/012.phpt:1.2.2.2   Tue Oct 17 15:26:14 2006
+++ php-src/ext/filter/tests/012.phpt   Tue Dec 19 14:16:23 2006
@@ -1,5 

[PHP-CVS] cvs: CVSROOT / avail

2006-12-19 Thread Martin Jansen
mj  Tue Dec 19 14:24:48 2006 UTC

  Modified files:  
/CVSROOTavail 
  Log:
  * pear/Validate karma for Aaron Wormus.
  
  
http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1224r2=1.1225diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1224 CVSROOT/avail:1.1225
--- CVSROOT/avail:1.1224Mon Dec 18 22:33:19 2006
+++ CVSROOT/avail   Tue Dec 19 14:24:48 2006
@@ -367,6 +367,7 @@
 avail|saltybeagle|pear/Services_W3C_HTMLValidator,peardoc
 avail|ashnazg|pear/PhpDocumentor,peardoc
 avail|zhaowei|pecl/mailparse
+avail|wormus|pear/Validate,peardoc
 
 # php windows installer
 avail|jmertic|php-src/win32/installer

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



[PHP-CVS] cvs: php-src(PHP_5_2) /ext/json json.c

2006-12-19 Thread Nuno Lopes
nlopess Tue Dec 19 15:01:05 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/json   json.c 
  Log:
  remove NOP code in json_determine_array_type(), as we already know the zval 
passed is an array (based on patch by Ron Korving)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/json/json.c?r1=1.9.2.7r2=1.9.2.8diff_format=u
Index: php-src/ext/json/json.c
diff -u php-src/ext/json/json.c:1.9.2.7 php-src/ext/json/json.c:1.9.2.8
--- php-src/ext/json/json.c:1.9.2.7 Fri Nov  3 13:16:33 2006
+++ php-src/ext/json/json.c Tue Dec 19 15:01:05 2006
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: json.c,v 1.9.2.7 2006/11/03 13:16:33 iliaa Exp $ */
+/* $Id: json.c,v 1.9.2.8 2006/12/19 15:01:05 nlopess Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -91,14 +91,7 @@
 
 static int json_determine_array_type(zval **val TSRMLS_DC) {
 int i;
-HashTable *myht;
-
-if (Z_TYPE_PP(val) == IS_ARRAY) {
-myht = HASH_OF(*val);
-} else {
-myht = Z_OBJPROP_PP(val);
-return 1;
-}
+HashTable *myht = HASH_OF(*val);
 
 i = myht ? zend_hash_num_elements(myht) : 0;
 if (i  0) {

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



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

2006-12-19 Thread Nuno Lopes
nlopess Tue Dec 19 15:01:57 2006 UTC

  Modified files:  
/php-src/ext/json   json.c 
  Log:
  MFB: little cleanup in json_determine_array_type()
  
http://cvs.php.net/viewvc.cgi/php-src/ext/json/json.c?r1=1.19r2=1.20diff_format=u
Index: php-src/ext/json/json.c
diff -u php-src/ext/json/json.c:1.19 php-src/ext/json/json.c:1.20
--- php-src/ext/json/json.c:1.19Thu Oct 19 20:24:25 2006
+++ php-src/ext/json/json.c Tue Dec 19 15:01:57 2006
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: json.c,v 1.19 2006/10/19 20:24:25 andrei Exp $ */
+/* $Id: json.c,v 1.20 2006/12/19 15:01:57 nlopess Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -84,14 +84,7 @@
 static int json_determine_array_type(zval **val TSRMLS_DC) /* {{{ */
 {
 int i;
-HashTable *myht;
-
-if (Z_TYPE_PP(val) == IS_ARRAY) {
-myht = HASH_OF(*val);
-} else {
-myht = Z_OBJPROP_PP(val);
-return 1;
-}
+HashTable *myht = HASH_OF(*val);
 
 i = myht ? zend_hash_num_elements(myht) : 0;
 if (i  0) {

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



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

2006-12-19 Thread Andrei Zmievski
andrei  Tue Dec 19 18:41:40 2006 UTC

  Modified files:  
/php-src/ext/standard   formatted_print.c 
  Log:
  Unicode support in *printf() functions. (Antony, Andrei)
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/standard/formatted_print.c?r1=1.91r2=1.92diff_format=u
Index: php-src/ext/standard/formatted_print.c
diff -u php-src/ext/standard/formatted_print.c:1.91 
php-src/ext/standard/formatted_print.c:1.92
--- php-src/ext/standard/formatted_print.c:1.91 Tue Dec 19 13:13:48 2006
+++ php-src/ext/standard/formatted_print.c  Tue Dec 19 18:41:40 2006
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: formatted_print.c,v 1.91 2006/12/19 13:13:48 dmitry Exp $ */
+/* $Id: formatted_print.c,v 1.92 2006/12/19 18:41:40 andrei Exp $ */
 
 #include math.h  /* modf() */
 #include php.h
@@ -43,6 +43,9 @@
 #define MAX_FLOAT_DIGITS 38
 #define MAX_FLOAT_PRECISION 40
 
+#define PHP_OUTPUT 0
+#define PHP_RUNTIME 1
+
 #if 0
 /* trick to control varargs functions through cpp */
 # define PRINTF_DEBUG(arg) php_printf arg
@@ -53,7 +56,10 @@
 static char hexchars[] = 0123456789abcdef;
 static char HEXCHARS[] = 0123456789ABCDEF;
 
+static UChar u_hexchars[] = {0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 
0x38, 0x39, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66};
+static UChar u_HEXCHARS[] = {0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 
0x38, 0x39, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46};
 
+/* php_sprintf_appendchar() {{{ */
 inline static void
 php_sprintf_appendchar(char **buffer, int *pos, int *size, char add TSRMLS_DC)
 {
@@ -65,8 +71,21 @@
PRINTF_DEBUG((sprintf: appending '%c', pos=\n, add, *pos));
(*buffer)[(*pos)++] = add;
 }
+/* }}} */
 
+/* php_u_sprintf_appendchar() {{{ */
+inline static void
+php_u_sprintf_appendchar(UChar **buffer, int *pos, int *size, UChar add 
TSRMLS_DC)
+{
+   if ((*pos + 1) = *size) {
+   *size = 1;
+   *buffer = eurealloc(*buffer, *size);
+   }
+   (*buffer)[(*pos)++] = add;
+}
+/* }}} */
 
+/* php_sprintf_appendstring() {{{ */
 inline static void
 php_sprintf_appendstring(char **buffer, int *pos, int *size, char *add,
   int min_width, int 
max_width, char padding,
@@ -115,10 +134,57 @@
}
}
 }
+/* }}} */
+
+/* php_u_sprintf_appendstring() {{{ */
+inline static void
+php_u_sprintf_appendstring(UChar **buffer, int *pos, int *size, UChar *add,
+  int min_width, int 
max_width, UChar padding,
+  int alignment, int len, int 
neg, int expprec, int always_sign)
+{
+   register int npad;
+   int req_size;
+   int copy_len;
+
+   copy_len = (expprec ? MIN(max_width, len) : len);
+   npad = min_width - copy_len;
 
+   if (npad  0) {
+   npad = 0;
+   }
+   
+   req_size = *pos + MAX(min_width, copy_len) + 1;
+
+   if (req_size  *size) {
+   while (req_size  *size) {
+   *size = 1;
+   }
+   *buffer = eurealloc(*buffer, *size);
+   }
+   if (alignment == ALIGN_RIGHT) {
+   if ((neg || always_sign)  padding == 0x30 /* '0' */) {
+   (*buffer)[(*pos)++] = (neg) ? 0x2D /* '-' */ : 0x2B /* 
'+' */;
+   add++;
+   len--;
+   copy_len--;
+   }
+   while (npad--  0) {
+   (*buffer)[(*pos)++] = padding;
+   }
+   }
+   u_memcpy((*buffer)[*pos], add, copy_len + 1);
+   *pos += copy_len;
+   if (alignment == ALIGN_LEFT) {
+   while (npad--) {
+   (*buffer)[(*pos)++] = padding;
+   }
+   }
+}
+/* }}} */
 
+/* php_sprintf_appendint() {{{ */ 
 inline static void
-php_sprintf_appendint(char **buffer, int *pos, int *size, long number,
+php_sprintf_appendint(char **buffer, int *pos, int *size, long number, 
int width, char padding, int 
alignment, 
int always_sign)
 {
@@ -158,7 +224,49 @@
 padding, alignment, 
(NUM_BUF_SIZE - 1) - i,
 neg, 0, always_sign);
 }
+/* }}} */
 
+/* php_u_sprintf_appendint() {{{ */ 
+inline static void
+php_u_sprintf_appendint(UChar **buffer, int *pos, int *size, long number, 
+   int width, UChar padding, int 
alignment, 
+   int always_sign)
+{
+   UChar numbuf[NUM_BUF_SIZE];
+   register unsigned long magn, nmagn;
+   register unsigned int i = NUM_BUF_SIZE - 1, neg = 0;
+
+   if (number  0) {
+   neg = 1;
+   

[PHP-CVS] cvs: php-src /ext/soap/tests/bugs bug39815.phpt

2006-12-19 Thread Antony Dovgal
tony2001Tue Dec 19 20:46:48 2006 UTC

  Modified files:  
/php-src/ext/soap/tests/bugsbug39815.phpt 
  Log:
  add check for setlocale() and sv_SE to SKIPIF section
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug39815.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/soap/tests/bugs/bug39815.phpt
diff -u php-src/ext/soap/tests/bugs/bug39815.phpt:1.2 
php-src/ext/soap/tests/bugs/bug39815.phpt:1.3
--- php-src/ext/soap/tests/bugs/bug39815.phpt:1.2   Tue Dec 19 11:55:16 2006
+++ php-src/ext/soap/tests/bugs/bug39815.phpt   Tue Dec 19 20:46:48 2006
@@ -1,7 +1,11 @@
 --TEST--
 Bug #39815 (to_zval_double() in ext/soap/php_encoding.c is not 
locale-independent)
 --SKIPIF--
-?php require_once('skipif.inc'); ?
+?php 
+require_once('skipif.inc'); 
+if (!function_exists('setlocale')) die('skip setlocale() not available'); 
+if ([EMAIL PROTECTED](LC_ALL, 'sv_SE')) die('skip sv_SE locale not available');
+?
 --FILE--
 ?php
 function test(){

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



[PHP-CVS] cvs: php-src(PHP_5_2) /ext/soap/tests/bugs bug39815.phpt

2006-12-19 Thread Antony Dovgal
tony2001Tue Dec 19 20:46:56 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/soap/tests/bugsbug39815.phpt 
  Log:
  MFH
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug39815.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/soap/tests/bugs/bug39815.phpt
diff -u php-src/ext/soap/tests/bugs/bug39815.phpt:1.1.2.1 
php-src/ext/soap/tests/bugs/bug39815.phpt:1.1.2.2
--- php-src/ext/soap/tests/bugs/bug39815.phpt:1.1.2.1   Tue Dec 19 11:54:38 2006
+++ php-src/ext/soap/tests/bugs/bug39815.phpt   Tue Dec 19 20:46:56 2006
@@ -1,7 +1,11 @@
 --TEST--
 Bug #39815 (to_zval_double() in ext/soap/php_encoding.c is not 
locale-independent)
 --SKIPIF--
-?php require_once('skipif.inc'); ?
+?php 
+require_once('skipif.inc'); 
+if (!function_exists('setlocale')) die('skip setlocale() not available'); 
+if ([EMAIL PROTECTED](LC_ALL, 'sv_SE')) die('skip sv_SE locale not available');
+?
 --FILE--
 ?php
 function test(){

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



[PHP-CVS] cvs: php-src /ext/reflection php_reflection.c /ext/standard array.c basic_functions.c string.c ZendEngine2 zend_API.h zend_execute_API.c

2006-12-19 Thread Andrei Zmievski
andrei  Tue Dec 19 21:39:00 2006 UTC

  Modified files:  
/ZendEngine2zend_API.h zend_execute_API.c 
/php-src/ext/reflection php_reflection.c 
/php-src/ext/standard   array.c basic_functions.c string.c 
  Log:
  - Marcus was too quick. Let's put type before zstr in the macros.
  - Also mark get_include_path() and restore_include_path() with U.
  
  http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_API.h?r1=1.274r2=1.275diff_format=u
Index: ZendEngine2/zend_API.h
diff -u ZendEngine2/zend_API.h:1.274 ZendEngine2/zend_API.h:1.275
--- ZendEngine2/zend_API.h:1.274Tue Dec 19 21:12:16 2006
+++ ZendEngine2/zend_API.h  Tue Dec 19 21:38:59 2006
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: zend_API.h,v 1.274 2006/12/19 21:12:16 helly Exp $ */
+/* $Id: zend_API.h,v 1.275 2006/12/19 21:38:59 andrei Exp $ */
 
 #ifndef ZEND_API_H
 #define ZEND_API_H
@@ -389,13 +389,13 @@
 #define add_assoc_zstr_ex(arg, key, key_len, type, str, duplicate) do { \
zval *___tmp; \
MAKE_STD_ZVAL(___tmp); \
-   ZVAL_ZSTR(___tmp, str, type, duplicate); \
+   ZVAL_ZSTR(___tmp, type, str, duplicate); \
add_assoc_zval_ex(arg, key, key_len, ___tmp); \
} while (0)
 #define add_assoc_zstrl_ex(arg, key, key_len, type, str, length, duplicate) do 
{ \
zval *___tmp; \
MAKE_STD_ZVAL(___tmp); \
-   ZVAL_ZSTRL(___tmp, str, type, length, duplicate); \
+   ZVAL_ZSTRL(___tmp, type, str, length, duplicate); \
add_assoc_zval_ex(arg, key, key_len, ___tmp); \
} while (0)
 #define add_assoc_text_ex(arg, key, key_len, str, duplicate) do { \
@@ -532,13 +532,13 @@
 #define add_ascii_assoc_zstr_ex(arg, key, key_len, type, str, duplicate) do { \
zval *___tmp; \
MAKE_STD_ZVAL(___tmp); \
-   ZVAL_ZSTR(___tmp, str, type, duplicate); \
+   ZVAL_ZSTR(___tmp, type, str, duplicate); \
add_ascii_assoc_zval_ex(arg, key, key_len, ___tmp); \
} while (0)
 #define add_ascii_assoc_zstrl_ex(arg, key, key_len, type, str, length, 
duplicate) do { \
zval *___tmp; \
MAKE_STD_ZVAL(___tmp); \
-   ZVAL_ZSTRL(___tmp, str, type, length, duplicate); \
+   ZVAL_ZSTRL(___tmp, type, str, length, duplicate); \
add_ascii_assoc_zval_ex(arg, key, key_len, ___tmp); \
} while (0)
 #define add_ascii_assoc_text_ex(arg, key, key_len, str, duplicate) do { \
@@ -676,13 +676,13 @@
 #define add_rt_assoc_zstr_ex(arg, key, key_len, type, str, duplicate) do { \
zval *___tmp; \
MAKE_STD_ZVAL(___tmp); \
-   ZVAL_ZSTR(___tmp, str, type, duplicate); \
+   ZVAL_ZSTR(___tmp, type, str, duplicate); \
add_rt_assoc_zval_ex(arg, key, key_len, ___tmp); \
} while (0)
 #define add_rt_assoc_zstrl_ex(arg, key, key_len, type, str, length, duplicate) 
do { \
zval *___tmp; \
MAKE_STD_ZVAL(___tmp); \
-   ZVAL_ZSTRL(___tmp, str, type, length, duplicate); \
+   ZVAL_ZSTRL(___tmp, type, str, length, duplicate); \
add_rt_assoc_zval_ex(arg, key, key_len, ___tmp); \
} while (0)
 #define add_rt_assoc_text_ex(arg, key, key_len, str, duplicate) do { \
@@ -820,13 +820,13 @@
 #define add_utf8_assoc_zstr_ex(arg, key, key_len, type, str, duplicate) do { \
zval *___tmp; \
MAKE_STD_ZVAL(___tmp); \
-   ZVAL_ZSTR(___tmp, str, type, duplicate); \
+   ZVAL_ZSTR(___tmp, type, str, duplicate); \
add_utf8_assoc_zval_ex(arg, key, key_len, ___tmp); \
} while (0)
 #define add_utf8_assoc_zstrl_ex(arg, key, key_len, type, str, length, 
duplicate) do { \
zval *___tmp; \
MAKE_STD_ZVAL(___tmp); \
-   ZVAL_ZSTRL(___tmp, str, type, length, duplicate); \
+   ZVAL_ZSTRL(___tmp, type, str, length, duplicate); \
add_utf8_assoc_zval_ex(arg, key, key_len, ___tmp); \
} while (0)
 #define add_utf8_assoc_text_ex(arg, key, key_len, str, duplicate) do { \
@@ -972,14 +972,14 @@
 #define add_utf8_property_zstr_ex(arg, key, key_len, type, str, duplicate) do 
{ \
zval *___tmp; \
MAKE_STD_ZVAL(___tmp); \
-   ZVAL_ZSTR(___tmp, str, type, duplicate); \
+   ZVAL_ZSTR(___tmp, type, str, duplicate); \
add_utf8_property_zval_ex(arg, key, key_len, ___tmp TSRMLS_CC); 
\
zval_ptr_dtor(___tmp); /* write_property will add 1 to 
refcount */ \
} while (0)
 #define add_utf8_property_zstrl_ex(arg, key, key_len, type, str, length, 
duplicate) do { \
zval *___tmp; \
MAKE_STD_ZVAL(___tmp); \
-   

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/soap/tests/bugs bug39815.phpt

2006-12-19 Thread Antony Dovgal
tony2001Tue Dec 19 21:39:48 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/soap/tests/bugsbug39815.phpt 
  Log:
  on FreeBSD these locales have different names
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug39815.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/soap/tests/bugs/bug39815.phpt
diff -u php-src/ext/soap/tests/bugs/bug39815.phpt:1.1.2.2 
php-src/ext/soap/tests/bugs/bug39815.phpt:1.1.2.3
--- php-src/ext/soap/tests/bugs/bug39815.phpt:1.1.2.2   Tue Dec 19 20:46:56 2006
+++ php-src/ext/soap/tests/bugs/bug39815.phpt   Tue Dec 19 21:39:48 2006
@@ -4,7 +4,8 @@
 ?php 
 require_once('skipif.inc'); 
 if (!function_exists('setlocale')) die('skip setlocale() not available'); 
-if ([EMAIL PROTECTED](LC_ALL, 'sv_SE')) die('skip sv_SE locale not available');
+if ([EMAIL PROTECTED](LC_ALL, 'sv_SE', 'sv_SE.ISO8859-1')) die('skip sv_SE 
locale not available');
+if ([EMAIL PROTECTED](LC_ALL, 'en_US', 'en_US.ISO8859-1')) die('skip en_US 
locale not available');
 ?
 --FILE--
 ?php
@@ -31,10 +32,10 @@
 $x = new LocalSoapClient(NULL,array('location'='test://', 
'uri'='http://testuri.org',
trace=1)); 
-setlocale(LC_ALL,sv_SE);
+setlocale(LC_ALL,sv_SE,sv_SE.ISO8859-1);
 var_dump($x-test());
 echo $x-__getLastResponse();
-setlocale(LC_ALL,en_US);
+setlocale(LC_ALL,en_US,en_US.ISO8859-1);
 var_dump($x-test());
 echo $x-__getLastResponse();
 --EXPECT--

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



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

2006-12-19 Thread Michael Wallner
mikeTue Dec 19 21:41:13 2006 UTC

  Modified files:  
/php-src/ext/curl   interface.c 
  Log:
  - check CRYPTO_get_id_callback() if anyone else already set thread lock 
callbacks
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.103r2=1.104diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.103 php-src/ext/curl/interface.c:1.104
--- php-src/ext/curl/interface.c:1.103  Sat Dec  9 14:37:40 2006
+++ php-src/ext/curl/interface.cTue Dec 19 21:41:12 2006
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.103 2006/12/09 14:37:40 iliaa Exp $ */
+/* $Id: interface.c,v 1.104 2006/12/19 21:41:12 mike Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -612,7 +612,7 @@
 #endif
 
 #ifdef PHP_CURL_NEED_OPENSSL_TSL
-   {
+   if (!CRYPTO_get_id_callback()) {
int i, c = CRYPTO_num_locks();

php_curl_openssl_tsl = malloc(c * sizeof(MUTEX_T));
@@ -665,16 +665,11 @@
php_unregister_url_stream_wrapper(ftp TSRMLS_CC);
php_unregister_url_stream_wrapper(ldap TSRMLS_CC);
 #endif
-#ifdef PHP_CURL_NEED_OPENSSL_TSL
-   /* ensure there are valid callbacks set */
-   CRYPTO_set_id_callback(php_curl_ssl_id);
-   CRYPTO_set_locking_callback(php_curl_ssl_lock);
-#endif
curl_global_cleanup();
 #ifdef PHP_CURL_NEED_OPENSSL_TSL
if (php_curl_openssl_tsl) {
int i, c = CRYPTO_num_locks();
-   
+   
CRYPTO_set_id_callback(NULL);
CRYPTO_set_locking_callback(NULL);


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



[PHP-CVS] cvs: php-src(PHP_5_2) /ext/curl interface.c

2006-12-19 Thread Michael Wallner
mikeTue Dec 19 21:41:25 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/curl   interface.c 
  Log:
  MFH: check CRYPTO_get_id_callback() if anyone else already set thread lock 
callbacks
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.15r2=1.62.2.14.2.16diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.15 
php-src/ext/curl/interface.c:1.62.2.14.2.16
--- php-src/ext/curl/interface.c:1.62.2.14.2.15 Tue Nov 21 15:53:23 2006
+++ php-src/ext/curl/interface.cTue Dec 19 21:41:25 2006
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.15 2006/11/21 15:53:23 iliaa Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.16 2006/12/19 21:41:25 mike Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -614,7 +614,7 @@
 #endif
 
 #ifdef PHP_CURL_NEED_OPENSSL_TSL
-   {
+   if (!CRYPTO_get_id_callback()) {
int i, c = CRYPTO_num_locks();

php_curl_openssl_tsl = malloc(c * sizeof(MUTEX_T));
@@ -667,16 +667,11 @@
php_unregister_url_stream_wrapper(ftp TSRMLS_CC);
php_unregister_url_stream_wrapper(ldap TSRMLS_CC);
 #endif
-#ifdef PHP_CURL_NEED_OPENSSL_TSL
-   /* ensure there are valid callbacks set */
-   CRYPTO_set_id_callback(php_curl_ssl_id);
-   CRYPTO_set_locking_callback(php_curl_ssl_lock);
-#endif
curl_global_cleanup();
 #ifdef PHP_CURL_NEED_OPENSSL_TSL
if (php_curl_openssl_tsl) {
int i, c = CRYPTO_num_locks();
-   
+   
CRYPTO_set_id_callback(NULL);
CRYPTO_set_locking_callback(NULL);


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



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

2006-12-19 Thread Andrei Zmievski
andrei  Tue Dec 19 22:01:50 2006 UTC

  Modified files:  
/php-src/ext/standard   basic_functions.c 
  Log:
  Unicode support in set_include_path().
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.840r2=1.841diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.840 
php-src/ext/standard/basic_functions.c:1.841
--- php-src/ext/standard/basic_functions.c:1.840Tue Dec 19 21:38:59 2006
+++ php-src/ext/standard/basic_functions.c  Tue Dec 19 22:01:50 2006
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: basic_functions.c,v 1.840 2006/12/19 21:38:59 andrei Exp $ */
+/* $Id: basic_functions.c,v 1.841 2006/12/19 22:01:50 andrei Exp $ */
 
 #include php.h
 #include php_streams.h
@@ -5750,31 +5750,67 @@
 }
 /* }}} */
 
-/* {{{ proto string set_include_path(string new_include_path)
+/* {{{ proto string set_include_path(string new_include_path) U
Sets the include_path configuration option */
 
 PHP_FUNCTION(set_include_path)
 {
-   zval **new_value;
+   zstr new_value;
+   int new_value_len;
+   zend_uchar type;
char *old_value;
+   zend_bool free_new_value = 0;
+   char *temp;
+   int temp_len;
 
-   if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, new_value) == 
FAILURE) {
-   WRONG_PARAM_COUNT;
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, t, new_value, 
new_value_len, type) == FAILURE) {
+   return;
}
-   convert_to_string_ex(new_value);
+
old_value = zend_ini_string(include_path, sizeof(include_path), 0);
/* copy to return here, because alter might free it! */
if (old_value) {
-   RETVAL_STRING(old_value, 1);
+   RETVAL_UTF8_STRING(old_value, ZSTR_DUPLICATE);
} else {
RETVAL_FALSE;
}
+
+   /*
+* We always want to convert IS_UNICODE to UTF-8 and pass to INI 
subsystem.
+* For binary strings, however, we want to convert only if UG(unicode) 
is
+* on, in which case we check whether filesystem encoding is already 
UTF-8,
+* and if it's not, we convert from that to UTF-8.
+*/
+   if (type == IS_UNICODE) {
+   zend_unicode_to_string(UG(utf8_conv), temp, temp_len, 
new_value.u, new_value_len TSRMLS_CC);
+   new_value.s = temp;
+   new_value_len = temp_len;
+   free_new_value = 1;
+   } else if (UG(unicode)) {
+   const char *conv_name;
+   UErrorCode status = U_ZERO_ERROR;
+
+   conv_name = 
ucnv_getName(ZEND_U_CONVERTER(UG(filesystem_encoding_conv)), status);
+   conv_name = ucnv_getStandardName(conv_name, MIME, status);
+   if (strcmp(conv_name, UTF-8) != 0) {
+   status = U_ZERO_ERROR;
+   zend_convert_encodings(UG(utf8_conv), 
ZEND_U_CONVERTER(UG(filesystem_encoding_conv)),
+  temp, 
temp_len, new_value.s, new_value_len, status);
+   new_value.s = temp;
+   new_value_len = temp_len;
+   free_new_value = 1;
+   }
+   }
+
if (zend_alter_ini_entry(include_path, sizeof(include_path),
- Z_STRVAL_PP(new_value), Z_STRLEN_PP(new_value),
- PHP_INI_USER, PHP_INI_STAGE_RUNTIME) == FAILURE) {
+new_value.s, 
new_value_len, PHP_INI_USER, PHP_INI_STAGE_RUNTIME) == FAILURE) {
zval_dtor(return_value);
RETURN_FALSE;
}
+
+   if (free_new_value) {
+   efree(new_value.s);
+   }
 }
 
 /* }}} */

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



[PHP-CVS] cvs: php-src / README.PARAMETER_PARSING_API

2006-12-19 Thread Marcus Boerger
helly   Tue Dec 19 22:24:28 2006 UTC

  Modified files:  
/php-srcREADME.PARAMETER_PARSING_API 
  Log:
  - x was added toparameter parsing api
  
http://cvs.php.net/viewvc.cgi/php-src/README.PARAMETER_PARSING_API?r1=1.17r2=1.18diff_format=u
Index: php-src/README.PARAMETER_PARSING_API
diff -u php-src/README.PARAMETER_PARSING_API:1.17 
php-src/README.PARAMETER_PARSING_API:1.18
--- php-src/README.PARAMETER_PARSING_API:1.17   Wed Aug  2 17:36:40 2006
+++ php-src/README.PARAMETER_PARSING_APITue Dec 19 22:24:28 2006
@@ -57,6 +57,8 @@
   coalesces all T parameters to common type (Unicode or binary)
  u  - unicode (UChar*, int)
  U  - Unicode string, does not allow conversion from binary strings
+ x  - Unicode or binary string depending on UG(unicode). In unicode this 
+  behaves like 'u' and in nonunicode mode it behaves like 's'.
  z  - the actual zval (zval*)
  Z  - the actual zval (zval**)
  *  - variable arguments list

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



Re: [PHP-CVS] cvs: php-src /ext/reflection php_reflection.c /ext/standard array.c basic_functions.c string.c ZendEngine2 zend_API.h zend_execute_API.c

2006-12-19 Thread Marcus Boerger
Hello Andrei,

  you're right again. This versionis actually in line with the order of
zend_u_hash*(), too.

best regards
marcus

Tuesday, December 19, 2006, 10:39:00 PM, you wrote:

 andrei  Tue Dec 19 21:39:00 2006 UTC

   Modified files:  
 /ZendEngine2zend_API.h zend_execute_API.c 
 /php-src/ext/reflection php_reflection.c 
 /php-src/ext/standard   array.c basic_functions.c string.c 
   Log:
   - Marcus was too quick. Let's put type before zstr in the macros.
   - Also mark get_include_path() and restore_include_path() with U.
   
   



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/spl php_spl.c

2006-12-19 Thread Marcus Boerger
helly   Tue Dec 19 22:31:00 2006 UTC

  Modified files:  
/php-src/ext/splphp_spl.c 
  Log:
  - Make spl_autoload_call() unicode safe
  
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/php_spl.c?r1=1.101r2=1.102diff_format=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.101 php-src/ext/spl/php_spl.c:1.102
--- php-src/ext/spl/php_spl.c:1.101 Mon Nov 20 20:03:46 2006
+++ php-src/ext/spl/php_spl.c   Tue Dec 19 22:30:59 2006
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_spl.c,v 1.101 2006/11/20 20:03:46 helly Exp $ */
+/* $Id: php_spl.c,v 1.102 2006/12/19 22:30:59 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
#include config.h
@@ -345,39 +345,37 @@
}
 }
 
-/* {{{ proto void spl_autoload_call(string class_name)
+/* {{{ proto void spl_autoload_call(string class_name) U
  Try all registerd autoload function to load the requested class */
 PHP_FUNCTION(spl_autoload_call)
 {
-   zval *class_name, *retval = NULL;
-   int class_name_len, class_name_type;
-   zstr func_name, lc_name;
+   zval *zclass_name, *retval = NULL;
+   int class_name_len, func_name_type;
+   zstr class_name, func_name, lc_name;
uint func_name_len;
ulong dummy;
HashPosition function_pos;
autoload_func_info *alfi;
 
-   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, z, class_name) 
== FAILURE ||
-   Z_TYPE_P(class_name) != (UG(unicode)?IS_UNICODE:IS_STRING)) {
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, UG(unicode) ? u 
: s, class_name, class_name_len) == FAILURE) {
return;
}
 
+   MAKE_STD_ZVAL(zclass_name);
+   ZVAL_ZSTRL(zclass_name, ZEND_STR_TYPE, class_name, class_name_len, 1);
if (SPL_G(autoload_functions)) {
int l_autoload_running = SPL_G(autoload_running);
SPL_G(autoload_running) = 1;
-   class_name_type = Z_TYPE_P(class_name);
-   class_name_len = Z_UNILEN_P(class_name);
-   lc_name = zend_u_str_tolower_dup(class_name_type, 
Z_UNIVAL_P(class_name), class_name_len);
+   lc_name = zend_u_str_tolower_dup(ZEND_STR_TYPE, class_name, 
class_name_len);
zend_hash_internal_pointer_reset_ex(SPL_G(autoload_functions), 
function_pos);
while(zend_hash_has_more_elements_ex(SPL_G(autoload_functions), 
function_pos) == SUCCESS  !EG(exception)) {
-   zend_hash_get_current_key_ex(SPL_G(autoload_functions), 
func_name, func_name_len, dummy, 0, function_pos);
+   func_name_type = 
zend_hash_get_current_key_ex(SPL_G(autoload_functions), func_name, 
func_name_len, dummy, 0, function_pos);

zend_hash_get_current_data_ex(SPL_G(autoload_functions), (void **) alfi, 
function_pos);
-   /* TODO: Unicode support??? */
-   zend_call_method(alfi-obj ? alfi-obj : NULL, 
alfi-ce, alfi-func_ptr, func_name.s, func_name_len, retval, 1, class_name, 
NULL TSRMLS_CC);
+   zend_u_call_method(alfi-obj ? alfi-obj : NULL, 
alfi-ce, alfi-func_ptr, func_name_type, func_name, func_name_len, retval, 
1, zclass_name, NULL TSRMLS_CC);
if (retval) {
zval_ptr_dtor(retval); 

}
-   if (zend_u_hash_exists(EG(class_table), 
class_name_type, lc_name, class_name_len+1)) {
+   if (zend_u_hash_exists(EG(class_table), ZEND_STR_TYPE, 
lc_name, class_name_len+1)) {
break;
}
zend_hash_move_forward_ex(SPL_G(autoload_functions), 
function_pos);
@@ -386,8 +384,9 @@
SPL_G(autoload_running) = l_autoload_running;
} else {
/* do not use or overwrite EG(autoload_func) here */
-   zend_call_method_with_1_params(NULL, NULL, NULL, 
spl_autoload, NULL, class_name);
+   zend_call_method_with_1_params(NULL, NULL, NULL, 
spl_autoload, NULL, zclass_name);
}
+   zval_ptr_dtor(zclass_name);
 } /* }}} */
 
 /* {{{ proto bool spl_autoload_register([mixed autoload_function = 
spl_autoload [, throw = true]]) U

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



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

2006-12-19 Thread Marcus Boerger
helly   Tue Dec 19 22:31:26 2006 UTC

  Modified files:  
/php-src/ext/splphp_spl.c 
  Log:
  - Use new 'x' parameter parsing
  
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/php_spl.c?r1=1.102r2=1.103diff_format=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.102 php-src/ext/spl/php_spl.c:1.103
--- php-src/ext/spl/php_spl.c:1.102 Tue Dec 19 22:30:59 2006
+++ php-src/ext/spl/php_spl.c   Tue Dec 19 22:31:26 2006
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_spl.c,v 1.102 2006/12/19 22:30:59 helly Exp $ */
+/* $Id: php_spl.c,v 1.103 2006/12/19 22:31:26 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
#include config.h
@@ -357,7 +357,7 @@
HashPosition function_pos;
autoload_func_info *alfi;
 
-   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, UG(unicode) ? u 
: s, class_name, class_name_len) == FAILURE) {
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, x, class_name, 
class_name_len) == FAILURE) {
return;
}
 

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



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

2006-12-19 Thread Matt Wilmas
Oops, forgot to attach the patches!

- Original Message -
From: Matt Wilmas
Sent: Tuesday, December 19, 2006

 Hi Ilia,

 A little late, but I made a patch for HEAD since this wasn't applied
there.
 In the process, I noticed that i has the value of
zend_hash_num_elements()
 so the second call to it isn't needed.  (Indentation was also off on those
2
 lines...)


 Matt
Index: ext/soap/php_sdl.c
===
RCS file: /repository/php-src/ext/soap/php_sdl.c,v
retrieving revision 1.105
diff -u -r1.105 php_sdl.c
--- ext/soap/php_sdl.c  20 Sep 2006 13:43:04 -  1.105
+++ ext/soap/php_sdl.c  20 Dec 2006 03:48:01 -
@@ -1862,8 +1862,8 @@
if (i  0) {
sdlTypePtr *tmp;
 
- tmp_elements = emalloc(sizeof(HashTable));
- zend_hash_init(tmp_elements, 0, NULL, NULL, 0);
+   tmp_elements = emalloc(sizeof(HashTable));
+   zend_hash_init(tmp_elements, i, NULL, NULL, 0);
 
zend_hash_internal_pointer_reset(type-elements);
while (zend_hash_get_current_data(type-elements, (void**)tmp) 
== SUCCESS) {
Index: ext/soap/php_sdl.c
===
RCS file: /repository/php-src/ext/soap/php_sdl.c,v
retrieving revision 1.88.2.12.2.4
diff -u -r1.88.2.12.2.4 php_sdl.c
--- ext/soap/php_sdl.c  30 Nov 2006 23:51:24 -  1.88.2.12.2.4
+++ ext/soap/php_sdl.c  20 Dec 2006 03:49:58 -
@@ -1862,8 +1862,8 @@
if (i  0) {
sdlTypePtr *tmp;
 
- tmp_elements = emalloc(sizeof(HashTable));
- zend_hash_init(tmp_elements, zend_hash_num_elements(type-elements), 
NULL, NULL, 0);
+   tmp_elements = emalloc(sizeof(HashTable));
+   zend_hash_init(tmp_elements, i, NULL, NULL, 0);
 
zend_hash_internal_pointer_reset(type-elements);
while (zend_hash_get_current_data(type-elements, (void**)tmp) 
== SUCCESS) {

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