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

2007-02-21 Thread changelog 
changelog   Thu Feb 22 01:31:00 2007 UTC

  Modified files:  
/php-srcChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2608r2=1.2609diff_format=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.2608 php-src/ChangeLog:1.2609
--- php-src/ChangeLog:1.2608Wed Feb 21 01:31:00 2007
+++ php-src/ChangeLog   Thu Feb 22 01:30:59 2007
@@ -1,3 +1,149 @@
+2007-02-21  Antony Dovgal  [EMAIL PROTECTED]
+
+* ext/standard/tests/file/bug27508.phpt:
+  minor improvements
+
+* (PHP_5_2)
+  main/php_streams.h
+  main/streams/plain_wrapper.c
+  main/streams/streams.c
+  sapi/cli/php_cli.c:
+  MFH: implement PHP_STREAM_FLAG_NO_CLOSE and avoid hacks
+
+* main/php_streams.h
+  main/streams/plain_wrapper.c
+  main/streams/streams.c
+  sapi/cli/php_cli.c:
+  implement PHP_STREAM_FLAG_NO_CLOSE and avoid hacks in plain wrapper
+
+2007-02-21  Stanislav Malyshev  [EMAIL PROTECTED]
+
+* ext/soap/php_http.c
+  ext/soap/php_http.c:
+  use snprintf
+
+2007-02-21  Antony Dovgal  [EMAIL PROTECTED]
+
+* ext/standard/tests/file/get_current_user.phpt:
+  fix test on FreeBSD
+
+* ext/iconv/tests/bug37176.phpt
+  ext/iconv/tests/bug37773.phpt:
+  fix tests
+
+* (PHP_5_2)
+  ext/iconv/tests/bug37176.phpt
+  ext/iconv/tests/bug37773.phpt:
+  fix tests on AIX
+
+* ext/xmlrpc/tests/bug40576_64bit.phpt:
+  add test
+
+* (PHP_5_2)
+  ext/xmlrpc/tests/bug40576_64bit.phpt:
+  wrong string len
+
+* ext/xmlrpc/tests/bug40576_64bit.phpt
+  ext/xmlrpc/tests/bug40576_64bit.phpt:
+  
+  file bug40576_64bit.phpt was initially added on branch PHP_5_2.
+
+* ext/ftp/tests/bug37799.phpt
+  ext/ftp/tests/bug37799.phpt
+  ext/standard/tests/file/get_current_user.phpt
+  ext/xmlrpc/tests/bug40576.phpt
+  ext/xmlrpc/tests/bug40576.phpt:
+  fix test
+
+* (PHP_4_4)
+  NEWS
+  NEWS
+  ext/gd/libgd/gdft.c
+  ext/gd/libgd/gdft.c:
+  MFH: fix #40578 (imagettftext() multithreading issue)
+
+2007-02-21  Nuno Lopes  [EMAIL PROTECTED]
+
+* ext/standard/tests/general_functions/proc_open02.phpt:
+  MFB
+
+* (PHP_5_2)
+  ext/standard/tests/general_functions/proc_open02.phpt:
+  use /usr/bin/nohup instead
+
+* (PHP_5_2)
+  ext/pdo_sqlite/sqlite/src/parse.c:
+  fix gcov build (#line stuff)
+
+2007-02-21  Dmitry Stogov  [EMAIL PROTECTED]
+
+* sapi/cgi/fastcgi.c
+  sapi/cgi/fastcgi.c:
+  Check for FD_SETSIZE limit
+
+2007-02-21  Antony Dovgal  [EMAIL PROTECTED]
+
+* ext/gd/libgd/gdft.c:
+  fix #40578 (imagettftext() multithreading issue)
+
+* (PHP_5_2)
+  NEWS
+  ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c
+  ext/xmlrpc/tests/bug40576.phpt:
+  MFH: fix #40576 (double values are truncated to 6 decimal digits when
+  encoding)
+
+* ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c
+  ext/xmlrpc/tests/bug40576.phpt
+  ext/xmlrpc/tests/bug40576.phpt:
+  fix bug #40576 (double values are truncated to 6 decimal digits when
+  encoding)
+
+2007-02-21  Dmitry Stogov  [EMAIL PROTECTED]
+
+* ZendEngine2/zend_hash.c
+  ZendEngine2/zend_hash.c:
+  Special case for last iteration
+
+* (PHP_5_2)
+  NEWS
+  TSRM/tsrm_virtual_cwd.c
+  TSRM/tsrm_virtual_cwd.c:
+  Fixed bug #40560 (DIR functions do not work on root UNC path)
+
+2007-02-21  Antony Dovgal  [EMAIL PROTECTED]
+
+* sapi/cgi/cgi_main.c:
+  fix typo
+
+2007-02-21  Ilia Alshanetsky  [EMAIL PROTECTED]
+
+* (PHP_5_2)
+  ext/soap/php_http.c:
+  
+  Improve redirect validation
+
+* (PHP_5_2)
+  ext/standard/html.c:
+  Use strlcpy() rather then strcpy()
+
+2007-02-21  Stanislav Malyshev  [EMAIL PROTECTED]
+
+* (PHP_5_2)
+  ext/standard/basic_functions.c:
+  fix putenv - if there was no previous, remove variable from environ
+
+* ext/com_dotnet/com_olechar.c
+  ext/com_dotnet/com_olechar.c:
+  Cosmetic fix - safe_emalloc(nmemb, size, offset)
+
+* ext/com_dotnet/com_dotnet.c:
+  MF5.2: CreateInstance requires BSTR (should fix #33188)
+
+* (PHP_5_2)
+  ext/com_dotnet/com_dotnet.c:
+  CreateInstance requires BSTR (should fix #33188)
+
 2007-02-20  Stanislav Malyshev  [EMAIL PROTECTED]
 
 * (PHP_5_2)

[PHP-CVS] cvs: php-src /ext/xmlrpc/libxmlrpc xml_to_xmlrpc.c /ext/xmlrpc/tests bug40576.phpt

2007-02-21 Thread Antony Dovgal 
tony2001Wed Feb 21 14:24:44 2007 UTC

  Added files: 
/php-src/ext/xmlrpc/tests   bug40576.phpt 

  Modified files:  
/php-src/ext/xmlrpc/libxmlrpc   xml_to_xmlrpc.c 
  Log:
  fix bug #40576 (double values are truncated to 6 decimal digits when encoding)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c?r1=1.5r2=1.6diff_format=u
Index: php-src/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c
diff -u php-src/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c:1.5 
php-src/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c:1.6
--- php-src/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c:1.5Tue Apr 27 17:33:59 2004
+++ php-src/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.cWed Feb 21 14:24:44 2007
@@ -31,11 +31,13 @@
 */
 
 
-static const char rcsid[] = #(@) $Id: xml_to_xmlrpc.c,v 1.5 2004/04/27 
17:33:59 iliaa Exp $;
+static const char rcsid[] = #(@) $Id: xml_to_xmlrpc.c,v 1.6 2007/02/21 
14:24:44 tony2001 Exp $;
 
 #ifdef _WIN32
 #include xmlrpc_win32.h
 #endif
+#include php.h
+#include main/snprintf.h
 #include string.h
 #include stdlib.h
 #include xml_to_xmlrpc.h
@@ -225,9 +227,12 @@
 simplestring_add(elem_val-text, buf);
 break;
  case xmlrpc_double:
-elem_val-name = strdup(ELEM_DOUBLE);
-snprintf(buf, BUF_SIZE, %f, XMLRPC_GetValueDouble(node));
-simplestring_add(elem_val-text, buf);
+{
+TSRMLS_FETCH();
+elem_val-name = strdup(ELEM_DOUBLE);
+ap_php_snprintf(buf, BUF_SIZE, %.*G, (int) EG(precision), 
XMLRPC_GetValueDouble(node));
+simplestring_add(elem_val-text, buf);
+}
 break;
  case xmlrpc_datetime:
 elem_val-name = strdup(ELEM_DATETIME);

http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/tests/bug40576.phpt?view=markuprev=1.1
Index: php-src/ext/xmlrpc/tests/bug40576.phpt
+++ php-src/ext/xmlrpc/tests/bug40576.phpt
--TEST--
Bug #40576 (double values are truncated to 6 decimal digits when encoding)
--INI--
precision=12
--FILE--
?php

var_dump(xmlrpc_encode(1.123456789));
var_dump(xmlrpc_encode(11234567891010));
var_dump(xmlrpc_encode(11234567));
var_dump(xmlrpc_encode());
var_dump(xmlrpc_encode(test));
var_dump(xmlrpc_encode(1.222));

echo Done\n;
?
--EXPECTF-- 
string(125) ?xml version=1.0 encoding=utf-8?
params
param
 value
  double1.123456789/double
 /value
/param
/params

string(128) ?xml version=1.0 encoding=utf-8?
params
param
 value
  double11234567891000/double
 /value
/param
/params

string(116) ?xml version=1.0 encoding=utf-8?
params
param
 value
  int11234567/int
 /value
/param
/params

string(106) ?xml version=1.0 encoding=utf-8?
params
param
 value
  string/
 /value
/param
/params

string(118) ?xml version=1.0 encoding=utf-8?
params
param
 value
  stringtest/string
 /value
/param
/params

string(139) ?xml version=1.0 encoding=utf-8?
params
param
 value
  string1.222/string
 /value
/param
/params

Done

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

[PHP-CVS] cvs: php-src /ext/gd/libgd gdft.c

2007-02-21 Thread Antony Dovgal 
tony2001Wed Feb 21 14:59:36 2007 UTC

  Modified files:  
/php-src/ext/gd/libgd   gdft.c 
  Log:
  fix #40578 (imagettftext() multithreading issue)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gdft.c?r1=1.38r2=1.39diff_format=u
Index: php-src/ext/gd/libgd/gdft.c
diff -u php-src/ext/gd/libgd/gdft.c:1.38 php-src/ext/gd/libgd/gdft.c:1.39
--- php-src/ext/gd/libgd/gdft.c:1.38Fri Sep 15 16:14:57 2006
+++ php-src/ext/gd/libgd/gdft.c Wed Feb 21 14:59:36 2007
@@ -192,6 +192,16 @@
 #include jisx0208.h
 #endif
 
+extern int any2eucjp (char *, char *, unsigned int);
+
+/* Persistent font cache until explicitly cleared */
+/* Fonts can be used across multiple images */
+
+/* 2.0.16: thread safety (the font cache is shared) */
+gdMutexDeclare(gdFontCacheMutex);
+static gdCache_head_t *fontCache = NULL;
+static FT_Library library;
+
 #define Tcl_UniChar int
 #define TCL_UTF_MAX 3
 static int gdTcl_UtfToUniChar (char *str, Tcl_UniChar * chPtr)
@@ -688,8 +698,10 @@
} else {
/* find antialised color */
tc_key.bgcolor = *pixel;
+   gdMutexLock(gdFontCacheMutex);
tc_elem = (tweencolor_t *) 
gdCacheGet(tc_cache, tc_key);
*pixel = tc_elem-tweencolor;
+   gdMutexUnlock(gdFontCacheMutex);
}
}
}
@@ -703,16 +715,6 @@
return (!updown) ? (v1  0 ? ((v1 - 63)  6) : v1  6) : (v1  0 ? 
((v1 + 63)  6) : v1  6);
 }
 
-extern int any2eucjp (char *, char *, unsigned int);
-
-/* Persistent font cache until explicitly cleared */
-/* Fonts can be used across multiple images */
-
-/* 2.0.16: thread safety (the font cache is shared) */
-gdMutexDeclare(gdFontCacheMutex);
-static gdCache_head_t *fontCache = NULL;
-static FT_Library library;
-
 void gdFontCacheShutdown()
 {
if (fontCache) {

-- 
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/gd/libgd gdft.c

2007-02-21 Thread Antony Dovgal 
tony2001Wed Feb 21 15:00:27 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
/php-src/ext/gd/libgd   gdft.c 
  Log:
  MFH: fix #40578 (imagettftext() multithreading issue)
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.555r2=1.2027.2.547.2.556diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.555 php-src/NEWS:1.2027.2.547.2.556
--- php-src/NEWS:1.2027.2.547.2.555 Wed Feb 21 14:25:27 2007
+++ php-src/NEWSWed Feb 21 15:00:26 2007
@@ -9,6 +9,7 @@
 - Added --ri switch to CLI which allows to check extension information. 
(Marcus)
 - Added tidyNode::getParent() method (John, Nuno)
 - Fixed zend_llist_remove_tail (Michael Wallner, Dmitry)
+- Fixed bug #40578 (imagettftext() multithreading issue). (Tony)
 - Fixed bug #40576 (double values are truncated to 6 decimal digits when 
   encoding). (Tony)
 - Fixed bug #40560 (DIR functions do not work on root UNC path). (Dmitry)
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gdft.c?r1=1.36.4.2r2=1.36.4.3diff_format=u
Index: php-src/ext/gd/libgd/gdft.c
diff -u php-src/ext/gd/libgd/gdft.c:1.36.4.2 
php-src/ext/gd/libgd/gdft.c:1.36.4.3
--- php-src/ext/gd/libgd/gdft.c:1.36.4.2Fri Sep 15 16:11:39 2006
+++ php-src/ext/gd/libgd/gdft.c Wed Feb 21 15:00:26 2007
@@ -192,6 +192,16 @@
 #include jisx0208.h
 #endif
 
+extern int any2eucjp (char *, char *, unsigned int);
+
+/* Persistent font cache until explicitly cleared */
+/* Fonts can be used across multiple images */
+
+/* 2.0.16: thread safety (the font cache is shared) */
+gdMutexDeclare(gdFontCacheMutex);
+static gdCache_head_t *fontCache = NULL;
+static FT_Library library;
+
 #define Tcl_UniChar int
 #define TCL_UTF_MAX 3
 static int gdTcl_UtfToUniChar (char *str, Tcl_UniChar * chPtr)
@@ -688,8 +698,10 @@
} else {
/* find antialised color */
tc_key.bgcolor = *pixel;
+   gdMutexLock(gdFontCacheMutex);
tc_elem = (tweencolor_t *) 
gdCacheGet(tc_cache, tc_key);
*pixel = tc_elem-tweencolor;
+   gdMutexUnlock(gdFontCacheMutex);
}
}
}
@@ -703,16 +715,6 @@
return (!updown) ? (v1  0 ? ((v1 - 63)  6) : v1  6) : (v1  0 ? 
((v1 + 63)  6) : v1  6);
 }
 
-extern int any2eucjp (char *, char *, unsigned int);
-
-/* Persistent font cache until explicitly cleared */
-/* Fonts can be used across multiple images */
-
-/* 2.0.16: thread safety (the font cache is shared) */
-gdMutexDeclare(gdFontCacheMutex);
-static gdCache_head_t *fontCache = NULL;
-static FT_Library library;
-
 void gdFontCacheShutdown()
 {
if (fontCache) {

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

2007-02-21 Thread Dmitry Stogov 
dmitry  Wed Feb 21 15:46:30 2007 UTC

  Modified files:  
/php-src/sapi/cgi   fastcgi.c 
  Log:
  Check for FD_SETSIZE limit
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/fastcgi.c?r1=1.31r2=1.32diff_format=u
Index: php-src/sapi/cgi/fastcgi.c
diff -u php-src/sapi/cgi/fastcgi.c:1.31 php-src/sapi/cgi/fastcgi.c:1.32
--- php-src/sapi/cgi/fastcgi.c:1.31 Mon Feb 19 13:21:49 2007
+++ php-src/sapi/cgi/fastcgi.c  Wed Feb 21 15:46:30 2007
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: fastcgi.c,v 1.31 2007/02/19 13:21:49 dmitry Exp $ */
+/* $Id: fastcgi.c,v 1.32 2007/02/21 15:46:30 dmitry Exp $ */
 
 #include php.h
 #include fastcgi.h
@@ -757,18 +757,23 @@
break;
 #else
if (req-fd = 0) {
-   struct timeval tv = {5,0};
-   fd_set set;
+   if (req-fd  FD_SETSIZE) {
+   struct timeval tv = {5,0};
+   fd_set set;
 
-   FD_ZERO(set);
-   FD_SET(req-fd, set);
+   FD_ZERO(set);
+   FD_SET(req-fd, set);
 try_again:
-   errno = 0;
-   if (select(req-fd + 1, set, NULL, 
NULL, tv) = 0  FD_ISSET(req-fd, set)) {
-   break;
+   errno = 0;
+   if (select(req-fd + 1, set, 
NULL, NULL, tv) = 0  FD_ISSET(req-fd, set)) {
+   break;
+   }
+   if (errno == EINTR) goto 
try_again;
+   fcgi_close(req, 1, 0);
+   } else {
+   fprintf(stderr, Too many open 
file descriptors. FD_SETSIZE limit exceeded.);
+   fcgi_close(req, 1, 0);
}
-   if (errno == EINTR) goto try_again;
-   fcgi_close(req, 1, 0);
}
 #endif
}

-- 
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/pdo_sqlite/sqlite/src parse.c

2007-02-21 Thread Nuno Lopes 
nlopess Wed Feb 21 16:08:19 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/pdo_sqlite/sqlite/src  parse.c 
  Log:
  fix gcov build (#line stuff)
  http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/sqlite/src/parse.c?r1=1.6.2.5.2.5r2=1.6.2.5.2.6diff_format=u
Index: php-src/ext/pdo_sqlite/sqlite/src/parse.c
diff -u php-src/ext/pdo_sqlite/sqlite/src/parse.c:1.6.2.5.2.5 
php-src/ext/pdo_sqlite/sqlite/src/parse.c:1.6.2.5.2.6
--- php-src/ext/pdo_sqlite/sqlite/src/parse.c:1.6.2.5.2.5   Tue Feb 20 
00:09:43 2007
+++ php-src/ext/pdo_sqlite/sqlite/src/parse.c   Wed Feb 21 16:08:18 2007
@@ -4,7 +4,7 @@
 /* First off, code is include which follows the include declaration
 ** in the input file. */
 #include stdio.h
-#line 56 parse.y
+#line 56 ext/pdo_sqlite/sqlite/src/parse.y
 
 #include sqliteInt.h
 #include parse.h
@@ -43,7 +43,7 @@
 */
 struct AttachKey { int type;  Token key; };
 
-#line 48 parse.c
+#line 48 ext/pdo_sqlite/sqlite/src/parse.c
 /* Next is all token values, in a form suitable for use by makeheaders.
 ** This section will be null unless lemon is run with the -m switch.
 */
@@ -1250,9 +1250,9 @@
 case 156:
 case 190:
 case 207:
-#line 375 parse.y
+#line 375 ext/pdo_sqlite/sqlite/src/parse.y
 {sqlite3SelectDelete((yypminor-yy43));}
-#line 1257 parse.c
+#line 1257 ext/pdo_sqlite/sqlite/src/parse.c
   break;
 case 170:
 case 171:
@@ -1265,9 +1265,9 @@
 case 223:
 case 224:
 case 236:
-#line 616 parse.y
+#line 616 ext/pdo_sqlite/sqlite/src/parse.y
 {sqlite3ExprDelete((yypminor-yy450));}
-#line 1272 parse.c
+#line 1272 ext/pdo_sqlite/sqlite/src/parse.c
   break;
 case 175:
 case 183:
@@ -1280,48 +1280,48 @@
 case 213:
 case 216:
 case 222:
-#line 856 parse.y
+#line 856 ext/pdo_sqlite/sqlite/src/parse.y
 {sqlite3ExprListDelete((yypminor-yy242));}
-#line 1287 parse.c
+#line 1287 ext/pdo_sqlite/sqlite/src/parse.c
   break;
 case 189:
 case 194:
 case 202:
 case 203:
-#line 488 parse.y
+#line 488 ext/pdo_sqlite/sqlite/src/parse.y
 {sqlite3SrcListDelete((yypminor-yy419));}
-#line 1295 parse.c
+#line 1295 ext/pdo_sqlite/sqlite/src/parse.c
   break;
 case 199:
-#line 546 parse.y
+#line 546 ext/pdo_sqlite/sqlite/src/parse.y
 {
   sqlite3ExprDelete((yypminor-yy84).pLimit);
   sqlite3ExprDelete((yypminor-yy84).pOffset);
 }
-#line 1303 parse.c
+#line 1303 ext/pdo_sqlite/sqlite/src/parse.c
   break;
 case 206:
 case 209:
 case 215:
-#line 505 parse.y
+#line 505 ext/pdo_sqlite/sqlite/src/parse.y
 {sqlite3IdListDelete((yypminor-yy352));}
-#line 1310 parse.c
+#line 1310 ext/pdo_sqlite/sqlite/src/parse.c
   break;
 case 232:
 case 237:
-#line 957 parse.y
+#line 957 ext/pdo_sqlite/sqlite/src/parse.y
 {sqlite3DeleteTriggerStep((yypminor-yy75));}
-#line 1316 parse.c
+#line 1316 ext/pdo_sqlite/sqlite/src/parse.c
   break;
 case 234:
-#line 941 parse.y
+#line 941 ext/pdo_sqlite/sqlite/src/parse.y
 {sqlite3IdListDelete((yypminor-yy354).b);}
-#line 1321 parse.c
+#line 1321 ext/pdo_sqlite/sqlite/src/parse.c
   break;
 case 239:
-#line 1025 parse.y
+#line 1025 ext/pdo_sqlite/sqlite/src/parse.y
 {sqlite3ExprDelete((yypminor-yy158));}
-#line 1326 parse.c
+#line 1326 ext/pdo_sqlite/sqlite/src/parse.c
   break;
 default:  break;   /* If no destructor action specified: do nothing */
   }
@@ -1485,11 +1485,11 @@
  while( yypParser-yyidx=0 ) yy_pop_parser_stack(yypParser);
  /* Here code is inserted which will execute if the parser
  ** stack every overflows */
-#line 44 parse.y
+#line 44 ext/pdo_sqlite/sqlite/src/parse.y
 
   sqlite3ErrorMsg(pParse, parser stack overflow);
   pParse-parseError = 1;
-#line 1495 parse.c
+#line 1495 ext/pdo_sqlite/sqlite/src/parse.c
  sqlite3ParserARG_STORE; /* Suppress warning about unused %extra_argument 
var */
  return;
   }
@@ -1882,61 +1882,61 @@
   ** break;
   */
   case 3:
-#line 100 parse.y
+#line 100 ext/pdo_sqlite/sqlite/src/parse.y
 { sqlite3FinishCoding(pParse); }
-#line 1890 parse.c
+#line 1890 ext/pdo_sqlite/sqlite/src/parse.c
 break;
   case 6:
-#line 103 parse.y
+#line 103 ext/pdo_sqlite/sqlite/src/parse.y
 { sqlite3BeginParse(pParse, 0); }
-#line 1895 parse.c
+#line 1895 ext/pdo_sqlite/sqlite/src/parse.c
 break;
   case 7:
-#line 105 parse.y
+#line 105 ext/pdo_sqlite/sqlite/src/parse.y
 { sqlite3BeginParse(pParse, 1); }
-#line 1900 parse.c
+#line 1900 ext/pdo_sqlite/sqlite/src/parse.c
 break;
   case 8:
-#line 106 parse.y
+#line 106 ext/pdo_sqlite/sqlite/src/parse.y
 { sqlite3BeginParse(pParse, 2); }
-#line 1905 parse.c
+#line 1905 ext/pdo_sqlite/sqlite/src/parse.c
 break;
   case 9:
-#line 112 parse.y
+#line 112 ext/pdo_sqlite/sqlite/src/parse.y
 {sqlite3BeginTransaction(pParse, yymsp[-1].minor.yy316);}
-#line 1910 parse.c
+#line 1910 ext/pdo_sqlite/sqlite/src/parse.c
 break;
   case 13:
-#line 117 parse.y
+#line 117

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

2007-02-21 Thread Dmitry Stogov 
dmitry  Wed Feb 21 15:46:13 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/sapi/cgi   fastcgi.c 
  Log:
  Check for FD_SETSIZE limit
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/fastcgi.c?r1=1.4.2.13.2.17r2=1.4.2.13.2.18diff_format=u
Index: php-src/sapi/cgi/fastcgi.c
diff -u php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.17 
php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.18
--- php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.17Mon Feb 19 13:21:14 2007
+++ php-src/sapi/cgi/fastcgi.c  Wed Feb 21 15:46:13 2007
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: fastcgi.c,v 1.4.2.13.2.17 2007/02/19 13:21:14 dmitry Exp $ */
+/* $Id: fastcgi.c,v 1.4.2.13.2.18 2007/02/21 15:46:13 dmitry Exp $ */
 
 #include php.h
 #include fastcgi.h
@@ -757,18 +757,23 @@
break;
 #else
if (req-fd = 0) {
-   struct timeval tv = {5,0};
-   fd_set set;
+   if (req-fd  FD_SETSIZE) {
+   struct timeval tv = {5,0};
+   fd_set set;
 
-   FD_ZERO(set);
-   FD_SET(req-fd, set);
+   FD_ZERO(set);
+   FD_SET(req-fd, set);
 try_again:
-   errno = 0;
-   if (select(req-fd + 1, set, NULL, 
NULL, tv) = 0  FD_ISSET(req-fd, set)) {
-   break;
+   errno = 0;
+   if (select(req-fd + 1, set, 
NULL, NULL, tv) = 0  FD_ISSET(req-fd, set)) {
+   break;
+   }
+   if (errno == EINTR) goto 
try_again;
+   fcgi_close(req, 1, 0);
+   } else {
+   fprintf(stderr, Too many open 
file descriptors. FD_SETSIZE limit exceeded.);
+   fcgi_close(req, 1, 0);
}
-   if (errno == EINTR) goto try_again;
-   fcgi_close(req, 1, 0);
}
 #endif
}

-- 
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/tests/general_functions proc_open02.phpt

2007-02-21 Thread Nuno Lopes 
nlopess Wed Feb 21 16:25:37 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard/tests/general_functions   proc_open02.phpt 
  Log:
  use /usr/bin/nohup instead
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/proc_open02.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/standard/tests/general_functions/proc_open02.phpt
diff -u php-src/ext/standard/tests/general_functions/proc_open02.phpt:1.1.2.1 
php-src/ext/standard/tests/general_functions/proc_open02.phpt:1.1.2.2
--- php-src/ext/standard/tests/general_functions/proc_open02.phpt:1.1.2.1   
Wed Feb 14 19:13:31 2007
+++ php-src/ext/standard/tests/general_functions/proc_open02.phpt   Wed Feb 
21 16:25:37 2007
@@ -3,14 +3,14 @@
 --SKIPIF--
 ?php
 if (!is_executable('/bin/sleep')) echo 'skip no sleep';
-if (!is_executable('/bin/nohup')) echo 'skip no nohup';
+if (!is_executable('/usr/bin/nohup')) echo 'skip no nohup';
 ?
 --FILE--
 ?php
 $ds = array(array('pipe', 'r'));
 
 $cat = proc_open(
-   '/bin/nohup /bin/sleep 50',
+   '/usr/bin/nohup /bin/sleep 50',
$ds,
$pipes
 );
@@ -32,7 +32,7 @@
 bool(true)
 array(8) {
   [command]=
-  string(24) /bin/nohup /bin/sleep 50
+  string(28) /usr/bin/nohup /bin/sleep 50
   [pid]=
   int(%d)
   [running]=
@@ -51,7 +51,7 @@
 bool(true)
 array(8) {
   [command]=
-  string(24) /bin/nohup /bin/sleep 50
+  string(28) /usr/bin/nohup /bin/sleep 50
   [pid]=
   int(%d)
   [running]=

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

[PHP-CVS] cvs: php-src /ext/standard/tests/general_functions proc_open02.phpt

2007-02-21 Thread Nuno Lopes 
nlopess Wed Feb 21 16:27:12 2007 UTC

  Modified files:  
/php-src/ext/standard/tests/general_functions   proc_open02.phpt 
  Log:
  MFB
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/proc_open02.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/standard/tests/general_functions/proc_open02.phpt
diff -u php-src/ext/standard/tests/general_functions/proc_open02.phpt:1.3 
php-src/ext/standard/tests/general_functions/proc_open02.phpt:1.4
--- php-src/ext/standard/tests/general_functions/proc_open02.phpt:1.3   Wed Feb 
14 19:29:33 2007
+++ php-src/ext/standard/tests/general_functions/proc_open02.phpt   Wed Feb 
21 16:27:12 2007
@@ -3,14 +3,14 @@
 --SKIPIF--
 ?php
 if (!is_executable('/bin/sleep')) echo 'skip no sleep';
-if (!is_executable('/bin/nohup')) echo 'skip no nohup';
+if (!is_executable('/usr/bin/nohup')) echo 'skip no nohup';
 ?
 --FILE--
 ?php
 $ds = array(array('pipe', 'r'));
 
 $cat = proc_open(
-   '/bin/nohup /bin/sleep 50',
+   '/usr/bin/nohup /bin/sleep 50',
$ds,
$pipes
 );
@@ -32,7 +32,7 @@
 bool(true)
 array(8) {
   [command]=
-  string(24) /bin/nohup /bin/sleep 50
+  string(28) /usr/bin/nohup /bin/sleep 50
   [pid]=
   int(%d)
   [running]=
@@ -51,7 +51,7 @@
 bool(true)
 array(8) {
   [command]=
-  string(24) /bin/nohup /bin/sleep 50
+  string(28) /usr/bin/nohup /bin/sleep 50
   [pid]=
   int(%d)
   [running]=
@@ -72,7 +72,7 @@
 bool(true)
 array(8) {
   [ucommand]=
-  unicode(24) /bin/nohup /bin/sleep 50
+  unicode(28) /usr/bin/nohup /bin/sleep 50
   [upid]=
   int(%d)
   [urunning]=
@@ -91,7 +91,7 @@
 bool(true)
 array(8) {
   [ucommand]=
-  unicode(24) /bin/nohup /bin/sleep 50
+  unicode(28) /usr/bin/nohup /bin/sleep 50
   [upid]=
   int(%d)
   [urunning]=

-- 
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/ftp/tests bug37799.phpt

2007-02-21 Thread Antony Dovgal 
tony2001Wed Feb 21 19:22:28 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/ftp/tests  bug37799.phpt 
  Log:
  fix test
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/ftp/tests/bug37799.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/ftp/tests/bug37799.phpt
diff -u php-src/ext/ftp/tests/bug37799.phpt:1.1.2.1 
php-src/ext/ftp/tests/bug37799.phpt:1.1.2.2
--- php-src/ext/ftp/tests/bug37799.phpt:1.1.2.1 Tue Feb 13 18:29:10 2007
+++ php-src/ext/ftp/tests/bug37799.phpt Wed Feb 21 19:22:28 2007
@@ -2,6 +2,7 @@
 Bug #37799: ftp_ssl_connect() falls back to non-ssl connection
 --SKIPIF--
 ?php
+$ssl = 1;
 require 'skipif.inc';
 ?
 --FILE--

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

[PHP-CVS] cvs: php-src /ext/ftp/tests bug37799.phpt

2007-02-21 Thread Antony Dovgal 
tony2001Wed Feb 21 19:22:56 2007 UTC

  Modified files:  
/php-src/ext/ftp/tests  bug37799.phpt 
  Log:
  fix test
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/ftp/tests/bug37799.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/ftp/tests/bug37799.phpt
diff -u php-src/ext/ftp/tests/bug37799.phpt:1.2 
php-src/ext/ftp/tests/bug37799.phpt:1.3
--- php-src/ext/ftp/tests/bug37799.phpt:1.2 Tue Feb 13 18:30:19 2007
+++ php-src/ext/ftp/tests/bug37799.phpt Wed Feb 21 19:22:56 2007
@@ -2,6 +2,7 @@
 Bug #37799: ftp_ssl_connect() falls back to non-ssl connection
 --SKIPIF--
 ?php
+$ssl = 1;
 require 'skipif.inc';
 ?
 --FILE--

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

[PHP-CVS] cvs: php-src /ext/xmlrpc/tests bug40576.phpt

2007-02-21 Thread Antony Dovgal 
tony2001Wed Feb 21 19:27:30 2007 UTC

  Modified files:  
/php-src/ext/xmlrpc/tests   bug40576.phpt 
  Log:
  fix test
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/tests/bug40576.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/xmlrpc/tests/bug40576.phpt
diff -u php-src/ext/xmlrpc/tests/bug40576.phpt:1.1 
php-src/ext/xmlrpc/tests/bug40576.phpt:1.2
--- php-src/ext/xmlrpc/tests/bug40576.phpt:1.1  Wed Feb 21 14:24:44 2007
+++ php-src/ext/xmlrpc/tests/bug40576.phpt  Wed Feb 21 19:27:30 2007
@@ -1,5 +1,10 @@
 --TEST--
 Bug #40576 (double values are truncated to 6 decimal digits when encoding)
+--SKIPIF--
+?php
+if (!extension_loaded(xmlrpc)) print skip;
+if (PHP_INT_SIZE != 4) die(skip this test is for 32bit platform only);
+?
 --INI--
 precision=12
 --FILE--

-- 
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/xmlrpc/tests bug40576.phpt

2007-02-21 Thread Antony Dovgal 
tony2001Wed Feb 21 19:27:37 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/xmlrpc/tests   bug40576.phpt 
  Log:
  fix test
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/tests/bug40576.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/xmlrpc/tests/bug40576.phpt
diff -u php-src/ext/xmlrpc/tests/bug40576.phpt:1.1.2.2 
php-src/ext/xmlrpc/tests/bug40576.phpt:1.1.2.3
--- php-src/ext/xmlrpc/tests/bug40576.phpt:1.1.2.2  Wed Feb 21 14:25:27 2007
+++ php-src/ext/xmlrpc/tests/bug40576.phpt  Wed Feb 21 19:27:37 2007
@@ -1,5 +1,10 @@
 --TEST--
 Bug #40576 (double values are truncated to 6 decimal digits when encoding)
+--SKIPIF--
+?php
+if (!extension_loaded(xmlrpc)) print skip;
+if (PHP_INT_SIZE != 4) die(skip this test is for 32bit platform only);
+?
 --INI--
 precision=12
 --FILE--

-- 
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/xmlrpc/tests bug40576_64bit.phpt

2007-02-21 Thread Antony Dovgal 
tony2001Wed Feb 21 19:35:15 2007 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/xmlrpc/tests   bug40576_64bit.phpt 
  Log:
  add test for 64bit arch
  
  

http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/tests/bug40576_64bit.phpt?view=markuprev=1.1
Index: php-src/ext/xmlrpc/tests/bug40576_64bit.phpt
+++ php-src/ext/xmlrpc/tests/bug40576_64bit.phpt

-- 
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/xmlrpc/tests bug40576_64bit.phpt

2007-02-21 Thread Antony Dovgal 
tony2001Wed Feb 21 19:36:20 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/xmlrpc/tests   bug40576_64bit.phpt 
  Log:
  wrong string len
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/tests/bug40576_64bit.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/xmlrpc/tests/bug40576_64bit.phpt
diff -u php-src/ext/xmlrpc/tests/bug40576_64bit.phpt:1.1.2.1 
php-src/ext/xmlrpc/tests/bug40576_64bit.phpt:1.1.2.2
--- php-src/ext/xmlrpc/tests/bug40576_64bit.phpt:1.1.2.1Wed Feb 21 
19:35:15 2007
+++ php-src/ext/xmlrpc/tests/bug40576_64bit.phptWed Feb 21 19:36:20 2007
@@ -29,7 +29,7 @@
 /param
 /params
 
-string(128) ?xml version=1.0 encoding=utf-8?
+string(119) ?xml version=1.0 encoding=utf-8?
 params
 param
  value

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

[PHP-CVS] cvs: php-src /ext/xmlrpc/tests bug40576_64bit.phpt

2007-02-21 Thread Antony Dovgal 
tony2001Wed Feb 21 19:37:05 2007 UTC

  Modified files:  
/php-src/ext/xmlrpc/tests   bug40576_64bit.phpt 
  Log:
  add test
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/tests/bug40576_64bit.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/xmlrpc/tests/bug40576_64bit.phpt
diff -u /dev/null php-src/ext/xmlrpc/tests/bug40576_64bit.phpt:1.2
--- /dev/null   Wed Feb 21 19:37:05 2007
+++ php-src/ext/xmlrpc/tests/bug40576_64bit.phptWed Feb 21 19:37:05 2007
@@ -0,0 +1,77 @@
+--TEST--
+Bug #40576 (double values are truncated to 6 decimal digits when encoding)
+--SKIPIF--
+?php
+if (!extension_loaded(xmlrpc)) print skip;
+if (PHP_INT_SIZE != 8) die(skip this test is for 64bit platform only);
+?
+--INI--
+precision=12
+--FILE--
+?php
+
+var_dump(xmlrpc_encode(1.123456789));
+var_dump(xmlrpc_encode(11234567891010));
+var_dump(xmlrpc_encode(11234567));
+var_dump(xmlrpc_encode());
+var_dump(xmlrpc_encode(test));
+var_dump(xmlrpc_encode(1.222));
+
+echo Done\n;
+?
+--EXPECTF--
+string(125) ?xml version=1.0 encoding=utf-8?
+params
+param
+ value
+  double1.123456789/double
+ /value
+/param
+/params
+
+string(119) ?xml version=1.0 encoding=utf-8?
+params
+param
+ value
+  int-1066555326/int
+ /value
+/param
+/params
+
+string(116) ?xml version=1.0 encoding=utf-8?
+params
+param
+ value
+  int11234567/int
+ /value
+/param
+/params
+
+string(106) ?xml version=1.0 encoding=utf-8?
+params
+param
+ value
+  string/
+ /value
+/param
+/params
+
+string(118) ?xml version=1.0 encoding=utf-8?
+params
+param
+ value
+  stringtest/string
+ /value
+/param
+/params
+
+string(139) ?xml version=1.0 encoding=utf-8?
+params
+param
+ value
+  string1.222/string
+ /value
+/param
+/params
+
+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) /ext/iconv/tests bug37176.phpt bug37773.phpt

2007-02-21 Thread Antony Dovgal 
tony2001Wed Feb 21 19:52:20 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/iconv/testsbug37176.phpt bug37773.phpt 
  Log:
  fix tests on AIX
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/bug37176.phpt?r1=1.1.2.2.2.1r2=1.1.2.2.2.2diff_format=u
Index: php-src/ext/iconv/tests/bug37176.phpt
diff -u php-src/ext/iconv/tests/bug37176.phpt:1.1.2.2.2.1 
php-src/ext/iconv/tests/bug37176.phpt:1.1.2.2.2.2
--- php-src/ext/iconv/tests/bug37176.phpt:1.1.2.2.2.1   Tue Jun 27 00:09:43 2006
+++ php-src/ext/iconv/tests/bug37176.phpt   Wed Feb 21 19:52:20 2007
@@ -1,7 +1,15 @@
 --TEST--
 Bug #37176 (iconv_strpos() fails to find a string)
 --SKIPIF--
-?php include('skipif.inc'); ?
+?php 
+include('skipif.inc'); 
+
+$test = @iconv_strpos(abbttt,ttt,0,UTF-8);
+if ($test === false) {
+   die(skip UTF-8 is not supported?);
+}
+
+?
 --FILE--
 ?php
 var_dump(iconv_strpos('11--','1-',0,'UTF-8'));
http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/bug37773.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/iconv/tests/bug37773.phpt
diff -u php-src/ext/iconv/tests/bug37773.phpt:1.1.2.1 
php-src/ext/iconv/tests/bug37773.phpt:1.1.2.2
--- php-src/ext/iconv/tests/bug37773.phpt:1.1.2.1   Wed Nov 15 18:34:57 2006
+++ php-src/ext/iconv/tests/bug37773.phpt   Wed Feb 21 19:52:20 2007
@@ -1,10 +1,18 @@
 --TEST--
 Bug #37773 (iconv_substr() gives Unknown error when string length = 1)
 --SKIPIF--
-?php include('skipif.inc'); ?
+?php 
+include('skipif.inc'); 
+
+$test = @iconv_strpos(abbttt,ttt,0,UTF-8);
+if ($test === false) {
+   die(skip UTF-8 is not supported?);
+}
+
+?
 --FILE--
 ?php
var_dump(iconv_substr('x', 0, 1, 'UTF-8'));
 ?
 --EXPECT--
-string(1) x
\ No newline at end of file
+string(1) x

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

[PHP-CVS] cvs: php-src /ext/iconv/tests bug37176.phpt bug37773.phpt

2007-02-21 Thread Antony Dovgal 
tony2001Wed Feb 21 19:53:48 2007 UTC

  Modified files:  
/php-src/ext/iconv/testsbug37176.phpt bug37773.phpt 
  Log:
  fix tests
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/bug37176.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/iconv/tests/bug37176.phpt
diff -u php-src/ext/iconv/tests/bug37176.phpt:1.2 
php-src/ext/iconv/tests/bug37176.phpt:1.3
--- php-src/ext/iconv/tests/bug37176.phpt:1.2   Tue Jun 27 00:09:23 2006
+++ php-src/ext/iconv/tests/bug37176.phpt   Wed Feb 21 19:53:48 2007
@@ -1,7 +1,15 @@
 --TEST--
 Bug #37176 (iconv_strpos() fails to find a string)
 --SKIPIF--
-?php include('skipif.inc'); ?
+?php 
+include('skipif.inc'); 
+
+$test = @iconv_strpos(abbttt,ttt,0,UTF-8);
+if ($test === false) {
+   die(skip UTF-8 is not supported?);
+}
+
+?
 --FILE--
 ?php
 var_dump(iconv_strpos('11--','1-',0,'UTF-8'));
http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/bug37773.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/iconv/tests/bug37773.phpt
diff -u php-src/ext/iconv/tests/bug37773.phpt:1.2 
php-src/ext/iconv/tests/bug37773.phpt:1.3
--- php-src/ext/iconv/tests/bug37773.phpt:1.2   Wed Nov 15 18:35:18 2006
+++ php-src/ext/iconv/tests/bug37773.phpt   Wed Feb 21 19:53:48 2007
@@ -1,10 +1,18 @@
 --TEST--
 Bug #37773 (iconv_substr() gives Unknown error when string length = 1)
 --SKIPIF--
-?php include('skipif.inc'); ?
+?php 
+include('skipif.inc'); 
+
+$test = @iconv_strpos(abbttt,ttt,0,UTF-8);
+if ($test === false) {
+   die(skip UTF-8 is not supported?);
+}
+
+?
 --FILE--
 ?php
var_dump(iconv_substr('x', 0, 1, 'UTF-8'));
 ?
 --EXPECT--
-string(1) x
\ No newline at end of file
+string(1) x

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

[PHP-CVS] cvs: php-src /ext/standard/tests/file get_current_user.phpt

2007-02-21 Thread Antony Dovgal 
tony2001Wed Feb 21 19:57:08 2007 UTC

  Modified files:  
/php-src/ext/standard/tests/fileget_current_user.phpt 
  Log:
  fix test on FreeBSD
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/get_current_user.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/file/get_current_user.phpt
diff -u php-src/ext/standard/tests/file/get_current_user.phpt:1.1 
php-src/ext/standard/tests/file/get_current_user.phpt:1.2
--- php-src/ext/standard/tests/file/get_current_user.phpt:1.1   Thu Nov 16 
13:00:03 2006
+++ php-src/ext/standard/tests/file/get_current_user.phpt   Wed Feb 21 
19:57:08 2007
@@ -11,10 +11,10 @@
 --EXPECTF--
 Warning: Wrong parameter count for get_current_user() in %s on line %d
 NULL
-string(%d) %s
+string(%d) %s
 Done
 --UEXPECTF--
 Warning: Wrong parameter count for get_current_user() in %s on line %d
 NULL
-unicode(%d) %s
+unicode(%d) %s
 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) /ext/standard/tests/file get_current_user.phpt

2007-02-21 Thread Antony Dovgal 
tony2001Wed Feb 21 19:57:15 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard/tests/fileget_current_user.phpt 
  Log:
  fix test
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/get_current_user.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/standard/tests/file/get_current_user.phpt
diff -u php-src/ext/standard/tests/file/get_current_user.phpt:1.1.2.2 
php-src/ext/standard/tests/file/get_current_user.phpt:1.1.2.3
--- php-src/ext/standard/tests/file/get_current_user.phpt:1.1.2.2   Thu Nov 
16 13:01:23 2006
+++ php-src/ext/standard/tests/file/get_current_user.phpt   Wed Feb 21 
19:57:15 2007
@@ -11,5 +11,5 @@
 --EXPECTF--
 Warning: Wrong parameter count for get_current_user() in %s on line %d
 NULL
-string(%d) %s
+string(%d) %s
 Done

-- 
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/standard/tests/general_functions proc_open02.phpt

2007-02-21 Thread Antony Dovgal 

On 02/21/2007 07:25 PM, Nuno Lopes wrote:

nlopess Wed Feb 21 16:25:37 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard/tests/general_functions	proc_open02.phpt 


The test fails on three different Linuxes I have here.
Here is the diff:

008+   bool(false)
009+   [signaled]=
009-   [signaled]=
010-   bool(false)
016+   int(1)
016-   int(0)
020+ bool(false)
020- bool(true)
029+   bool(false)
029-   bool(true)
035+   int(0)
035-   int(15)

# cat ext/standard/tests/general_functions/proc_open02.out

bool(true)
array(8) {
 [command]=
 string(28) /usr/bin/nohup /bin/sleep 50
 [pid]=
 int(9504)
 [running]=
 bool(false)
 [signaled]=
 bool(true)
 [stopped]=
 bool(false)
 [exitcode]=
 int(-1)
 [termsig]=
 int(1)
 [stopsig]=
 int(0)
}
bool(false)
array(8) {
 [command]=
 string(28) /usr/bin/nohup /bin/sleep 50
 [pid]=
 int(9504)
 [running]=
 bool(false)
 [signaled]=
 bool(false)
 [stopped]=
 bool(false)
 [exitcode]=
 int(-1)
 [termsig]=
 int(0)
 [stopsig]=
 int(0)
}


--
Wbr, 
Antony Dovgal


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

Re: [PHP-CVS] cvs: php-src /ext/xmlrpc/libxmlrpc xml_to_xmlrpc.c /ext/xmlrpc/tests bug40576.phpt

2007-02-21 Thread Marcus Boerger 
Hello Antony,

Wednesday, February 21, 2007, 3:24:44 PM, you wrote:

 tony2001Wed Feb 21 14:24:44 2007 UTC

   Added files: 
 /php-src/ext/xmlrpc/tests   bug40576.phpt 

   Modified files:  
 /php-src/ext/xmlrpc/libxmlrpc   xml_to_xmlrpc.c 
   Log:
   fix bug #40576 (double values are truncated to 6 decimal digits when 
 encoding)
   
   
 http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c?r1=1.5r2=1.6diff_format=u
 Index: php-src/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c
 diff -u php-src/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c:1.5
 php-src/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c:1.6
 --- php-src/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c:1.5Tue Apr 27 17:33:59 
 2004
 +++ php-src/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.cWed Feb 21 14:24:44 
 2007
 @@ -31,11 +31,13 @@
  */
  
  
 -static const char rcsid[] = #(@) $Id: xml_to_xmlrpc.c,v 1.5 2004/04/27 
 17:33:59 iliaa Exp $;
 +static const char rcsid[] = #(@) $Id: xml_to_xmlrpc.c,v 1.6 2007/02/21 
 14:24:44 tony2001 Exp $;
  
  #ifdef _WIN32
  #include xmlrpc_win32.h
  #endif
 +#include php.h
 +#include main/snprintf.h
  #include string.h
  #include stdlib.h
  #include xml_to_xmlrpc.h
 @@ -225,9 +227,12 @@
  simplestring_add(elem_val-text, buf);
  break;
   case xmlrpc_double:
 -elem_val-name = strdup(ELEM_DOUBLE);
 -snprintf(buf, BUF_SIZE, %f, XMLRPC_GetValueDouble(node));
 -simplestring_add(elem_val-text, buf);
 +{
 +TSRMLS_FETCH();
 +elem_val-name = strdup(ELEM_DOUBLE);
 +ap_php_snprintf(buf, BUF_SIZE, %.*G, (int)
 EG(precision), XMLRPC_GetValueDouble(node));

You don't have to use ap_php_snprintf() here. The problem before seemed to
be an issue with not including main/snprintf.h which might result in not
using our implementation.

 +simplestring_add(elem_val-text, buf);
 +}
  break;
   case xmlrpc_datetime:
  elem_val-name = strdup(ELEM_DATETIME);

 http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/tests/bug40576.phpt?view=markuprev=1.1
 Index: php-src/ext/xmlrpc/tests/bug40576.phpt
 +++ php-src/ext/xmlrpc/tests/bug40576.phpt
 --TEST--
 Bug #40576 (double values are truncated to 6 decimal digits when encoding)
 --INI--
 precision=12
 --FILE--
 ?php

 var_dump(xmlrpc_encode(1.123456789));
 var_dump(xmlrpc_encode(11234567891010));
 var_dump(xmlrpc_encode(11234567));
 var_dump(xmlrpc_encode());
 var_dump(xmlrpc_encode(test));
 var_dump(xmlrpc_encode(1.222));

 echo Done\n;
?
 --EXPECTF-- 
 string(125) ?xml version=1.0 encoding=utf-8?
 params
 param
  value
   double1.123456789/double
  /value
 /param
 /params
 
 string(128) ?xml version=1.0 encoding=utf-8?
 params
 param
  value
   double11234567891000/double
  /value
 /param
 /params
 
 string(116) ?xml version=1.0 encoding=utf-8?
 params
 param
  value
   int11234567/int
  /value
 /param
 /params
 
 string(106) ?xml version=1.0 encoding=utf-8?
 params
 param
  value
   string/
  /value
 /param
 /params
 
 string(118) ?xml version=1.0 encoding=utf-8?
 params
 param
  value
   stringtest/string
  /value
 /param
 /params
 
 string(139) ?xml version=1.0 encoding=utf-8?
 params
 param
  value
   string1.222/string
  /value
 /param
 /params
 
 Done




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(PHP_5_2) /ext/soap php_http.c

2007-02-21 Thread Stanislav Malyshev 
stasWed Feb 21 21:08:59 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/soap   php_http.c 
  Log:
  use snprintf
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_http.c?r1=1.77.2.11.2.6r2=1.77.2.11.2.7diff_format=u
Index: php-src/ext/soap/php_http.c
diff -u php-src/ext/soap/php_http.c:1.77.2.11.2.6 
php-src/ext/soap/php_http.c:1.77.2.11.2.7
--- php-src/ext/soap/php_http.c:1.77.2.11.2.6   Wed Feb 21 04:29:15 2007
+++ php-src/ext/soap/php_http.c Wed Feb 21 21:08:58 2007
@@ -17,7 +17,7 @@
   |  Dmitry Stogov [EMAIL PROTECTED] |
   +--+
 */
-/* $Id: php_http.c,v 1.77.2.11.2.6 2007/02/21 04:29:15 iliaa Exp $ */
+/* $Id: php_http.c,v 1.77.2.11.2.7 2007/02/21 21:08:58 stas Exp $ */
 
 #include php_soap.h
 #include ext/standard/base64.h
@@ -480,7 +480,7 @@
if (zend_hash_find(Z_ARRVAL_PP(digest), 
nc, sizeof(nc), (void **)tmp) == SUCCESS 
Z_TYPE_PP(tmp) == IS_LONG) {
Z_LVAL_PP(tmp)++;
-   sprintf(nc, %08ld, 
Z_LVAL_PP(tmp));
+   snprintf(nc, sizeof(nc), 
%08ld, Z_LVAL_PP(tmp));
} else {
add_assoc_long(*digest, nc, 
1);
strcpy(nc, 0001);

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

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

2007-02-21 Thread Stanislav Malyshev 
stasWed Feb 21 21:11:32 2007 UTC

  Modified files:  
/php-src/ext/soap   php_http.c 
  Log:
  use snprintf
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_http.c?r1=1.101r2=1.102diff_format=u
Index: php-src/ext/soap/php_http.c
diff -u php-src/ext/soap/php_http.c:1.101 php-src/ext/soap/php_http.c:1.102
--- php-src/ext/soap/php_http.c:1.101   Wed Jan 24 21:43:47 2007
+++ php-src/ext/soap/php_http.c Wed Feb 21 21:11:32 2007
@@ -17,7 +17,7 @@
   |  Dmitry Stogov [EMAIL PROTECTED] |
   +--+
 */
-/* $Id: php_http.c,v 1.101 2007/01/24 21:43:47 pollita Exp $ */
+/* $Id: php_http.c,v 1.102 2007/02/21 21:11:32 stas Exp $ */
 
 #include php_soap.h
 #include ext/standard/base64.h
@@ -474,7 +474,7 @@
make_digest(cnonce, hash);
 
client-digest_nc++;
-   sprintf(nc, %08ld, client-digest_nc);
+   snprintf(nc, sizeof(nc), %08ld, 
client-digest_nc);
 
PHP_MD5Init(md5ctx);
PHP_MD5Update(md5ctx, (unsigned 
char*)client-login, strlen(client-login));

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

[PHP-CVS] cvs: php-src /ext/standard/tests/file bug27508.phpt

2007-02-21 Thread Antony Dovgal 
tony2001Wed Feb 21 22:08:00 2007 UTC

  Modified files:  
/php-src/ext/standard/tests/filebug27508.phpt 
  Log:
  minor improvements
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug27508.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/standard/tests/file/bug27508.phpt
diff -u php-src/ext/standard/tests/file/bug27508.phpt:1.3 
php-src/ext/standard/tests/file/bug27508.phpt:1.4
--- php-src/ext/standard/tests/file/bug27508.phpt:1.3   Thu Nov  9 00:33:54 2006
+++ php-src/ext/standard/tests/file/bug27508.phpt   Wed Feb 21 22:08:00 2007
@@ -57,12 +57,13 @@
 rewind($fp);
 echo ftell($fp) . \n;
 debug_zval_dump(feof($fp));
-while (!feof($fp)) {
+while ($fp  !feof($fp)) {
 echo fgets($fp);
 }
 fclose($fp);
 
 unlink($tn);
+?
 --EXPECT--
 bool(false) refcount(1)
 0

-- 
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/tests/file bug27508.phpt

2007-02-21 Thread Antony Dovgal 
tony2001Wed Feb 21 22:08:08 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard/tests/filebug27508.phpt 
  Log:
  MFH
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug27508.phpt?r1=1.1r2=1.1.4.1diff_format=u
Index: php-src/ext/standard/tests/file/bug27508.phpt
diff -u php-src/ext/standard/tests/file/bug27508.phpt:1.1 
php-src/ext/standard/tests/file/bug27508.phpt:1.1.4.1
--- php-src/ext/standard/tests/file/bug27508.phpt:1.1   Wed May 11 02:01:44 2005
+++ php-src/ext/standard/tests/file/bug27508.phpt   Wed Feb 21 22:08:08 2007
@@ -54,12 +54,13 @@
 rewind($fp);
 echo ftell($fp) . \n;
 debug_zval_dump(feof($fp));
-while (!feof($fp)) {
+while ($fp  !feof($fp)) {
 echo fgets($fp);
 }
 fclose($fp);
 
 unlink($tn);
+?
 --EXPECT--
 bool(false) refcount(1)
 0

-- 
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/standard/tests/general_functions proc_open02.phpt

2007-02-21 Thread Nuno Lopes 

On 02/21/2007 07:25 PM, Nuno Lopes wrote:

nlopess Wed Feb 21 16:25:37 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard/tests/general_functions proc_open02.phpt


The test fails on three different Linuxes I have here.


Thanks for the report, Tony. This test also failed once on my laptop, but I 
was still wondering why.
Can you please try to add a 'sleep(1);' call after the proc_open()? My guess 
is that PHP is sending the SIGHUP signal before the nohup program sets the 
signal bitmasks. Adding the 'sleep(1)' call should make the OS run the nohup 
process.


Nuno 


--
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/standard/tests/general_functions proc_open02.phpt

2007-02-21 Thread Antony Dovgal 

On 02/22/2007 02:07 AM, Nuno Lopes wrote:

On 02/21/2007 07:25 PM, Nuno Lopes wrote:

nlopess Wed Feb 21 16:25:37 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard/tests/general_functions proc_open02.phpt


The test fails on three different Linuxes I have here.


Thanks for the report, Tony. This test also failed once on my laptop, but I 
was still wondering why.
Can you please try to add a 'sleep(1);' call after the proc_open()? My guess 
is that PHP is sending the SIGHUP signal before the nohup program sets the 
signal bitmasks. Adding the 'sleep(1)' call should make the OS run the nohup 
process.


Yup, that fixes it.

--
Wbr, 
Antony Dovgal


--
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 url_scanner.c

2007-02-21 Thread Ilia Alshanetsky 
iliaa   Thu Feb 22 00:25:38 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard   url_scanner.c 
  Log:
  
  strcpy() elimination
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/url_scanner.c?r1=1.44.2.1.2.1r2=1.44.2.1.2.2diff_format=u
Index: php-src/ext/standard/url_scanner.c
diff -u php-src/ext/standard/url_scanner.c:1.44.2.1.2.1 
php-src/ext/standard/url_scanner.c:1.44.2.1.2.2
--- php-src/ext/standard/url_scanner.c:1.44.2.1.2.1 Mon Jan  1 09:36:09 2007
+++ php-src/ext/standard/url_scanner.c  Thu Feb 22 00:25:38 2007
@@ -15,7 +15,7 @@
| Author: Hartmut Holzgraefe [EMAIL PROTECTED]|
+--+
  */
-/* $Id: url_scanner.c,v 1.44.2.1.2.1 2007/01/01 09:36:09 sebastian Exp $ */
+/* $Id: url_scanner.c,v 1.44.2.1.2.2 2007/02/22 00:25:38 iliaa Exp $ */
 
 #include php.h
 
@@ -50,35 +50,24 @@
 static char *url_attr_addon(const char *tag,const char *attr,const char 
*val,const char *buf)
 {
int flag = 0;
-   TSRMLS_FETCH();
 
-   if(!strcasecmp(tag,a)  !strcasecmp(attr,href)) {
+   if (!strcasecmp(tag,a)  !strcasecmp(attr,href)) {
flag = 1;
-   } else if(!strcasecmp(tag,area )  !strcasecmp(attr,href   )) {
+   } else if (!strcasecmp(tag,area )  !strcasecmp(attr,href   )) {
flag = 1;
-   } else if(!strcasecmp(tag,form )  !strcasecmp(attr,action )) {
+   } else if (!strcasecmp(tag,form )  !strcasecmp(attr,action )) {
flag = 1;
-   } else if(!strcasecmp(tag,frame)  !strcasecmp(attr,source )) {
+   } else if (!strcasecmp(tag,frame)  !strcasecmp(attr,source )) {
flag = 1;
-   } else if(!strcasecmp(tag,img  )  !strcasecmp(attr,action )) {
+   } else if (!strcasecmp(tag,img  )  !strcasecmp(attr,action )) {
flag = 1;
}
-   if(flag) {  
-   if(!strstr(val,buf)!strchr(val,':'))
-   {
-   char *result = (char 
*)emalloc(strlen(buf)+strlen(PG(arg_separator).output)+1);
-   int n;
-
-   if(strchr(val,'?')) {
-   strcpy(result,PG(arg_separator).output);
-   n=strlen(PG(arg_separator).output);
-   } else {
-   *result='?';
-   n=1;
-   }
-   strcpy(result+n,buf);
-   return result;
-   }
+   if(flag  !strstr(val,buf)  !strchr(val,':')) {
+   char *result;
+   TSRMLS_FETCH();
+
+   spprintf(result, 0, %s%s, (strchr(val,'?') ? 
PG(arg_separator).output : ?), buf);
+   return result;
} 
return NULL;
 }
@@ -230,7 +219,7 @@
maxl+=l;
out=realloc(out,maxl);
outp=out+*newlen;
-   strcpy(outp,p);
+   strlcpy(outp, p, maxl);
outp+=l;
*newlen+=l;
efree(p);
@@ -265,7 +254,7 @@
maxl+=l;
out=realloc(out,maxl);
outp=out+*newlen;
-   strcpy(outp,p);
+   strlcpy(outp,p,maxl);
outp+=l;
*newlen+=l;
efree(p);
@@ -282,7 +271,7 @@
maxl+=l;
out=realloc(out,maxl);
outp=out+*newlen;
-   strcpy(outp,p);
+   strlcpy(outp,p,maxl);
outp+=l;
*newlen+=l;
efree(p);
@@ -329,7 +318,7 @@
maxl+=l;
out=realloc(out,maxl);
outp=out+*newlen;
-   strcpy(outp,p);
+   strlcpy(outp,p,maxl);
outp+=l;

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

2007-02-21 Thread Ilia Alshanetsky 
iliaa   Thu Feb 22 00:44:08 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard   url_scanner.c 
  Log:
  One more strcpy. (Thanks Stas)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/url_scanner.c?r1=1.44.2.1.2.2r2=1.44.2.1.2.3diff_format=u
Index: php-src/ext/standard/url_scanner.c
diff -u php-src/ext/standard/url_scanner.c:1.44.2.1.2.2 
php-src/ext/standard/url_scanner.c:1.44.2.1.2.3
--- php-src/ext/standard/url_scanner.c:1.44.2.1.2.2 Thu Feb 22 00:25:38 2007
+++ php-src/ext/standard/url_scanner.c  Thu Feb 22 00:44:08 2007
@@ -15,7 +15,7 @@
| Author: Hartmut Holzgraefe [EMAIL PROTECTED]|
+--+
  */
-/* $Id: url_scanner.c,v 1.44.2.1.2.2 2007/02/22 00:25:38 iliaa Exp $ */
+/* $Id: url_scanner.c,v 1.44.2.1.2.3 2007/02/22 00:44:08 iliaa Exp $ */
 
 #include php.h
 
@@ -203,7 +203,7 @@
maxl+=l;
out=realloc(out,maxl);
outp=out+*newlen;
-   strcpy(outp,p);
+   strlcpy(outp,p,maxl);
outp+=l;
*newlen+=l;
efree(p);

-- 
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/xmlrpc/libxmlrpc xml_to_xmlrpc.c /ext/xmlrpc/tests bug40576.phpt

2007-02-21 Thread Antony Dovgal 
tony2001Wed Feb 21 14:25:27 2007 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/xmlrpc/tests   bug40576.phpt 

  Modified files:  
/php-srcNEWS 
/php-src/ext/xmlrpc/libxmlrpc   xml_to_xmlrpc.c 
  Log:
  MFH: fix #40576 (double values are truncated to 6 decimal digits when 
encoding)
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.554r2=1.2027.2.547.2.555diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.554 php-src/NEWS:1.2027.2.547.2.555
--- php-src/NEWS:1.2027.2.547.2.554 Wed Feb 21 13:09:03 2007
+++ php-src/NEWSWed Feb 21 14:25:27 2007
@@ -9,6 +9,8 @@
 - Added --ri switch to CLI which allows to check extension information. 
(Marcus)
 - Added tidyNode::getParent() method (John, Nuno)
 - Fixed zend_llist_remove_tail (Michael Wallner, Dmitry)
+- Fixed bug #40576 (double values are truncated to 6 decimal digits when 
+  encoding). (Tony)
 - Fixed bug #40560 (DIR functions do not work on root UNC path). (Dmitry)
 - Fixed bug #40548 (SplFileInfo::getOwner/getGroup give a warning on broken
   symlink). (Marcus)
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c?r1=1.5r2=1.5.6.1diff_format=u
Index: php-src/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c
diff -u php-src/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c:1.5 
php-src/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c:1.5.6.1
--- php-src/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c:1.5Tue Apr 27 17:33:59 2004
+++ php-src/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.cWed Feb 21 14:25:27 2007
@@ -31,11 +31,13 @@
 */
 
 
-static const char rcsid[] = #(@) $Id: xml_to_xmlrpc.c,v 1.5 2004/04/27 
17:33:59 iliaa Exp $;
+static const char rcsid[] = #(@) $Id: xml_to_xmlrpc.c,v 1.5.6.1 2007/02/21 
14:25:27 tony2001 Exp $;
 
 #ifdef _WIN32
 #include xmlrpc_win32.h
 #endif
+#include php.h
+#include main/snprintf.h
 #include string.h
 #include stdlib.h
 #include xml_to_xmlrpc.h
@@ -225,9 +227,12 @@
 simplestring_add(elem_val-text, buf);
 break;
  case xmlrpc_double:
-elem_val-name = strdup(ELEM_DOUBLE);
-snprintf(buf, BUF_SIZE, %f, XMLRPC_GetValueDouble(node));
-simplestring_add(elem_val-text, buf);
+{
+TSRMLS_FETCH();
+elem_val-name = strdup(ELEM_DOUBLE);
+ap_php_snprintf(buf, BUF_SIZE, %.*G, (int) EG(precision), 
XMLRPC_GetValueDouble(node));
+simplestring_add(elem_val-text, buf);
+}
 break;
  case xmlrpc_datetime:
 elem_val-name = strdup(ELEM_DATETIME);

http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/tests/bug40576.phpt?view=markuprev=1.1
Index: php-src/ext/xmlrpc/tests/bug40576.phpt
+++ php-src/ext/xmlrpc/tests/bug40576.phpt
--TEST--
Bug #40576 (double values are truncated to 6 decimal digits when encoding)
--INI--
precision=12
--FILE--
?php

var_dump(xmlrpc_encode(1.123456789));
var_dump(xmlrpc_encode(11234567891010));
var_dump(xmlrpc_encode(11234567));
var_dump(xmlrpc_encode());
var_dump(xmlrpc_encode(test));
var_dump(xmlrpc_encode(1.222));

echo Done\n;
?
--EXPECTF-- 
string(125) ?xml version=1.0 encoding=utf-8?
params
param
 value
  double1.123456789/double
 /value
/param
/params

string(128) ?xml version=1.0 encoding=utf-8?
params
param
 value
  double11234567891000/double
 /value
/param
/params

string(116) ?xml version=1.0 encoding=utf-8?
params
param
 value
  int11234567/int
 /value
/param
/params

string(106) ?xml version=1.0 encoding=utf-8?
params
param
 value
  string/
 /value
/param
/params

string(118) ?xml version=1.0 encoding=utf-8?
params
param
 value
  stringtest/string
 /value
/param
/params

string(139) ?xml version=1.0 encoding=utf-8?
params
param
 value
  string1.222/string
 /value
/param
/params

Done

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

[PHP-CVS] cvs: php-src /main php_streams.h /main/streams plain_wrapper.c streams.c /sapi/cli php_cli.c

2007-02-21 Thread Antony Dovgal 
tony2001Wed Feb 21 21:56:45 2007 UTC

  Modified files:  
/php-src/main   php_streams.h 
/php-src/main/streams   plain_wrapper.c streams.c 
/php-src/sapi/cli   php_cli.c 
  Log:
  implement PHP_STREAM_FLAG_NO_CLOSE and avoid hacks in plain wrapper
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/php_streams.h?r1=1.124r2=1.125diff_format=u
Index: php-src/main/php_streams.h
diff -u php-src/main/php_streams.h:1.124 php-src/main/php_streams.h:1.125
--- php-src/main/php_streams.h:1.124Wed Jan 24 21:43:47 2007
+++ php-src/main/php_streams.h  Wed Feb 21 21:56:45 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_streams.h,v 1.124 2007/01/24 21:43:47 pollita Exp $ */
+/* $Id: php_streams.h,v 1.125 2007/02/21 21:56:45 tony2001 Exp $ */
 
 #ifndef PHP_STREAMS_H
 #define PHP_STREAMS_H
@@ -186,6 +186,8 @@
  * might otherwise cause the read to block for much longer than
  * is strictly required. */
 #define PHP_STREAM_FLAG_AVOID_BLOCKING 16
+
+#define PHP_STREAM_FLAG_NO_CLOSE   32

 struct _php_stream  {
php_stream_ops *ops;
http://cvs.php.net/viewvc.cgi/php-src/main/streams/plain_wrapper.c?r1=1.80r2=1.81diff_format=u
Index: php-src/main/streams/plain_wrapper.c
diff -u php-src/main/streams/plain_wrapper.c:1.80 
php-src/main/streams/plain_wrapper.c:1.81
--- php-src/main/streams/plain_wrapper.c:1.80   Mon Jan  1 09:29:35 2007
+++ php-src/main/streams/plain_wrapper.cWed Feb 21 21:56:45 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: plain_wrapper.c,v 1.80 2007/01/01 09:29:35 sebastian Exp $ */
+/* $Id: plain_wrapper.c,v 1.81 2007/02/21 21:56:45 tony2001 Exp $ */
 
 #include php.h
 #include php_globals.h
@@ -396,16 +396,7 @@
data-file = NULL;
}
} else if (data-fd != -1) {
-#if PHP_DEBUG
-   if ((data-fd == 1 || data-fd == 2)  0 == 
strcmp(sapi_module.name, cli)) {
-   /* don't close stdout or stderr in CLI in DEBUG 
mode, as we want to see any leaks */
-   ret = 0;
-   } else {
-   ret = close(data-fd);
-   }
-#else
ret = close(data-fd);
-#endif
data-fd = -1;
} else {
return 0; /* everything should be closed already - 
success */
http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.147r2=1.148diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.147 
php-src/main/streams/streams.c:1.148
--- php-src/main/streams/streams.c:1.147Wed Jan 24 21:43:47 2007
+++ php-src/main/streams/streams.c  Wed Feb 21 21:56:45 2007
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: streams.c,v 1.147 2007/01/24 21:43:47 pollita Exp $ */
+/* $Id: streams.c,v 1.148 2007/02/21 21:56:45 tony2001 Exp $ */
 
 #define _GNU_SOURCE
 #include php.h
@@ -285,6 +285,10 @@
int preserve_handle = close_options  PHP_STREAM_FREE_PRESERVE_HANDLE ? 
1 : 0;
int release_cast = 1;
 
+   if (stream-flags  PHP_STREAM_FLAG_NO_CLOSE) {
+   preserve_handle = 1;
+   }
+
 #if STREAM_DEBUG
 fprintf(stderr, stream_free: %s:%p[%s] in_free=%d opts=%08x\n, 
stream-ops-label, stream, stream-orig_path, stream-in_free, close_options);
 #endif
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php_cli.c?r1=1.168r2=1.169diff_format=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.168 php-src/sapi/cli/php_cli.c:1.169
--- php-src/sapi/cli/php_cli.c:1.168Tue Feb 20 19:19:14 2007
+++ php-src/sapi/cli/php_cli.c  Wed Feb 21 21:56:45 2007
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_cli.c,v 1.168 2007/02/20 19:19:14 tony2001 Exp $ */
+/* $Id: php_cli.c,v 1.169 2007/02/21 21:56:45 tony2001 Exp $ */
 
 #include php.h
 #include php_globals.h
@@ -487,6 +487,12 @@
s_out = php_stream_open_wrapper_ex(php://stdout, wb, 0, NULL, 
sc_out);
s_err = php_stream_open_wrapper_ex(php://stderr, wb, 0, NULL, 
sc_err);
 
+#if PHP_DEBUG
+   /* do not close stdout and stderr */
+   s_out-flags |= PHP_STREAM_FLAG_NO_CLOSE;
+   s_err-flags |= PHP_STREAM_FLAG_NO_CLOSE;
+#endif
+
if (s_in==NULL || s_out==NULL || s_err==NULL) {
FREE_ZVAL(zin);
FREE_ZVAL(zout);

-- 
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 php_streams.h /main/streams plain_wrapper.c streams.c /sapi/cli php_cli.c

2007-02-21 Thread Antony Dovgal 
tony2001Wed Feb 21 21:57:22 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/main   php_streams.h 
/php-src/main/streams   plain_wrapper.c streams.c 
/php-src/sapi/cli   php_cli.c 
  Log:
  MFH: implement PHP_STREAM_FLAG_NO_CLOSE and avoid hacks
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/php_streams.h?r1=1.103.2.1.2.1r2=1.103.2.1.2.2diff_format=u
Index: php-src/main/php_streams.h
diff -u php-src/main/php_streams.h:1.103.2.1.2.1 
php-src/main/php_streams.h:1.103.2.1.2.2
--- php-src/main/php_streams.h:1.103.2.1.2.1Mon Jan  1 09:36:11 2007
+++ php-src/main/php_streams.h  Wed Feb 21 21:57:21 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_streams.h,v 1.103.2.1.2.1 2007/01/01 09:36:11 sebastian Exp $ */
+/* $Id: php_streams.h,v 1.103.2.1.2.2 2007/02/21 21:57:21 tony2001 Exp $ */
 
 #ifndef PHP_STREAMS_H
 #define PHP_STREAMS_H
@@ -178,6 +178,8 @@
  * might otherwise cause the read to block for much longer than
  * is strictly required. */
 #define PHP_STREAM_FLAG_AVOID_BLOCKING 16
+
+#define PHP_STREAM_FLAG_NO_CLOSE   32

 struct _php_stream  {
php_stream_ops *ops;
http://cvs.php.net/viewvc.cgi/php-src/main/streams/plain_wrapper.c?r1=1.52.2.6.2.15r2=1.52.2.6.2.16diff_format=u
Index: php-src/main/streams/plain_wrapper.c
diff -u php-src/main/streams/plain_wrapper.c:1.52.2.6.2.15 
php-src/main/streams/plain_wrapper.c:1.52.2.6.2.16
--- php-src/main/streams/plain_wrapper.c:1.52.2.6.2.15  Tue Feb 13 23:39:14 2007
+++ php-src/main/streams/plain_wrapper.cWed Feb 21 21:57:21 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: plain_wrapper.c,v 1.52.2.6.2.15 2007/02/13 23:39:14 iliaa Exp $ */
+/* $Id: plain_wrapper.c,v 1.52.2.6.2.16 2007/02/21 21:57:21 tony2001 Exp $ */
 
 #include php.h
 #include php_globals.h
@@ -392,16 +392,7 @@
data-file = NULL;
}
} else if (data-fd != -1) {
-#if PHP_DEBUG
-   if ((data-fd == 1 || data-fd == 2)  0 == 
strcmp(sapi_module.name, cli)) {
-   /* don't close stdout or stderr in CLI in DEBUG 
mode, as we want to see any leaks */
-   ret = 0;
-   } else {
-   ret = close(data-fd);
-   }
-#else
ret = close(data-fd);
-#endif
data-fd = -1;
} else {
return 0; /* everything should be closed already - 
success */
http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.82.2.6.2.10r2=1.82.2.6.2.11diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.82.2.6.2.10 
php-src/main/streams/streams.c:1.82.2.6.2.11
--- php-src/main/streams/streams.c:1.82.2.6.2.10Mon Jan 15 17:07:07 2007
+++ php-src/main/streams/streams.c  Wed Feb 21 21:57:21 2007
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: streams.c,v 1.82.2.6.2.10 2007/01/15 17:07:07 tony2001 Exp $ */
+/* $Id: streams.c,v 1.82.2.6.2.11 2007/02/21 21:57:21 tony2001 Exp $ */
 
 #define _GNU_SOURCE
 #include php.h
@@ -279,6 +279,10 @@
int preserve_handle = close_options  PHP_STREAM_FREE_PRESERVE_HANDLE ? 
1 : 0;
int release_cast = 1;
 
+   if (stream-flags  PHP_STREAM_FLAG_NO_CLOSE) {
+   preserve_handle = 1;
+   }
+
 #if STREAM_DEBUG
 fprintf(stderr, stream_free: %s:%p[%s] in_free=%d opts=%08x\n, 
stream-ops-label, stream, stream-orig_path, stream-in_free, close_options);
 #endif
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php_cli.c?r1=1.129.2.13.2.14r2=1.129.2.13.2.15diff_format=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.129.2.13.2.14 
php-src/sapi/cli/php_cli.c:1.129.2.13.2.15
--- php-src/sapi/cli/php_cli.c:1.129.2.13.2.14  Tue Feb 20 19:20:41 2007
+++ php-src/sapi/cli/php_cli.c  Wed Feb 21 21:57:21 2007
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_cli.c,v 1.129.2.13.2.14 2007/02/20 19:20:41 tony2001 Exp $ */
+/* $Id: php_cli.c,v 1.129.2.13.2.15 2007/02/21 21:57:21 tony2001 Exp $ */
 
 #include php.h
 #include php_globals.h
@@ -476,6 +476,12 @@
s_out = php_stream_open_wrapper_ex(php://stdout, wb, 0, NULL, 
sc_out);
s_err = php_stream_open_wrapper_ex(php://stderr, wb, 0, NULL, 
sc_err);
 
+#if PHP_DEBUG
+   /* do not close stdout and stderr */
+   s_out-flags |= PHP_STREAM_FLAG_NO_CLOSE;
+   s_err-flags |= PHP_STREAM_FLAG_NO_CLOSE;
+#endif
+
if (s_in==NULL || s_out==NULL || s_err==NULL) {
FREE_ZVAL(zin);
FREE_ZVAL(zout);

-- 
PHP CVS Mailing List