date:20081105

[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php

2008-11-05 Thread Scott MacVicar

scottmacThu Nov  6 03:09:41 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcrun-tests.php 
  Log:
  MFH: Support versions of valgrind from SVN. The version is shown as 3.4.0.SVN
  
  
  
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.51&r2=1.226.2.37.2.35.2.52&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.51 
php-src/run-tests.php:1.226.2.37.2.35.2.52
--- php-src/run-tests.php:1.226.2.37.2.35.2.51  Mon Nov  3 13:07:28 2008
+++ php-src/run-tests.php   Thu Nov  6 03:09:41 2008
@@ -24,7 +24,7 @@
+--+
  */
 
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.51 2008/11/03 13:07:28 felipe Exp $ 
*/
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.52 2008/11/06 03:09:41 scottmac Exp 
$ */
 
 /* Sanity check to ensure that pcre extension needed by this script is 
available.
  * In the event it is not, print a nice error message indicating that this 
script will
@@ -543,7 +543,7 @@
if (!$valgrind_header) {
error("Valgrind returned no 
version info, cannot proceed.\nPlease check if Valgrind is installed.");
} else {
-   $valgrind_version = 
preg_replace("/valgrind-([0-9])\.([0-9])\.([0-9]+)(-\w+)?(\s+)/", '$1$2$3', 
$valgrind_header, 1, $replace_count);
+   $valgrind_version = 
preg_replace("/valgrind-([0-9])\.([0-9])\.([0-9]+)([.-]\w+)?(\s+)/", '$1$2$3', 
$valgrind_header, 1, $replace_count);
if ($replace_count != 1 || 
!is_numeric($valgrind_version)) {
error("Valgrind 
returned invalid version info (\"$valgrind_header\"), cannot proceed.");
}
@@ -612,7 +612,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
-   echo '$Revision: 1.226.2.37.2.35.2.51 
$' . "\n";
+   echo '$Revision: 1.226.2.37.2.35.2.52 
$' . "\n";
exit(1);
 
default:



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

[PHP-CVS] cvs: php-src / run-tests.php

2008-11-05 Thread Scott MacVicar

scottmacThu Nov  6 03:08:58 2008 UTC

  Modified files:  
/php-srcrun-tests.php 
  Log:
  Support versions of valgrind from SVN. The version is shown as 3.4.0.SVN
  
  
  
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.380&r2=1.381&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.380 php-src/run-tests.php:1.381
--- php-src/run-tests.php:1.380 Sun Oct 19 18:04:35 2008
+++ php-src/run-tests.php   Thu Nov  6 03:08:58 2008
@@ -24,7 +24,7 @@
+--+
  */
 
-/* $Id: run-tests.php,v 1.380 2008/10/19 18:04:35 johannes Exp $ */
+/* $Id: run-tests.php,v 1.381 2008/11/06 03:08:58 scottmac Exp $ */
 
 /* Sanity check to ensure that pcre extension needed by this script is 
available.
  * In the event it is not, print a nice error message indicating that this 
script will
@@ -543,7 +543,7 @@
if (!$valgrind_header) {
error("Valgrind returned no 
version info, cannot proceed.\nPlease check if Valgrind is installed.");
} else {
-   $valgrind_version = 
preg_replace("/valgrind-([0-9])\.([0-9])\.([0-9]+)(-\w+)?(\s+)/", '$1$2$3', 
$valgrind_header, 1, $replace_count);
+   $valgrind_version = 
preg_replace("/valgrind-([0-9])\.([0-9])\.([0-9]+)([.-]\w+)?(\s+)/", '$1$2$3', 
$valgrind_header, 1, $replace_count);
if ($replace_count != 1 || 
!is_numeric($valgrind_version)) {
error("Valgrind 
returned invalid version info (\"$valgrind_header\"), cannot proceed.");
}
@@ -612,7 +612,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
-   echo '$Revision: 1.380 $' . "\n";
+   echo '$Revision: 1.381 $' . "\n";
exit(1);
 
default:



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/fileinfo/libmagic funcs.c softmagic.c

2008-11-05 Thread Scott MacVicar

scottmacThu Nov  6 03:00:04 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/fileinfo/libmagic  funcs.c softmagic.c 
  Log:
  MFH: Fix buffer overread in libmagic and sync a skipped change from 4.26
  
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/funcs.c?r1=1.3.2.5&r2=1.3.2.6&diff_format=u
Index: php-src/ext/fileinfo/libmagic/funcs.c
diff -u php-src/ext/fileinfo/libmagic/funcs.c:1.3.2.5 
php-src/ext/fileinfo/libmagic/funcs.c:1.3.2.6
--- php-src/ext/fileinfo/libmagic/funcs.c:1.3.2.5   Mon Sep  1 18:56:06 2008
+++ php-src/ext/fileinfo/libmagic/funcs.c   Thu Nov  6 03:00:04 2008
@@ -151,6 +151,7 @@
 {
int m;
int mime = ms->flags & MAGIC_MIME;
+   const unsigned char *ubuf = buf;
 
if (nb == 0) {
if ((!mime || (mime & MAGIC_MIME_TYPE)) &&
@@ -182,15 +183,15 @@
 #if PHP_FILEINFO_UNCOMPRESS
/* try compression stuff */
if ((ms->flags & MAGIC_NO_CHECK_COMPRESS) != 0 ||
-   (m = file_zmagic(ms, stream, inname, buf, nb)) == 0) 
+   (m = file_zmagic(ms, stream, inname, ubuf, nb)) == 0) 
 #endif
{
/* Check if we have a tar file */
-   if ((ms->flags & MAGIC_NO_CHECK_TAR) != 0 || (m = 
file_is_tar(ms, buf, nb)) == 0) {
+   if ((ms->flags & MAGIC_NO_CHECK_TAR) != 0 || (m = 
file_is_tar(ms, ubuf, nb)) == 0) {
/* try tests in /etc/magic (or surrogate magic file) */
-   if ((ms->flags & MAGIC_NO_CHECK_SOFT) != 0 || (m = 
file_softmagic(ms, buf, nb, BINTEST)) == 0) {
+   if ((ms->flags & MAGIC_NO_CHECK_SOFT) != 0 || (m = 
file_softmagic(ms, ubuf, nb, BINTEST)) == 0) {
/* try known keywords, check whether it is 
ASCII */
-   if ((ms->flags & MAGIC_NO_CHECK_ASCII) != 0 || 
(m = file_ascmagic(ms, buf, nb)) == 0) {
+   if ((ms->flags & MAGIC_NO_CHECK_ASCII) != 0 || 
(m = file_ascmagic(ms, ubuf, nb)) == 0) {
/* abandon hope, all ye who remain here 
*/
if ((!mime || (mime & MAGIC_MIME_TYPE)) 
&& file_printf(ms, mime ? "application/octet-stream" : "data") == -1) {
return -1;
@@ -211,7 +212,7 @@
 * information from the ELF headers that cannot easily
 * be extracted with rules in the magic file.
 */
-   (void)file_tryelf(ms, stream, buf, nb);
+   (void)file_tryelf(ms, stream, ubuf, nb);
}
 #endif
return m;
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/softmagic.c?r1=1.1.2.7&r2=1.1.2.8&diff_format=u
Index: php-src/ext/fileinfo/libmagic/softmagic.c
diff -u php-src/ext/fileinfo/libmagic/softmagic.c:1.1.2.7 
php-src/ext/fileinfo/libmagic/softmagic.c:1.1.2.8
--- php-src/ext/fileinfo/libmagic/softmagic.c:1.1.2.7   Sun Nov  2 16:13:49 2008
+++ php-src/ext/fileinfo/libmagic/softmagic.c   Thu Nov  6 03:00:04 2008
@@ -185,8 +185,8 @@
if (file_check_mem(ms, ++cont_level) == -1)
return -1;
 
-   while (magic[magindex+1].cont_level != 0 &&
-   ++magindex < nmagic) {
+   while (magindex < nmagic - 1 && magic[magindex + 1].cont_level 
!= 0) {
+   magindex++;
m = &magic[magindex];
ms->line = m->lineno; /* for messages */
 
@@ -783,6 +783,7 @@
const char *c;
const char *last;   /* end of search region */
const char *buf;/* start of search region */
+   const char *end;
size_t lines;
 
if (s == NULL) {
@@ -791,10 +792,10 @@
return 0;
}
buf = (const char *)s + offset;
-   last = (const char *)s + nbytes;
+   end = last = (const char *)s + nbytes;
/* mget() guarantees buf <= last */
for (lines = linecnt, b = buf;
-lines && ((b = strchr(c = b, '\n')) || (b = 
strchr(c, '\r')));
+lines && ((b = memchr(c = b, '\n', end - b)) || (b 
= memchr(c, '\r', end - c)));
 lines--, b++) {
last = b;
if (b[0] == '\r' && b[1] == '\n')



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

[PHP-CVS] cvs: php-src /ext/fileinfo/libmagic funcs.c softmagic.c

2008-11-05 Thread Scott MacVicar

scottmacThu Nov  6 02:58:15 2008 UTC

  Modified files:  
/php-src/ext/fileinfo/libmagic  funcs.c softmagic.c 
  Log:
  Fix buffer overread in libmagic and sync a skipped change from 4.26
  
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/funcs.c?r1=1.8&r2=1.9&diff_format=u
Index: php-src/ext/fileinfo/libmagic/funcs.c
diff -u php-src/ext/fileinfo/libmagic/funcs.c:1.8 
php-src/ext/fileinfo/libmagic/funcs.c:1.9
--- php-src/ext/fileinfo/libmagic/funcs.c:1.8   Sun Sep  7 20:29:54 2008
+++ php-src/ext/fileinfo/libmagic/funcs.c   Thu Nov  6 02:58:14 2008
@@ -151,6 +151,7 @@
 {
int m;
int mime = ms->flags & MAGIC_MIME;
+   const unsigned char *ubuf = buf;
 
if (nb == 0) {
if ((!mime || (mime & MAGIC_MIME_TYPE)) &&
@@ -182,15 +183,15 @@
 #if PHP_FILEINFO_UNCOMPRESS
/* try compression stuff */
if ((ms->flags & MAGIC_NO_CHECK_COMPRESS) != 0 ||
-   (m = file_zmagic(ms, stream, inname, buf, nb)) == 0) 
+   (m = file_zmagic(ms, stream, inname, ubuf, nb)) == 0) 
 #endif
{
/* Check if we have a tar file */
-   if ((ms->flags & MAGIC_NO_CHECK_TAR) != 0 || (m = 
file_is_tar(ms, buf, nb)) == 0) {
+   if ((ms->flags & MAGIC_NO_CHECK_TAR) != 0 || (m = 
file_is_tar(ms, ubuf, nb)) == 0) {
/* try tests in /etc/magic (or surrogate magic file) */
-   if ((ms->flags & MAGIC_NO_CHECK_SOFT) != 0 || (m = 
file_softmagic(ms, buf, nb, BINTEST)) == 0) {
+   if ((ms->flags & MAGIC_NO_CHECK_SOFT) != 0 || (m = 
file_softmagic(ms, ubuf, nb, BINTEST)) == 0) {
/* try known keywords, check whether it is 
ASCII */
-   if ((ms->flags & MAGIC_NO_CHECK_ASCII) != 0 || 
(m = file_ascmagic(ms, buf, nb)) == 0) {
+   if ((ms->flags & MAGIC_NO_CHECK_ASCII) != 0 || 
(m = file_ascmagic(ms, ubuf, nb)) == 0) {
/* abandon hope, all ye who remain here 
*/
if ((!mime || (mime & MAGIC_MIME_TYPE)) 
&& file_printf(ms, mime ? "application/octet-stream" : "data") == -1) {
return -1;
@@ -210,7 +211,7 @@
 * information from the ELF headers that cannot easily
 * be extracted with rules in the magic file.
 */
-   (void)file_tryelf(ms, stream, buf, nb);
+   (void)file_tryelf(ms, stream, ubuf, nb);
}
 #endif
return m;
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/softmagic.c?r1=1.8&r2=1.9&diff_format=u
Index: php-src/ext/fileinfo/libmagic/softmagic.c
diff -u php-src/ext/fileinfo/libmagic/softmagic.c:1.8 
php-src/ext/fileinfo/libmagic/softmagic.c:1.9
--- php-src/ext/fileinfo/libmagic/softmagic.c:1.8   Sun Nov  2 16:09:27 2008
+++ php-src/ext/fileinfo/libmagic/softmagic.c   Thu Nov  6 02:58:14 2008
@@ -185,8 +185,8 @@
if (file_check_mem(ms, ++cont_level) == -1)
return -1;
 
-   while (magic[magindex+1].cont_level != 0 &&
-   ++magindex < nmagic) {
+   while (magindex < nmagic - 1 && magic[magindex + 1].cont_level 
!= 0) {
+   magindex++;
m = &magic[magindex];
ms->line = m->lineno; /* for messages */
 
@@ -783,6 +783,7 @@
const char *c;
const char *last;   /* end of search region */
const char *buf;/* start of search region */
+   const char *end;
size_t lines;
 
if (s == NULL) {
@@ -791,10 +792,10 @@
return 0;
}
buf = (const char *)s + offset;
-   last = (const char *)s + nbytes;
+   end = last = (const char *)s + nbytes;
/* mget() guarantees buf <= last */
for (lines = linecnt, b = buf;
-lines && ((b = strchr(c = b, '\n')) || (b = 
strchr(c, '\r')));
+lines && ((b = memchr(c = b, '\n', end - b)) || (b 
= memchr(c, '\r', end - c)));
 lines--, b++) {
last = b;
if (b[0] == '\r' && b[1] == '\n')



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

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

2008-11-05 Thread Felipe Pena

felipe  Thu Nov  6 01:38:57 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcNEWS 
  Log:
  - Reorder
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.365&r2=1.2027.2.547.2.965.2.366&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.365 
php-src/NEWS:1.2027.2.547.2.965.2.366
--- php-src/NEWS:1.2027.2.547.2.965.2.365   Thu Nov  6 01:09:32 2008
+++ php-src/NEWSThu Nov  6 01:38:56 2008
@@ -24,6 +24,7 @@
 - Fixed invalid calls to free when internal fileinfo magic file is used. 
(Scott)
 - Synced changes from libmagic 4.26 to bundled libmagic. (Scott)
 
+- Fixed bug #46421 (SplFileInfo not correctly handling /). (Etienne)
 - Fixed bug #46331 - (Segfault when using internal fileinfo magic file on big
   endian systems). (Scott)
 - Fixed bug #46285 (lastInsertId() returns "0" when a deferenced PDOStatement 
is
@@ -54,6 +55,7 @@
 - Fixed bug #46060 (Phar::addEmptyDir() breaks) (Greg)
 - Fixed bug #46042 (memory leaks with reflection of mb_convert_encoding()).
   (Ilia)
+- Fixed bug #45976 (Moved SXE from SPL to SimpleXML). (Etienne)
 - Fixed bug #45928 (large scripts from stdin are stripped at 16K border).
   (Christian Schneider, Arnaud)
 - Fixed bug #45911 (Cannot disable ext/hash). (Arnaud)
@@ -64,8 +66,6 @@
 - Fixed bug #44575 (parse_ini_file comment # line problems). (Arnaud)
 - Fixed bug #44135 (PDO MySQL does not support CLIENT_FOUND_ROWS). (Johannes,
   chx1975 at gmail dot com)
-- Fixed bug #45976 (Moved SXE from SPL to SimpleXML). (Etienne)
-- Fixed bug #46421 (SplFileInfo not correctly handling /). (Etienne)
 
 
 02 Sep 2008, PHP 5.3.0 Alpha 2



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

2008-11-05 Thread Felipe Pena

felipe  Thu Nov  6 01:36:41 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  BFN #45166
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1303&r2=1.2027.2.547.2.1304&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1303 php-src/NEWS:1.2027.2.547.2.1304
--- php-src/NEWS:1.2027.2.547.2.1303Tue Nov  4 21:07:44 2008
+++ php-src/NEWSThu Nov  6 01:36:40 2008
@@ -26,6 +26,7 @@
   different). (Derick)
 - Fixed bug #45303 (Opening php:// wrapper in append mode results in a 
warning).
   (Arnaud)
+- Fixed bug #45166 (substr() overflow changes). (Felipe)
 - Fixed bug #44938 (gettext functions crash with overly long domain).
   (Christian Schneider, Ilia)
 - Fixed bug #44607 (stream_get_line unable to correctly identify the "ending"



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

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

2008-11-05 Thread Etienne Kneuss

colder  Thu Nov  6 01:09:32 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcNEWS 
  Log:
  Add references to #46421 #45976
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.364&r2=1.2027.2.547.2.965.2.365&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.364 
php-src/NEWS:1.2027.2.547.2.965.2.365
--- php-src/NEWS:1.2027.2.547.2.965.2.364   Wed Nov  5 21:35:01 2008
+++ php-src/NEWSThu Nov  6 01:09:32 2008
@@ -64,6 +64,8 @@
 - Fixed bug #44575 (parse_ini_file comment # line problems). (Arnaud)
 - Fixed bug #44135 (PDO MySQL does not support CLIENT_FOUND_ROWS). (Johannes,
   chx1975 at gmail dot com)
+- Fixed bug #45976 (Moved SXE from SPL to SimpleXML). (Etienne)
+- Fixed bug #46421 (SplFileInfo not correctly handling /). (Etienne)
 
 
 02 Sep 2008, PHP 5.3.0 Alpha 2



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/spl spl_directory.c

2008-11-05 Thread Etienne Kneuss

colder  Thu Nov  6 01:07:22 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/splspl_directory.c 
  Log:
  MFH: Fix #46421 (Take care about /)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_directory.c?r1=1.45.2.27.2.23.2.34&r2=1.45.2.27.2.23.2.35&diff_format=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.45.2.27.2.23.2.34 
php-src/ext/spl/spl_directory.c:1.45.2.27.2.23.2.35
--- php-src/ext/spl/spl_directory.c:1.45.2.27.2.23.2.34 Sun Nov  2 21:19:36 2008
+++ php-src/ext/spl/spl_directory.c Thu Nov  6 01:07:22 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: spl_directory.c,v 1.45.2.27.2.23.2.34 2008/11/02 21:19:36 felipe Exp $ 
*/
+/* $Id: spl_directory.c,v 1.45.2.27.2.23.2.35 2008/11/06 01:07:22 colder Exp $ 
*/
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -221,7 +221,7 @@
intern->_path_len = strlen(path);
intern->u.dir.dirp = php_stream_opendir(path, 
ENFORCE_SAFE_MODE|REPORT_ERRORS, NULL);
 
-   if (intern->_path_len && IS_SLASH_AT(path, intern->_path_len-1)) {
+   if (intern->_path_len > 1 && IS_SLASH_AT(path, intern->_path_len-1)) {
intern->_path = estrndup(path, --intern->_path_len);
} else {
intern->_path = estrndup(path, intern->_path_len);
@@ -258,7 +258,7 @@
zend_list_addref(Z_RESVAL_P(intern->u.file.zcontext));
}
 
-   if (intern->file_name_len && IS_SLASH_AT(intern->file_name, 
intern->file_name_len-1)) {
+   if (intern->file_name_len > 1 && IS_SLASH_AT(intern->file_name, 
intern->file_name_len-1)) {
intern->file_name_len--;
}
 
@@ -349,7 +349,7 @@
intern->file_name = use_copy ? estrndup(path, len) : path;
intern->file_name_len = len;
 
-   while(IS_SLASH_AT(intern->file_name, intern->file_name_len-1)) {
+   while(IS_SLASH_AT(intern->file_name, intern->file_name_len-1) && 
intern->file_name_len > 1) {
intern->file_name[intern->file_name_len-1] = 0;
intern->file_name_len--;
}
@@ -1965,7 +1965,7 @@
if (spl_filesystem_file_open(intern, use_include_path, 0 TSRMLS_CC) == 
SUCCESS) {
tmp_path_len = strlen(intern->u.file.stream->orig_path);
 
-   if (tmp_path_len && 
IS_SLASH_AT(intern->u.file.stream->orig_path, tmp_path_len-1)) {
+   if (tmp_path_len > 1 && 
IS_SLASH_AT(intern->u.file.stream->orig_path, tmp_path_len-1)) {
tmp_path_len--;
}
 



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

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

2008-11-05 Thread Etienne Kneuss

colder  Thu Nov  6 01:07:05 2008 UTC

  Modified files:  
/php-src/ext/splspl_directory.c 
  Log:
  Fix #46421 (Take care about /)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_directory.c?r1=1.171&r2=1.172&diff_format=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.171 
php-src/ext/spl/spl_directory.c:1.172
--- php-src/ext/spl/spl_directory.c:1.171   Sun Nov  2 21:10:11 2008
+++ php-src/ext/spl/spl_directory.c Thu Nov  6 01:07:05 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: spl_directory.c,v 1.171 2008/11/02 21:10:11 felipe Exp $ */
+/* $Id: spl_directory.c,v 1.172 2008/11/06 01:07:05 colder Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -241,7 +241,7 @@
intern->_path_len = path_len;
intern->u.dir.dirp = php_stream_u_opendir(type, path, path_len, 
options, NULL);
 
-   if (intern->_path_len && IS_SLASH_AT(type, path, intern->_path_len-1)) {
+   if (intern->_path_len > 1 && IS_SLASH_AT(type, path, 
intern->_path_len-1)) {
intern->_path = ezstrndup(type, path, --intern->_path_len);
} else {
intern->_path = ezstrndup(type, path, intern->_path_len);
@@ -278,7 +278,7 @@
zend_list_addref(Z_RESVAL_P(intern->u.file.zcontext));
}
 
-   if (intern->file_name_len && IS_SLASH_AT(intern->file_name_type, 
intern->file_name, intern->file_name_len-1)) {
+   if (intern->file_name_len > 1 && IS_SLASH_AT(intern->file_name_type, 
intern->file_name, intern->file_name_len-1)) {
intern->file_name_len--;
}
 
@@ -396,7 +396,7 @@

if (type == IS_UNICODE) {
slash_pos.u = (p1.u > p2.u ? p1.u : p2.u);
-   if (IS_SLASH_AT(type, intern->file_name, 
intern->file_name_len-1)) {
+   if (IS_SLASH_AT(type, intern->file_name, 
intern->file_name_len-1) && intern->file_name_len > 1) {
intern->file_name_len = slash_pos.u - 
intern->file_name.u;

intern->file_name.u[intern->file_name_len] = 0;
continue;
@@ -404,7 +404,7 @@
intern->_path_len = slash_pos.u - 
intern->file_name.u;
} else {
slash_pos.s = (p1.s > p2.s ? p1.s : p2.s);
-   if (IS_SLASH_AT(type, intern->file_name, 
intern->file_name_len-1)) {
+   if (IS_SLASH_AT(type, intern->file_name, 
intern->file_name_len-1) && intern->file_name_len > 1) {
intern->file_name_len = slash_pos.s - 
intern->file_name.s;

intern->file_name.s[intern->file_name_len] = 0;
continue;
@@ -2113,7 +2113,7 @@
if (spl_filesystem_file_open(intern, use_include_path, 0 TSRMLS_CC) == 
SUCCESS) {
tmp_path_len  = strlen(intern->u.file.stream->orig_path);
 
-   if (tmp_path_len && IS_SLASH_AT(IS_STRING, 
ZSTR(intern->u.file.stream->orig_path), tmp_path_len-1)) {
+   if (tmp_path_len > 1 && IS_SLASH_AT(IS_STRING, 
ZSTR(intern->u.file.stream->orig_path), tmp_path_len-1)) {
tmp_path_len--;
}
 



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/simplexml config.m4 config.w32 simplexml.c sxe.c sxe.h /ext/simplexml/tests bug42259.phpt sxe_001.phpt sxe_002.phpt sxe_003.phpt sxe_004.phpt sxe_005.phpt /ext/s

2008-11-05 Thread Etienne Kneuss

colder  Thu Nov  6 00:37:13 2008 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/simplexml  sxe.c sxe.h 
/php-src/ext/simplexml/testsbug42259.phpt sxe_001.phpt 
sxe_002.phpt sxe_003.phpt sxe_004.phpt 
sxe_005.phpt 

  Removed files:   
/php-src/ext/splspl_sxe.c spl_sxe.h 
/php-src/ext/spl/tests  bug42259.phpt sxe_001.phpt sxe_002.phpt 
sxe_003.phpt sxe_004.phpt sxe_005.phpt 

  Modified files:  
/php-src/ext/splconfig.m4 config.w32 package.xml php_spl.c 
/php-src/ext/simplexml  config.m4 config.w32 simplexml.c 
  Log:
  MFH: Fix #45976 (Move SXE from SPL to SimpleXML)
  http://cvs.php.net/viewvc.cgi/php-src/ext/spl/config.m4?r1=1.13.2.4.2.3.2.5&r2=1.13.2.4.2.3.2.6&diff_format=u
Index: php-src/ext/spl/config.m4
diff -u php-src/ext/spl/config.m4:1.13.2.4.2.3.2.5 
php-src/ext/spl/config.m4:1.13.2.4.2.3.2.6
--- php-src/ext/spl/config.m4:1.13.2.4.2.3.2.5  Wed Jun 18 14:54:39 2008
+++ php-src/ext/spl/config.m4   Thu Nov  6 00:37:12 2008
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.13.2.4.2.3.2.5 2008/06/18 14:54:39 colder Exp $
+dnl $Id: config.m4,v 1.13.2.4.2.3.2.6 2008/11/06 00:37:12 colder Exp $
 dnl config.m4 for extension SPL
 
   AC_MSG_CHECKING(whether zend_object_value is packed)
@@ -22,6 +22,6 @@
   CPPFLAGS=$old_CPPFLAGS
   AC_DEFINE_UNQUOTED(HAVE_PACKED_OBJECT_VALUE, $ac_result, [Whether struct 
_zend_object_value is packed])
   AC_DEFINE(HAVE_SPL, 1, [Whether you want SPL (Standard PHP Library) 
support]) 
-  PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c 
spl_iterators.c spl_array.c spl_directory.c spl_sxe.c spl_exceptions.c 
spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c, no)
-  PHP_INSTALL_HEADERS([ext/spl], [php_spl.h spl_array.h spl_directory.h 
spl_engine.h spl_exceptions.h spl_functions.h spl_iterators.h spl_observer.h 
spl_sxe.h spl_dllist.h spl_heap.h spl_fixedarray.h])
+  PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c 
spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c 
spl_dllist.c spl_heap.c spl_fixedarray.c, no)
+  PHP_INSTALL_HEADERS([ext/spl], [php_spl.h spl_array.h spl_directory.h 
spl_engine.h spl_exceptions.h spl_functions.h spl_iterators.h spl_observer.h 
spl_dllist.h spl_heap.h spl_fixedarray.h])
   PHP_ADD_EXTENSION_DEP(spl, pcre, true)
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/config.w32?r1=1.7.6.6&r2=1.7.6.7&diff_format=u
Index: php-src/ext/spl/config.w32
diff -u php-src/ext/spl/config.w32:1.7.6.6 php-src/ext/spl/config.w32:1.7.6.7
--- php-src/ext/spl/config.w32:1.7.6.6  Mon Jun 23 10:22:42 2008
+++ php-src/ext/spl/config.w32  Thu Nov  6 00:37:12 2008
@@ -1,6 +1,6 @@
-// $Id: config.w32,v 1.7.6.6 2008/06/23 10:22:42 pajoye Exp $
+// $Id: config.w32,v 1.7.6.7 2008/11/06 00:37:12 colder Exp $
 // vim:ft=javascript
 
-EXTENSION("spl", "php_spl.c spl_functions.c spl_engine.c spl_iterators.c 
spl_array.c spl_directory.c spl_sxe.c spl_exceptions.c spl_observer.c 
spl_dllist.c spl_heap.c spl_fixedarray.c", false /*never shared */);
+EXTENSION("spl", "php_spl.c spl_functions.c spl_engine.c spl_iterators.c 
spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c 
spl_heap.c spl_fixedarray.c", false /*never shared */);
 AC_DEFINE('HAVE_SPL', 1);
 PHP_SPL="yes";
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/package.xml?r1=1.3&r2=1.3.8.1&diff_format=u
Index: php-src/ext/spl/package.xml
diff -u php-src/ext/spl/package.xml:1.3 php-src/ext/spl/package.xml:1.3.8.1
--- php-src/ext/spl/package.xml:1.3 Mon Jan 19 08:32:58 2004
+++ php-src/ext/spl/package.xml Thu Nov  6 00:37:12 2008
@@ -34,8 +34,6 @@



-   
-   



http://cvs.php.net/viewvc.cgi/php-src/ext/spl/php_spl.c?r1=1.52.2.28.2.17.2.28&r2=1.52.2.28.2.17.2.29&diff_format=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.52.2.28.2.17.2.28 
php-src/ext/spl/php_spl.c:1.52.2.28.2.17.2.29
--- php-src/ext/spl/php_spl.c:1.52.2.28.2.17.2.28   Sun Nov  2 21:19:36 2008
+++ php-src/ext/spl/php_spl.c   Thu Nov  6 00:37:12 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_spl.c,v 1.52.2.28.2.17.2.28 2008/11/02 21:19:36 felipe Exp $ */
+/* $Id: php_spl.c,v 1.52.2.28.2.17.2.29 2008/11/06 00:37:12 colder Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -32,7 +32,6 @@
 #include "spl_array.h"
 #include "spl_directory.h"
 #include "spl_iterators.h"
-#include "spl_sxe.h"
 #include "spl_exceptions.h"
 #include "spl_observer.h"
 #include "spl_dllist.h"
@@ -191,7 +190,6 @@
SPL_ADD_CLASS(RegexIterator, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(RuntimeException, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(SeekableIterator, z_list, sub, allow, ce_flags); \
-   SPL_ADD_CLASS(SimpleXMLIterator, z_list, sub, allow,

[PHP-CVS] cvs: php-src /ext/simplexml config.m4 config.w32 simplexml.c sxe.c sxe.h /ext/simplexml/tests bug42259.phpt sxe_001.phpt sxe_002.phpt sxe_003.phpt sxe_004.phpt sxe_005.phpt /ext/spl config

2008-11-05 Thread Etienne Kneuss

colder  Thu Nov  6 00:36:29 2008 UTC

  Added files: 
/php-src/ext/simplexml  sxe.c sxe.h 
/php-src/ext/simplexml/testsbug42259.phpt sxe_001.phpt 
sxe_002.phpt sxe_003.phpt sxe_004.phpt 
sxe_005.phpt 

  Removed files:   
/php-src/ext/splspl_sxe.c spl_sxe.h 
/php-src/ext/spl/tests  bug42259.phpt sxe_001.phpt sxe_002.phpt 
sxe_003.phpt sxe_004.phpt sxe_005.phpt 

  Modified files:  
/php-src/ext/splconfig.m4 config.w32 package.xml php_spl.c 
/php-src/ext/simplexml  config.m4 config.w32 simplexml.c 
  Log:
  Fix #45976 (Move SXE from SPL to SimpleXML)
  http://cvs.php.net/viewvc.cgi/php-src/ext/spl/config.m4?r1=1.27&r2=1.28&diff_format=u
Index: php-src/ext/spl/config.m4
diff -u php-src/ext/spl/config.m4:1.27 php-src/ext/spl/config.m4:1.28
--- php-src/ext/spl/config.m4:1.27  Wed Jun 18 14:54:27 2008
+++ php-src/ext/spl/config.m4   Thu Nov  6 00:36:28 2008
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.27 2008/06/18 14:54:27 colder Exp $
+dnl $Id: config.m4,v 1.28 2008/11/06 00:36:28 colder Exp $
 dnl config.m4 for extension SPL
 
   AC_MSG_CHECKING(whether zend_object_value is packed)
@@ -25,6 +25,6 @@
   PHP_INSTALL_HEADERS([ext/spl/])
   AC_DEFINE_UNQUOTED(HAVE_PACKED_OBJECT_VALUE, $ac_result, [Whether struct 
_zend_object_value is packed])
   AC_DEFINE(HAVE_SPL, 1, [Whether you want SPL (Standard PHP Library) 
support]) 
-  PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c 
spl_iterators.c spl_array.c spl_directory.c spl_sxe.c spl_exceptions.c 
spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c, no)
-  PHP_INSTALL_HEADERS([ext/spl], [php_spl.h spl_array.h spl_directory.h 
spl_engine.h spl_exceptions.h spl_functions.h spl_iterators.h spl_observer.h 
spl_sxe.h spl_dllist.h spl_heap.h spl_fixedarray.h])
+  PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c 
spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c 
spl_dllist.c spl_heap.c spl_fixedarray.c, no)
+  PHP_INSTALL_HEADERS([ext/spl], [php_spl.h spl_array.h spl_directory.h 
spl_engine.h spl_exceptions.h spl_functions.h spl_iterators.h spl_observer.h 
spl_dllist.h spl_heap.h spl_fixedarray.h])
   PHP_ADD_EXTENSION_DEP(spl, pcre, true)
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/config.w32?r1=1.13&r2=1.14&diff_format=u
Index: php-src/ext/spl/config.w32
diff -u php-src/ext/spl/config.w32:1.13 php-src/ext/spl/config.w32:1.14
--- php-src/ext/spl/config.w32:1.13 Mon Jul 21 16:07:34 2008
+++ php-src/ext/spl/config.w32  Thu Nov  6 00:36:28 2008
@@ -1,6 +1,6 @@
-// $Id: config.w32,v 1.13 2008/07/21 16:07:34 rrichards Exp $
+// $Id: config.w32,v 1.14 2008/11/06 00:36:28 colder Exp $
 // vim:ft=javascript
 
-EXTENSION("spl", "php_spl.c spl_functions.c spl_engine.c spl_iterators.c 
spl_array.c spl_directory.c spl_sxe.c spl_exceptions.c spl_observer.c 
spl_dllist.c spl_heap.c spl_fixedarray.c", false /* never shared */);
+EXTENSION("spl", "php_spl.c spl_functions.c spl_engine.c spl_iterators.c 
spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c 
spl_heap.c spl_fixedarray.c", false /* never shared */);
 AC_DEFINE('HAVE_SPL', 1);
 PHP_SPL="yes";
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/package.xml?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/spl/package.xml
diff -u php-src/ext/spl/package.xml:1.3 php-src/ext/spl/package.xml:1.4
--- php-src/ext/spl/package.xml:1.3 Mon Jan 19 08:32:58 2004
+++ php-src/ext/spl/package.xml Thu Nov  6 00:36:28 2008
@@ -34,8 +34,6 @@



-   
-   



http://cvs.php.net/viewvc.cgi/php-src/ext/spl/php_spl.c?r1=1.143&r2=1.144&diff_format=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.143 php-src/ext/spl/php_spl.c:1.144
--- php-src/ext/spl/php_spl.c:1.143 Sun Nov  2 21:10:11 2008
+++ php-src/ext/spl/php_spl.c   Thu Nov  6 00:36:28 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_spl.c,v 1.143 2008/11/02 21:10:11 felipe Exp $ */
+/* $Id: php_spl.c,v 1.144 2008/11/06 00:36:28 colder Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -32,7 +32,6 @@
 #include "spl_array.h"
 #include "spl_directory.h"
 #include "spl_iterators.h"
-#include "spl_sxe.h"
 #include "spl_exceptions.h"
 #include "spl_observer.h"
 #include "spl_dllist.h"
@@ -185,7 +184,6 @@
SPL_ADD_CLASS(RegexIterator, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(RuntimeException, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(SeekableIterator, z_list, sub, allow, ce_flags); \
-   SPL_ADD_CLASS(SimpleXMLIterator, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(SplDoublyLinkedList, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(SplFileInfo, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(SplFileObject, z_list, sub, allow, c

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pdo pdo_stmt.c /ext/pdo_sqlite/tests debugdumpparams_001.phpt

2008-11-05 Thread Felipe Pena

felipe  Wed Nov  5 23:42:05 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/pdopdo_stmt.c 
/php-src/ext/pdo_sqlite/tests   debugdumpparams_001.phpt 
  Log:
  MFH:
  - Fixed wrong check
  - Improved test
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.38.2.44&r2=1.118.2.38.2.45&diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.44 
php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.45
--- php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.44  Mon Nov  3 23:45:17 2008
+++ php-src/ext/pdo/pdo_stmt.c  Wed Nov  5 23:42:05 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: pdo_stmt.c,v 1.118.2.38.2.44 2008/11/03 23:45:17 felipe Exp $ */
+/* $Id: pdo_stmt.c,v 1.118.2.38.2.45 2008/11/05 23:42:05 felipe Exp $ */
 
 /* The PDO Statement Handle Class */
 
@@ -2178,14 +2178,14 @@
uint len;
ulong num;
 
-   if (zend_hash_get_current_key_ex(stmt->bound_params, 
&str, &len, &num, 0, &pos) == HASH_KEY_IS_STRING) {
-   php_stream_printf(out TSRMLS_CC, "Key: Position 
#%d:\n", num);
+   if (zend_hash_get_current_key_ex(stmt->bound_params, 
&str, &len, &num, 0, &pos) == HASH_KEY_IS_LONG) {
+   php_stream_printf(out TSRMLS_CC, "Key: Position 
#%ld:\n", num);
} else {
php_stream_printf(out TSRMLS_CC, "Key: Name: 
[%d] %.*s\n", len, len, str);
}
 
-   php_stream_printf(out TSRMLS_CC, "paramno=%d\nname=[%d] 
%.*s\nis_param=%d\nparam_type=%d\n",
-   param->paramno, param->namelen, param->namelen, 
param->name,
+   php_stream_printf(out TSRMLS_CC, "paramno=%d\nname=[%d] 
\"%.*s\"\nis_param=%d\nparam_type=%d\n",
+   param->paramno, param->namelen, param->namelen, 
param->name ? param->name : "",
param->is_param,
param->param_type);

http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/tests/debugdumpparams_001.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/ext/pdo_sqlite/tests/debugdumpparams_001.phpt
diff -u php-src/ext/pdo_sqlite/tests/debugdumpparams_001.phpt:1.1.4.2 
php-src/ext/pdo_sqlite/tests/debugdumpparams_001.phpt:1.1.4.3
--- php-src/ext/pdo_sqlite/tests/debugdumpparams_001.phpt:1.1.4.2   Mon Nov 
 3 20:55:01 2008
+++ php-src/ext/pdo_sqlite/tests/debugdumpparams_001.phpt   Wed Nov  5 
23:42:05 2008
@@ -9,23 +9,29 @@
 
 $db = new pdo('sqlite:memory');
 
-$x= $db->prepare('select :a, :b');
+$x= $db->prepare('select :a, :b, ?');
 $x->bindValue(':a', 1, PDO::PARAM_INT);
 $x->bindValue(':b', 'foo');
+$x->bindValue(3, 1313);
 var_dump($x->debugDumpParams());
 
 ?>
 --EXPECT--
-SQL: [13] select :a, :b
-Params:  2
-Key: Position #0:
+SQL: [16] select :a, :b, ?
+Params:  3
+Key: Name: [2] :a
 paramno=-1
-name=[2] :a
+name=[2] ":a"
 is_param=1
 param_type=1
-Key: Position #0:
+Key: Name: [2] :b
 paramno=-1
-name=[2] :b
+name=[2] ":b"
+is_param=1
+param_type=2
+Key: Position #2:
+paramno=2
+name=[0] ""
 is_param=1
 param_type=2
 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_3) /ext/pdo pdo_stmt.c /ext/pdo_sqlite/tests debugdumpparams_001.phpt

2008-11-05 Thread Felipe Pena

felipe  Wed Nov  5 23:40:38 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/pdopdo_stmt.c 
/php-src/ext/pdo_sqlite/tests   debugdumpparams_001.phpt 
  Log:
  MFH:
  - Fixed wrong check
  - Improved test
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.38.2.24.2.33&r2=1.118.2.38.2.24.2.34&diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.33 
php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.34
--- php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.33 Mon Nov  3 23:44:38 2008
+++ php-src/ext/pdo/pdo_stmt.c  Wed Nov  5 23:40:37 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: pdo_stmt.c,v 1.118.2.38.2.24.2.33 2008/11/03 23:44:38 felipe Exp $ */
+/* $Id: pdo_stmt.c,v 1.118.2.38.2.24.2.34 2008/11/05 23:40:37 felipe Exp $ */
 
 /* The PDO Statement Handle Class */
 
@@ -2197,14 +2197,14 @@
uint len;
ulong num;
 
-   if (zend_hash_get_current_key_ex(stmt->bound_params, 
&str, &len, &num, 0, &pos) == HASH_KEY_IS_STRING) {
-   php_stream_printf(out TSRMLS_CC, "Key: Position 
#%d:\n", num);
+   if (zend_hash_get_current_key_ex(stmt->bound_params, 
&str, &len, &num, 0, &pos) == HASH_KEY_IS_LONG) {
+   php_stream_printf(out TSRMLS_CC, "Key: Position 
#%ld:\n", num);
} else {
php_stream_printf(out TSRMLS_CC, "Key: Name: 
[%d] %.*s\n", len, len, str);
}
 
-   php_stream_printf(out TSRMLS_CC, "paramno=%d\nname=[%d] 
%.*s\nis_param=%d\nparam_type=%d\n",
-   param->paramno, param->namelen, param->namelen, 
param->name,
+   php_stream_printf(out TSRMLS_CC, "paramno=%d\nname=[%d] 
\"%.*s\"\nis_param=%d\nparam_type=%d\n",
+   param->paramno, param->namelen, param->namelen, 
param->name ? param->name : "",
param->is_param,
param->param_type);

http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/tests/debugdumpparams_001.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/pdo_sqlite/tests/debugdumpparams_001.phpt
diff -u php-src/ext/pdo_sqlite/tests/debugdumpparams_001.phpt:1.1.2.2 
php-src/ext/pdo_sqlite/tests/debugdumpparams_001.phpt:1.1.2.3
--- php-src/ext/pdo_sqlite/tests/debugdumpparams_001.phpt:1.1.2.2   Mon Nov 
 3 20:48:51 2008
+++ php-src/ext/pdo_sqlite/tests/debugdumpparams_001.phpt   Wed Nov  5 
23:40:38 2008
@@ -9,23 +9,29 @@
 
 $db = new pdo('sqlite:memory');
 
-$x= $db->prepare('select :a, :b');
+$x= $db->prepare('select :a, :b, ?');
 $x->bindValue(':a', 1, PDO::PARAM_INT);
 $x->bindValue(':b', 'foo');
+$x->bindValue(3, 1313);
 var_dump($x->debugDumpParams());
 
 ?>
 --EXPECT--
-SQL: [13] select :a, :b
-Params:  2
-Key: Position #0:
+SQL: [16] select :a, :b, ?
+Params:  3
+Key: Name: [2] :a
 paramno=-1
-name=[2] :a
+name=[2] ":a"
 is_param=1
 param_type=1
-Key: Position #0:
+Key: Name: [2] :b
 paramno=-1
-name=[2] :b
+name=[2] ":b"
+is_param=1
+param_type=2
+Key: Position #2:
+paramno=2
+name=[0] ""
 is_param=1
 param_type=2
 NULL



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

[PHP-CVS] cvs: php-src /ext/pdo pdo_stmt.c /ext/pdo_sqlite/tests debugdumpparams_001.phpt

2008-11-05 Thread Felipe Pena

felipe  Wed Nov  5 23:39:09 2008 UTC

  Modified files:  
/php-src/ext/pdopdo_stmt.c 
/php-src/ext/pdo_sqlite/tests   debugdumpparams_001.phpt 
  Log:
  - Fixed wrong check
  - Improved test
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.207&r2=1.208&diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.207 php-src/ext/pdo/pdo_stmt.c:1.208
--- php-src/ext/pdo/pdo_stmt.c:1.207Mon Nov  3 23:43:51 2008
+++ php-src/ext/pdo/pdo_stmt.c  Wed Nov  5 23:39:09 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: pdo_stmt.c,v 1.207 2008/11/03 23:43:51 felipe Exp $ */
+/* $Id: pdo_stmt.c,v 1.208 2008/11/05 23:39:09 felipe Exp $ */
 
 /* The PDO Statement Handle Class */
 
@@ -2200,14 +2200,14 @@
uint len;
ulong num;
 
-   if (zend_hash_get_current_key_ex(stmt->bound_params, 
&str, &len, &num, 0, &pos) == HASH_KEY_IS_STRING) {
-   php_stream_printf(out TSRMLS_CC, "Key: Position 
#%d:\n", num);
+   if (zend_hash_get_current_key_ex(stmt->bound_params, 
&str, &len, &num, 0, &pos) == HASH_KEY_IS_LONG) {
+   php_stream_printf(out TSRMLS_CC, "Key: Position 
#%ld:\n", num);
} else {
php_stream_printf(out TSRMLS_CC, "Key: Name: 
[%d] %.*s\n", len, len, str);
}
 
-   php_stream_printf(out TSRMLS_CC, "paramno=%d\nname=[%d] 
%.*s\nis_param=%d\nparam_type=%d\n",
-   param->paramno, param->namelen, param->namelen, 
param->name,
+   php_stream_printf(out TSRMLS_CC, "paramno=%d\nname=[%d] 
\"%.*s\"\nis_param=%d\nparam_type=%d\n",
+   param->paramno, param->namelen, param->namelen, 
param->name ? param->name : "",
param->is_param,
param->param_type);

http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/tests/debugdumpparams_001.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/pdo_sqlite/tests/debugdumpparams_001.phpt
diff -u php-src/ext/pdo_sqlite/tests/debugdumpparams_001.phpt:1.1 
php-src/ext/pdo_sqlite/tests/debugdumpparams_001.phpt:1.2
--- php-src/ext/pdo_sqlite/tests/debugdumpparams_001.phpt:1.1   Mon Nov  3 
20:45:43 2008
+++ php-src/ext/pdo_sqlite/tests/debugdumpparams_001.phpt   Wed Nov  5 
23:39:09 2008
@@ -9,23 +9,29 @@
 
 $db = new pdo('sqlite:memory');
 
-$x= $db->prepare('select :a, :b');
+$x= $db->prepare('select :a, :b, ?');
 $x->bindValue(':a', 1, PDO::PARAM_INT);
 $x->bindValue(':b', 'foo');
+$x->bindValue(3, 1313);
 var_dump($x->debugDumpParams());
 
 ?>
 --EXPECT--
-SQL: [13] select :a, :b
-Params:  2
-Key: Position #0:
+SQL: [16] select :a, :b, ?
+Params:  3
+Key: Name: [2] :a
 paramno=-1
-name=[2] :a
+name=[2] ":a"
 is_param=1
 param_type=1
-Key: Position #0:
+Key: Name: [2] :b
 paramno=-1
-name=[2] :b
+name=[2] ":b"
+is_param=1
+param_type=2
+Key: Position #2:
+paramno=2
+name=[0] ""
 is_param=1
 param_type=2
 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_3) / NEWS /ext/standard basic_functions.c basic_functions.h /ext/standard/tests/general_functions parse_ini_string_001.phpt parse_ini_string_002.phpt ZendEngine2 zend_i

2008-11-05 Thread Arnaud Le Blanc

lbarnaudWed Nov  5 21:35:03 2008 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/general_functions   

parse_ini_string_001.phpt 

parse_ini_string_002.phpt 

  Modified files:  
/php-srcNEWS 
/ZendEngine2zend_ini_scanner.l 
/php-src/ext/standard   basic_functions.c basic_functions.h 
  Log:
  MFH: Added parse_ini_string() function (grange at lemonde dot fr, Arnaud)
  [DOC] new function parse_ini_string()
proto array parse_ini_string(string ini_string
[, bool process_sections [, int scanner_mode]])
Same as parse_ini_file() except that it takes a string instead of a
filename.
  
  http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.363&r2=1.2027.2.547.2.965.2.364&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.363 
php-src/NEWS:1.2027.2.547.2.965.2.364
--- php-src/NEWS:1.2027.2.547.2.965.2.363   Tue Nov  4 23:01:13 2008
+++ php-src/NEWSWed Nov  5 21:35:01 2008
@@ -10,6 +10,7 @@
   parameter validation. (Felipe)
 - Changed openssl info to show the shared library version number. (Scott)
 
+- Added parse_ini_string() function. (grange at lemonde dot fr, Arnaud) 
 - Added str_getcsv() function. (Sara)
 - Added ability to send user defined HTTP headers with SOAP request.
   (Brian J.France, Dmitry)
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_ini_scanner.l?r1=1.41.2.2.2.2.2.12&r2=1.41.2.2.2.2.2.13&diff_format=u
Index: ZendEngine2/zend_ini_scanner.l
diff -u ZendEngine2/zend_ini_scanner.l:1.41.2.2.2.2.2.12 
ZendEngine2/zend_ini_scanner.l:1.41.2.2.2.2.2.13
--- ZendEngine2/zend_ini_scanner.l:1.41.2.2.2.2.2.12Sun Nov  2 23:36:10 2008
+++ ZendEngine2/zend_ini_scanner.l  Wed Nov  5 21:35:02 2008
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: zend_ini_scanner.l,v 1.41.2.2.2.2.2.12 2008/11/02 23:36:10 lbarnaud 
Exp $ */
+/* $Id: zend_ini_scanner.l,v 1.41.2.2.2.2.2.13 2008/11/05 21:35:02 lbarnaud 
Exp $ */
 
 #include 
 #include "zend.h"
@@ -188,7 +188,7 @@
 */
 char *zend_ini_scanner_get_filename(TSRMLS_D)
 {
-   return ini_filename;
+   return ini_filename ? ini_filename : "Unknown";
 }
 /* }}} */
 
@@ -481,7 +481,7 @@
 }
 
 {TABS_AND_SPACES}*[#][^\r\n]*{NEWLINE} { /* #Comment */
-   zend_error(E_DEPRECATED, "Comments starting with '#' are deprecated in 
%s on line %d", ini_filename, SCNG(lineno));
+   zend_error(E_DEPRECATED, "Comments starting with '#' are deprecated in 
%s on line %d", zend_ini_scanner_get_filename(TSRMLS_C), SCNG(lineno));
BEGIN(INITIAL);
SCNG(lineno)++;
return END_OF_LINE;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.64.2.68&r2=1.725.2.31.2.64.2.69&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.68 
php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.69
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.68 Sun Nov  2 
21:19:37 2008
+++ php-src/ext/standard/basic_functions.c  Wed Nov  5 21:35:02 2008
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.68 2008/11/02 21:19:37 felipe 
Exp $ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.69 2008/11/05 21:35:02 lbarnaud 
Exp $ */
 
 #include "php.h"
 #include "php_streams.h"
@@ -989,6 +989,13 @@
ZEND_ARG_INFO(0, scanner_mode)
 ZEND_END_ARG_INFO()
 
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_parse_ini_string, 0, 0, 1)
+ZEND_ARG_INFO(0, ini_string)
+ZEND_ARG_INFO(0, process_sections)
+ZEND_ARG_INFO(0, scanner_mode)
+ZEND_END_ARG_INFO()
+
 #if ZEND_DEBUG
 static
 ZEND_BEGIN_ARG_INFO(arginfo_config_get_hash, 0)
@@ -3450,6 +3457,7 @@
PHP_FE(connection_status,   
arginfo_connection_status)
PHP_FE(ignore_user_abort,   
arginfo_ignore_user_abort)
PHP_FE(parse_ini_file,  
arginfo_parse_ini_file)
+   PHP_FE(parse_ini_string,
arginfo_parse_ini_string)
 #if ZEND_DEBUG
PHP_FE(config_get_hash, 
arginfo_config_get_hash)
 #endif
@@ -6372,6 +6380,43 @@
 }
 /* }}} */
 
+/* {{{ proto array parse_ini_string(string ini_string [, bool process_sections 
[, int scanner_mode]])
+   Parse configuration string */
+PHP_FUNCTION(p

[PHP-CVS] cvs: php-src /ext/standard basic_functions.c basic_functions.h /ext/standard/tests/general_functions parse_ini_string_001.phpt parse_ini_string_002.phpt ZendEngine2 zend_ini_scanner.l

2008-11-05 Thread Arnaud Le Blanc

lbarnaudWed Nov  5 21:33:19 2008 UTC

  Added files: 
/php-src/ext/standard/tests/general_functions   

parse_ini_string_001.phpt 

parse_ini_string_002.phpt 

  Modified files:  
/ZendEngine2zend_ini_scanner.l 
/php-src/ext/standard   basic_functions.c basic_functions.h 
  Log:
  Added parse_ini_string() function (grange at lemonde dot fr, Arnaud)
  [DOC] new function parse_ini_string()
proto array parse_ini_string(string ini_string
[, bool process_sections [, int scanner_mode]])
Same as parse_ini_file() except that it takes a string instead of a
filename.
  
  http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_ini_scanner.l?r1=1.57&r2=1.58&diff_format=u
Index: ZendEngine2/zend_ini_scanner.l
diff -u ZendEngine2/zend_ini_scanner.l:1.57 ZendEngine2/zend_ini_scanner.l:1.58
--- ZendEngine2/zend_ini_scanner.l:1.57 Thu Sep 11 00:49:18 2008
+++ ZendEngine2/zend_ini_scanner.l  Wed Nov  5 21:33:19 2008
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: zend_ini_scanner.l,v 1.57 2008/09/11 00:49:18 stas Exp $ */
+/* $Id: zend_ini_scanner.l,v 1.58 2008/11/05 21:33:19 lbarnaud Exp $ */
 
 #include 
 #include "zend.h"
@@ -188,7 +188,7 @@
 */
 char *zend_ini_scanner_get_filename(TSRMLS_D)
 {
-   return ini_filename;
+   return ini_filename ? ini_filename : "Unknown";
 }
 /* }}} */
 
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.933&r2=1.934&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.933 
php-src/ext/standard/basic_functions.c:1.934
--- php-src/ext/standard/basic_functions.c:1.933Sun Nov  2 21:10:11 2008
+++ php-src/ext/standard/basic_functions.c  Wed Nov  5 21:33:19 2008
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: basic_functions.c,v 1.933 2008/11/02 21:10:11 felipe Exp $ */
+/* $Id: basic_functions.c,v 1.934 2008/11/05 21:33:19 lbarnaud Exp $ */
 
 #include "php.h"
 #include "php_streams.h"
@@ -982,6 +982,13 @@
ZEND_ARG_INFO(0, scanner_mode)
 ZEND_END_ARG_INFO()
 
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_parse_ini_string, 0, 0, 1)
+ZEND_ARG_INFO(0, ini_string)
+ZEND_ARG_INFO(0, process_sections)
+ZEND_ARG_INFO(0, scanner_mode)
+ZEND_END_ARG_INFO()
+
 #if ZEND_DEBUG
 static
 ZEND_BEGIN_ARG_INFO(arginfo_config_get_hash, 0)
@@ -3474,6 +3481,7 @@
PHP_FE(connection_status,   
arginfo_connection_status)
PHP_FE(ignore_user_abort,   
arginfo_ignore_user_abort)
PHP_FE(parse_ini_file,  
arginfo_parse_ini_file)
+   PHP_FE(parse_ini_string,
arginfo_parse_ini_string)
 #if ZEND_DEBUG
PHP_FE(config_get_hash, 
arginfo_config_get_hash)
 #endif
@@ -6495,6 +6503,43 @@
 }
 /* }}} */
 
+/* {{{ proto array parse_ini_string(string ini_string [, bool process_sections 
[, int scanner_mode]]) U
+   Parse configuration string */
+PHP_FUNCTION(parse_ini_string)
+{
+   char *string = NULL, *str = NULL;
+   int str_len = 0;
+   zend_bool process_sections = 0;
+   long scanner_mode = ZEND_INI_SCANNER_NORMAL;
+   zend_ini_parser_cb_t ini_parser_cb;
+
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|bl", &str, 
&str_len, &process_sections, &scanner_mode) == FAILURE) {
+   RETURN_FALSE;
+   }
+
+   /* Set callback function */
+   if (process_sections) {
+   BG(active_ini_file_section) = NULL;
+   ini_parser_cb = (zend_ini_parser_cb_t) 
php_ini_parser_cb_with_sections;
+   } else {
+   ini_parser_cb = (zend_ini_parser_cb_t) php_simple_ini_parser_cb;
+   }
+
+   /* Setup string */
+   string = (char *) emalloc(str_len + ZEND_MMAP_AHEAD);
+   memcpy(string, str, str_len);
+   memset(string + str_len, 0, ZEND_MMAP_AHEAD);
+
+   array_init(return_value);
+   if (zend_parse_ini_string(string, 0, scanner_mode, ini_parser_cb, 
return_value TSRMLS_CC) == FAILURE) {
+   zend_hash_destroy(Z_ARRVAL_P(return_value));
+   efree(Z_ARRVAL_P(return_value));
+   RETVAL_FALSE;
+   }
+   efree(string);
+}
+/* }}} */
+
 #if ZEND_DEBUG
 /* This function returns an array of ALL valid ini options with values and 
  *  is not the same as in

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

2008-11-05 Thread Felipe Pena

felipe  Wed Nov  5 18:55:02 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard   string.c 
  Log:
  - Fixed bug #45166 (substr() overflow changes) (now synced with other 
branches)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.76&r2=1.445.2.14.2.77&diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.445.2.14.2.76 
php-src/ext/standard/string.c:1.445.2.14.2.77
--- php-src/ext/standard/string.c:1.445.2.14.2.76   Tue Jul 15 14:58:58 2008
+++ php-src/ext/standard/string.c   Wed Nov  5 18:55:02 2008
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: string.c,v 1.445.2.14.2.76 2008/07/15 14:58:58 scottmac Exp $ */
+/* $Id: string.c,v 1.445.2.14.2.77 2008/11/05 18:55:02 felipe Exp $ */
 
 /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
 
@@ -2260,8 +2260,10 @@
}

f = Z_LVAL_PP(from);
-   if (f > Z_STRLEN_PP(str) || (f < 0 && -f > Z_STRLEN_PP(str))) {
+   if (f > Z_STRLEN_PP(str)) {
RETURN_FALSE;
+   } else if (f < 0 && -f > Z_STRLEN_PP(str)) {
+   f = 0;
}
 
if (l < 0 && (l + Z_STRLEN_PP(str) - f) < 0) {



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

[PHP-CVS] cvs: SVNROOT / phpsvn.options.skel run-conversion.php

2008-11-05 Thread Gwynne Raskind

gwynne  Wed Nov  5 18:15:59 2008 UTC

  Added files: 
/SVNROOTphpsvn.options.skel 

  Modified files:  
/SVNROOTrun-conversion.php 
  Log:
  Complete rewrite of conversion script, and addition of cvs2svn options file 
skeleton.
  http://cvs.php.net/viewvc.cgi/SVNROOT/run-conversion.php?r1=1.4&r2=1.5&diff_format=u
Index: SVNROOT/run-conversion.php
diff -u SVNROOT/run-conversion.php:1.4 SVNROOT/run-conversion.php:1.5
--- SVNROOT/run-conversion.php:1.4  Fri Oct 31 03:22:27 2008
+++ SVNROOT/run-conversion.php  Wed Nov  5 18:15:59 2008
@@ -1,16 +1,59 @@
 = $level) {
+print $message;
+}
+}
+
+function error($message, $status = 1)
+{
+print $message;
+exit($status);
+}
+
+function is_running_pass($pass)
+{
+return $GLOBALS['options']['pass'] === NULL || $GLOBALS['options']['pass'] 
== $pass;
+}
+
+function scandir_is_meta($value)
+{
+return !($value === '.' || $value === '..');
+}
+
+function scandir_no_meta($directory)
+{
+if (func_num_args() == 3) {
+$results = scandir($directory, func_get_arg(1), func_get_arg(2));
+} else if (func_num_args() == 2) {
+$results = scandir($directory, func_get_arg(1));
+} else if (func_num_args() == 1) {
+$results = scandir($directory);
+}
+return array_filter($results, 'scandir_is_meta');
+}
+
+// 
-
+// Commandline options
 $cmdline_parser = new Console_CommandLine(array(
 'description' => 'PHP Group CVS->SVN respository converter',
 'version' => $version,
@@ -30,8 +73,8 @@
 $cmdline_parser->addOption('svnroot', array(
 'short_name' => '-s',
 'long_name' => '--svnroot',
-'default' => '/home/repository-svn',
-'description' => 'Specify the SVN repository to create.',
+'default' => '/home/svn',
+'description' => 'Specify the directory for SVN repositories.',
 'action' => 'StoreString'));
 $cmdline_parser->addOption('pass', array(
 'short_name' => '-p',
@@ -40,6 +83,18 @@
 'description' => 'Which pass to run. One of: ' . implode(', ', $passes) . 
'. If not specified, all passes will run.',
 'action' => 'StoreString',
 'choices' => $passes));
+$cmdline_parser->addOption('tempdir', array(
+'short_name' => '-t',
+'long_name' => '--tempdir',
+'default' => '/tmp',
+'description' => 'Where to store temporary files.',
+'action' => 'StoreString'));
+$cmdline_parser->addOption('skeleton', array(
+'short_name' => '-k',
+'long_name' => '--skeleton',
+'default' => './phpsvn.options.skel',
+'description' => 'Skeleton file to use for cvs2svn conversions.',
+'action' => 'StoreString'));
 
 try {
 $result = $cmdline_parser->parse();
@@ -49,139 +104,358 @@
 exit(1);
 }
 
-function v($level, $message)
-{
-if ($GLOBALS['options']['verbose'] >= $level) {
-print $message;
-}
+// 
-
+// Option verification
+if (!is_dir($options['cvsroot']) || !is_readable($options['cvsroot']) || 
!is_executable($options['cvsroot'])) {
+error("CVS root directory must exist and be a readable and searchable 
directory.\n");
 }
+$options['cvsroot'] = realpath($options['cvsroot']);
 
-function error($message, $status = 1)
-{
-print $message;
-exit($status);
+if (!is_dir($options['svnroot']) || !is_readable($options['svnroot']) || 
!is_executable($options['svnroot'])) {
+error("SVN root directory must exist, be a directory, and be readable and 
searchable.\n");
 }
+if (is_running_pass('svncreate') && !is_writable($options['svnroot'])) {
+error("SVN root directory must be writable if running the svncreate 
pass.\n");
+}
+$options['svnroot'] = realpath($options['svnroot']);
 
-if (!is_dir($options['cvsroot']) || !is_readable($options['cvsroot']) || 
!is_executable($options['cvsroot'])) {
-error("CVS root directory must exist, be a directory, and be readable and 
searchable.\n");
+if (!is_dir($options['tempdir']) || !is_writable($options['tempdir'])) {
+error("Temporary directory must exist and be a writable directory.\n");
+}
+$options['tempdir'] = realpath($options['tempdir']);
+
+if (!file_exists($options['skeleton']) || is_dir($options['skeleton']) || 
!is_readable($options['skeleton'])) {
+error("cvs2svn options skeleton must exist and be a readable file.\n");
+}
+$options['skeleton'] = realpath($options['skeleton']);
+
+// 
-
+// Classes
+
+// CVS2SVNConverter: A wrapper around a cvs2svn instance and its options file
+class CVS2SVNConverter
+{
+private $optionsFileContents = NULL;
+private $outputPath = NULL;
+
+public function __construct()
+{
+$this->

[PHP-CVS] cvs: php-src(PHP_5_2) / README.TESTING2

2008-11-05 Thread Hannes Magnusson

bjori   Wed Nov  5 17:16:07 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcREADME.TESTING2 
  Log:
  Fixed bug#46445 (run-tests2.php is missing or README.TESTING2 is unneeded)
  
  
http://cvs.php.net/viewvc.cgi/php-src/README.TESTING2?r1=1.1&r2=1.1.6.1&diff_format=u
Index: php-src/README.TESTING2
diff -u php-src/README.TESTING2:1.1 php-src/README.TESTING2:1.1.6.1
--- php-src/README.TESTING2:1.1 Tue Mar 25 07:45:18 2003
+++ php-src/README.TESTING2 Wed Nov  5 17:16:07 2008
@@ -1,11 +1,11 @@
 [IMPORTANT NOTICE]
 --
 This is an addendum to README.TESTING with additional information 
-specific to run-tests2.php.
+specific to server-tests.php.
 
-run-tests2.php is backward compatible with tests developed for
-the original run-tests.php script.  run-tests2 is *not* used by
-'make test'.  run-tests2 was developed to provide support for
+server-tests.php is backward compatible with tests developed for
+the original run-tests.php script.  server-tests is *not* used by
+'make test'.  server-tests was developed to provide support for
 testing PHP under it's primary environment, HTTP, and can run the
 PHP tests under any of the SAPI modules that are direct executables, 
 or are accessable via HTTP.
@@ -13,12 +13,12 @@
 [New features]
 
 * Command line interface:
-  You can run 'php run-tests2.php -h' to get all the possible options.
+  You can run 'php server-tests.php -h' to get all the possible options.
 * Configuration file:
   the -c argument will allow you to use a configuration file.  This is
   handy if you are testing multiple environments and need various options
   depending on the environment.
-  see run-tests-config.php for details.
+  see server-tests-config.php for details.
 * CGI Emulation:
   Will emulate a CGI environment when testing with the cgi sapi executable.
 * HTTP testing:
@@ -39,23 +39,23 @@
 Some (but not all!) examples of usage:
 
 1. run tests from the php source directory
-php run-tests2.php -p /path/to/php-cli
+php server-tests.php -p /path/to/php-cli
 
 2. run tests using cgi emulation
-php run-tests2.php -p /path/to/php-cgi
+php server-tests.php -p /path/to/php-cgi
 
 3. run tests over http, copying test files into document root
-php run-tests2.php -w -u http://localhost/test -m /path/to/htdocs/test
+php server-tests.php -w -u http://localhost/test -m /path/to/htdocs/test
 
 4. run tests over http, php sources have been aliased in web server
-php run-tests2.php -w -u http://localhost/test
+php server-tests.php -w -u http://localhost/test
 
 5. run tests using configuration file
-php run-tests2.php -c /path/to/run-tests-config.php
+php server-tests.php -c /path/to/server-tests-config.php
 
 6. run tests using configuration file, but overriding some settings:
(config file must be first)
-php run-tests2.php -c /path/to/run-tests-config.php -w -t 3 -d 
/path/to/testdir
+php server-tests.php -c /path/to/server-tests-config.php -w -t 3 -d 
/path/to/testdir
 
 NOTE: configuration as described in README.TESTING still works.
 
@@ -63,7 +63,7 @@
 
 In addition to the traditional test sections 
 (see http://qa.php.net/write-test.php), several new sections are available 
-under run-tests2.
+under server-tests.
 
 --POST--
 This is not a new section, but not multipart posts are supported for testing
@@ -97,7 +97,7 @@
   $scriptname   this is what will become SCRIPT_NAME unless you override it
   $docroot  the equivelant of DOCUMENT_ROOT under Apache
   $cwd  the directory that the test is being initiated from
-  $this->conf   all run-tests2 configuration vars
+  $this->conf   all server-tests configuration vars
   $this->envall environment variables that will get passed to the 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_3) / README.TESTING2

2008-11-05 Thread Hannes Magnusson

bjori   Wed Nov  5 17:15:50 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcREADME.TESTING2 
  Log:
  Fixed bug#46445 (run-tests2.php is missing or README.TESTING2 is unneeded)
  
  
http://cvs.php.net/viewvc.cgi/php-src/README.TESTING2?r1=1.1&r2=1.1.8.1&diff_format=u
Index: php-src/README.TESTING2
diff -u php-src/README.TESTING2:1.1 php-src/README.TESTING2:1.1.8.1
--- php-src/README.TESTING2:1.1 Tue Mar 25 07:45:18 2003
+++ php-src/README.TESTING2 Wed Nov  5 17:15:50 2008
@@ -1,11 +1,11 @@
 [IMPORTANT NOTICE]
 --
 This is an addendum to README.TESTING with additional information 
-specific to run-tests2.php.
+specific to server-tests.php.
 
-run-tests2.php is backward compatible with tests developed for
-the original run-tests.php script.  run-tests2 is *not* used by
-'make test'.  run-tests2 was developed to provide support for
+server-tests.php is backward compatible with tests developed for
+the original run-tests.php script.  server-tests is *not* used by
+'make test'.  server-tests was developed to provide support for
 testing PHP under it's primary environment, HTTP, and can run the
 PHP tests under any of the SAPI modules that are direct executables, 
 or are accessable via HTTP.
@@ -13,12 +13,12 @@
 [New features]
 
 * Command line interface:
-  You can run 'php run-tests2.php -h' to get all the possible options.
+  You can run 'php server-tests.php -h' to get all the possible options.
 * Configuration file:
   the -c argument will allow you to use a configuration file.  This is
   handy if you are testing multiple environments and need various options
   depending on the environment.
-  see run-tests-config.php for details.
+  see server-tests-config.php for details.
 * CGI Emulation:
   Will emulate a CGI environment when testing with the cgi sapi executable.
 * HTTP testing:
@@ -39,23 +39,23 @@
 Some (but not all!) examples of usage:
 
 1. run tests from the php source directory
-php run-tests2.php -p /path/to/php-cli
+php server-tests.php -p /path/to/php-cli
 
 2. run tests using cgi emulation
-php run-tests2.php -p /path/to/php-cgi
+php server-tests.php -p /path/to/php-cgi
 
 3. run tests over http, copying test files into document root
-php run-tests2.php -w -u http://localhost/test -m /path/to/htdocs/test
+php server-tests.php -w -u http://localhost/test -m /path/to/htdocs/test
 
 4. run tests over http, php sources have been aliased in web server
-php run-tests2.php -w -u http://localhost/test
+php server-tests.php -w -u http://localhost/test
 
 5. run tests using configuration file
-php run-tests2.php -c /path/to/run-tests-config.php
+php server-tests.php -c /path/to/server-tests-config.php
 
 6. run tests using configuration file, but overriding some settings:
(config file must be first)
-php run-tests2.php -c /path/to/run-tests-config.php -w -t 3 -d 
/path/to/testdir
+php server-tests.php -c /path/to/server-tests-config.php -w -t 3 -d 
/path/to/testdir
 
 NOTE: configuration as described in README.TESTING still works.
 
@@ -63,7 +63,7 @@
 
 In addition to the traditional test sections 
 (see http://qa.php.net/write-test.php), several new sections are available 
-under run-tests2.
+under server-tests.
 
 --POST--
 This is not a new section, but not multipart posts are supported for testing
@@ -97,7 +97,7 @@
   $scriptname   this is what will become SCRIPT_NAME unless you override it
   $docroot  the equivelant of DOCUMENT_ROOT under Apache
   $cwd  the directory that the test is being initiated from
-  $this->conf   all run-tests2 configuration vars
+  $this->conf   all server-tests configuration vars
   $this->envall environment variables that will get passed to the test
 
 



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

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

2008-11-05 Thread Hannes Magnusson

bjori   Wed Nov  5 17:15:37 2008 UTC

  Modified files:  
/php-srcREADME.TESTING2 
  Log:
  Fixed bug#46445 (run-tests2.php is missing or README.TESTING2 is unneeded)
  
  
http://cvs.php.net/viewvc.cgi/php-src/README.TESTING2?r1=1.1&r2=1.2&diff_format=u
Index: php-src/README.TESTING2
diff -u php-src/README.TESTING2:1.1 php-src/README.TESTING2:1.2
--- php-src/README.TESTING2:1.1 Tue Mar 25 07:45:18 2003
+++ php-src/README.TESTING2 Wed Nov  5 17:15:37 2008
@@ -1,11 +1,11 @@
 [IMPORTANT NOTICE]
 --
 This is an addendum to README.TESTING with additional information 
-specific to run-tests2.php.
+specific to server-tests.php.
 
-run-tests2.php is backward compatible with tests developed for
-the original run-tests.php script.  run-tests2 is *not* used by
-'make test'.  run-tests2 was developed to provide support for
+server-tests.php is backward compatible with tests developed for
+the original run-tests.php script.  server-tests is *not* used by
+'make test'.  server-tests was developed to provide support for
 testing PHP under it's primary environment, HTTP, and can run the
 PHP tests under any of the SAPI modules that are direct executables, 
 or are accessable via HTTP.
@@ -13,12 +13,12 @@
 [New features]
 
 * Command line interface:
-  You can run 'php run-tests2.php -h' to get all the possible options.
+  You can run 'php server-tests.php -h' to get all the possible options.
 * Configuration file:
   the -c argument will allow you to use a configuration file.  This is
   handy if you are testing multiple environments and need various options
   depending on the environment.
-  see run-tests-config.php for details.
+  see server-tests-config.php for details.
 * CGI Emulation:
   Will emulate a CGI environment when testing with the cgi sapi executable.
 * HTTP testing:
@@ -39,23 +39,23 @@
 Some (but not all!) examples of usage:
 
 1. run tests from the php source directory
-php run-tests2.php -p /path/to/php-cli
+php server-tests.php -p /path/to/php-cli
 
 2. run tests using cgi emulation
-php run-tests2.php -p /path/to/php-cgi
+php server-tests.php -p /path/to/php-cgi
 
 3. run tests over http, copying test files into document root
-php run-tests2.php -w -u http://localhost/test -m /path/to/htdocs/test
+php server-tests.php -w -u http://localhost/test -m /path/to/htdocs/test
 
 4. run tests over http, php sources have been aliased in web server
-php run-tests2.php -w -u http://localhost/test
+php server-tests.php -w -u http://localhost/test
 
 5. run tests using configuration file
-php run-tests2.php -c /path/to/run-tests-config.php
+php server-tests.php -c /path/to/server-tests-config.php
 
 6. run tests using configuration file, but overriding some settings:
(config file must be first)
-php run-tests2.php -c /path/to/run-tests-config.php -w -t 3 -d 
/path/to/testdir
+php server-tests.php -c /path/to/server-tests-config.php -w -t 3 -d 
/path/to/testdir
 
 NOTE: configuration as described in README.TESTING still works.
 
@@ -63,7 +63,7 @@
 
 In addition to the traditional test sections 
 (see http://qa.php.net/write-test.php), several new sections are available 
-under run-tests2.
+under server-tests.
 
 --POST--
 This is not a new section, but not multipart posts are supported for testing
@@ -97,7 +97,7 @@
   $scriptname   this is what will become SCRIPT_NAME unless you override it
   $docroot  the equivelant of DOCUMENT_ROOT under Apache
   $cwd  the directory that the test is being initiated from
-  $this->conf   all run-tests2 configuration vars
+  $this->conf   all server-tests configuration vars
   $this->envall environment variables that will get passed to the test
 
 



-- 
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_3) /ext/gd gd.c

2008-11-05 Thread Pierre Joye

On Wed, Nov 5, 2008 at 12:45 PM, Derick Rethans <[EMAIL PROTECTED]> wrote:
> On Tue, 4 Nov 2008, Pierre-Alain Joye wrote:
>
>> pajoyeTue Nov  4 20:25:45 2008 UTC
>>
>>   Modified files:  (Branch: PHP_5_3)
>> /php-src/ext/gd   gd.c
>>   Log:
>>   - MFH: add png and jpeg version info
>
> This patch breaks the build for me with:

Yes, Tony already pointed it out. I will commit the fix asap (problem
is when you build it statically).

Thanks for the head up,

Cheers,
-- 
Pierre

http://blog.thepimp.net | http://www.libgd.org

-- 
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_3) /ext/gd gd.c

2008-11-05 Thread Derick Rethans

On Tue, 4 Nov 2008, Pierre-Alain Joye wrote:

> pajoyeTue Nov  4 20:25:45 2008 UTC
> 
>   Modified files:  (Branch: PHP_5_3)
> /php-src/ext/gd   gd.c 
>   Log:
>   - MFH: add png and jpeg version info

This patch breaks the build for me with:

/home/derick/dev/php/php-5.3dev/ext/gd/gd.c: In function 'zm_info_gd':
/home/derick/dev/php/php-5.3dev/ext/gd/gd.c:1399: error: 
'JPEG_LIB_VERSION' undeclared (first use in this function)
/home/derick/dev/php/php-5.3dev/ext/gd/gd.c:1399: error: (Each 
undeclared identifier is reported only once
/home/derick/dev/php/php-5.3dev/ext/gd/gd.c:1399: error: for each 
function it appears in.)
/home/derick/dev/php/php-5.3dev/ext/gd/gd.c:1406: error: 
'PNG_LIBPNG_VER_STRING' undeclared (first use in this function)


regards,
Derick

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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/date/lib parse_date.c parse_date.re /ext/date/tests date-parse-by-format001.phpt

2008-11-05 Thread Derick Rethans

derick  Wed Nov  5 10:43:00 2008 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/date/tests date-parse-by-format001.phpt 

  Modified files:  
/php-src/ext/date/lib   parse_date.c parse_date.re 
  Log:
  - MFH: Fixed an issue with the * format specifier for parsing from a
user-defined format.
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/parse_date.c?r1=1.29.2.30.2.14.2.26&r2=1.29.2.30.2.14.2.27&diff_format=u
Index: php-src/ext/date/lib/parse_date.c
diff -u php-src/ext/date/lib/parse_date.c:1.29.2.30.2.14.2.26 
php-src/ext/date/lib/parse_date.c:1.29.2.30.2.14.2.27
--- php-src/ext/date/lib/parse_date.c:1.29.2.30.2.14.2.26   Fri Aug 29 
12:01:32 2008
+++ php-src/ext/date/lib/parse_date.c   Wed Nov  5 10:42:17 2008
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Fri Aug 29 13:57:38 2008 */
+/* Generated by re2c 0.13.5 on Wed Nov  5 11:30:55 2008 */
 #line 1 "ext/date/lib/parse_date.re"
 /*
+--+
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: parse_date.c,v 1.29.2.30.2.14.2.26 2008/08/29 12:01:32 derick Exp $ */
+/* $Id: parse_date.c,v 1.29.2.30.2.14.2.27 2008/11/05 10:42:17 derick Exp $ */
 
 #include "timelib.h"
 
@@ -626,6 +626,7 @@
 
 static void timelib_eat_until_separator(char **ptr)
 {
+   ++*ptr;
while (strchr(" \t.,:;/-0123456789", **ptr) == NULL) {
++*ptr;
}
@@ -838,11 +839,11 @@
 std:
s->tok = cursor;
s->len = 0;
-#line 964 "ext/date/lib/parse_date.re"
+#line 965 "ext/date/lib/parse_date.re"
 
 
 
-#line 846 "ext/date/lib/parse_date.c"
+#line 847 "ext/date/lib/parse_date.c"
 {
YYCTYPE yych;
unsigned int yyaccept = 0;
@@ -982,7 +983,7 @@
}
 yy3:
YYDEBUG(3, *YYCURSOR);
-#line 1631 "ext/date/lib/parse_date.re"
+#line 1632 "ext/date/lib/parse_date.re"
{
int tz_not_found;
DEBUG_OUTPUT("tzcorrection | tz");
@@ -995,7 +996,7 @@
TIMELIB_DEINIT;
return TIMELIB_TIMEZONE;
}
-#line 999 "ext/date/lib/parse_date.c"
+#line 1000 "ext/date/lib/parse_date.c"
 yy4:
YYDEBUG(4, *YYCURSOR);
yych = *++YYCURSOR;
@@ -1306,12 +1307,12 @@
if (yych <= '9') goto yy1383;
 yy12:
YYDEBUG(12, *YYCURSOR);
-#line 1726 "ext/date/lib/parse_date.re"
+#line 1727 "ext/date/lib/parse_date.re"
{
add_error(s, "Unexpected character");
goto std;
}
-#line 1315 "ext/date/lib/parse_date.c"
+#line 1316 "ext/date/lib/parse_date.c"
 yy13:
YYDEBUG(13, *YYCURSOR);
yych = *++YYCURSOR;
@@ -2368,11 +2369,11 @@
if (yych <= '9') goto yy54;
 yy49:
YYDEBUG(49, *YYCURSOR);
-#line 1715 "ext/date/lib/parse_date.re"
+#line 1716 "ext/date/lib/parse_date.re"
{
goto std;
}
-#line 2376 "ext/date/lib/parse_date.c"
+#line 2377 "ext/date/lib/parse_date.c"
 yy50:
YYDEBUG(50, *YYCURSOR);
yych = *++YYCURSOR;
@@ -2381,12 +2382,12 @@
YYDEBUG(51, *YYCURSOR);
++YYCURSOR;
YYDEBUG(52, *YYCURSOR);
-#line 1720 "ext/date/lib/parse_date.re"
+#line 1721 "ext/date/lib/parse_date.re"
{
s->pos = cursor; s->line++;
goto std;
}
-#line 2390 "ext/date/lib/parse_date.c"
+#line 2391 "ext/date/lib/parse_date.c"
 yy53:
YYDEBUG(53, *YYCURSOR);
yych = *++YYCURSOR;
@@ -2777,7 +2778,7 @@
if (yych == 's') goto yy73;
 yy72:
YYDEBUG(72, *YYCURSOR);
-#line 1699 "ext/date/lib/parse_date.re"
+#line 1700 "ext/date/lib/parse_date.re"
{
timelib_ull i;
DEBUG_OUTPUT("relative");
@@ -2792,7 +2793,7 @@
TIMELIB_DEINIT;
return TIMELIB_RELATIVE;
}
-#line 2796 "ext/date/lib/parse_date.c"
+#line 2797 "ext/date/lib/parse_date.c"
 yy73:
YYDEBUG(73, *YYCURSOR);
yych = *++YYCURSOR;
@@ -3545,7 +3546,7 @@
}
 yy167:
YYDEBUG(167, *YYCURSOR);
-#line 1562 "ext/date/lib/parse_date.re"
+#line 1563 "ext/date/lib/parse_date.re"
{
const timelib_relunit* relunit;
DEBUG_OUTPUT("daytext");
@@ -3562,7 +3563,7 @@
TIMELIB_DEINIT;
return TIMELIB_WEEKDAY;
}
-#line 3566 "ext/date/lib/parse_date.c"
+#line 3567 "ext/date/lib/parse_date.c"
 yy168:
YYDEBUG(168, *YYCURSOR);
yych = *++YYCURSOR;
@@ -4039,7 +4040,7 @@
}
 yy194:
YYDEBUG(194, *YYCURSOR);
-#line 1621 "ext/date/lib/parse_date.re"
+#line 1622 "ext/date/lib/parse_date.re"
{
DEBUG_OUTPUT("monthtext");
TIMELIB_INIT;
@@ -4048,7 +4049,7 @@
TIMELIB_DEINIT;
return TIMELIB_DATE_TEXT;
}
-#line 4052 "ext/date/lib/parse_date.c"
+#line 4053 "ext/date/lib/parse_date.c"
 yy195

[PHP-CVS] cvs: php-src /ext/date/lib parse_date.c parse_date.re /ext/date/tests date-parse-by-format001.phpt

2008-11-05 Thread Derick Rethans

derick  Wed Nov  5 10:41:48 2008 UTC

  Added files: 
/php-src/ext/date/tests date-parse-by-format001.phpt 

  Modified files:  
/php-src/ext/date/lib   parse_date.c parse_date.re 
  Log:
  - Fixed an issue with the * format specifier for parsing from a user-defined
format.
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/parse_date.c?r1=1.99&r2=1.100&diff_format=u
Index: php-src/ext/date/lib/parse_date.c
diff -u php-src/ext/date/lib/parse_date.c:1.99 
php-src/ext/date/lib/parse_date.c:1.100
--- php-src/ext/date/lib/parse_date.c:1.99  Fri Aug 29 11:59:22 2008
+++ php-src/ext/date/lib/parse_date.c   Wed Nov  5 10:41:48 2008
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Fri Aug 29 13:57:48 2008 */
+/* Generated by re2c 0.13.5 on Wed Nov  5 11:39:34 2008 */
 #line 1 "ext/date/lib/parse_date.re"
 /*
+--+
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: parse_date.c,v 1.99 2008/08/29 11:59:22 derick Exp $ */
+/* $Id: parse_date.c,v 1.100 2008/11/05 10:41:48 derick Exp $ */
 
 #include "timelib.h"
 
@@ -626,6 +626,7 @@
 
 static void timelib_eat_until_separator(char **ptr)
 {
+   ++*ptr;
while (strchr(" \t.,:;/-0123456789", **ptr) == NULL) {
++*ptr;
}
@@ -838,11 +839,11 @@
 std:
s->tok = cursor;
s->len = 0;
-#line 964 "ext/date/lib/parse_date.re"
+#line 965 "ext/date/lib/parse_date.re"
 
 
 
-#line 846 "ext/date/lib/parse_date.c"
+#line 847 "ext/date/lib/parse_date.c"
 {
YYCTYPE yych;
unsigned int yyaccept = 0;
@@ -982,7 +983,7 @@
}
 yy3:
YYDEBUG(3, *YYCURSOR);
-#line 1631 "ext/date/lib/parse_date.re"
+#line 1632 "ext/date/lib/parse_date.re"
{
int tz_not_found;
DEBUG_OUTPUT("tzcorrection | tz");
@@ -995,7 +996,7 @@
TIMELIB_DEINIT;
return TIMELIB_TIMEZONE;
}
-#line 999 "ext/date/lib/parse_date.c"
+#line 1000 "ext/date/lib/parse_date.c"
 yy4:
YYDEBUG(4, *YYCURSOR);
yych = *++YYCURSOR;
@@ -1306,12 +1307,12 @@
if (yych <= '9') goto yy1383;
 yy12:
YYDEBUG(12, *YYCURSOR);
-#line 1726 "ext/date/lib/parse_date.re"
+#line 1727 "ext/date/lib/parse_date.re"
{
add_error(s, "Unexpected character");
goto std;
}
-#line 1315 "ext/date/lib/parse_date.c"
+#line 1316 "ext/date/lib/parse_date.c"
 yy13:
YYDEBUG(13, *YYCURSOR);
yych = *++YYCURSOR;
@@ -2368,11 +2369,11 @@
if (yych <= '9') goto yy54;
 yy49:
YYDEBUG(49, *YYCURSOR);
-#line 1715 "ext/date/lib/parse_date.re"
+#line 1716 "ext/date/lib/parse_date.re"
{
goto std;
}
-#line 2376 "ext/date/lib/parse_date.c"
+#line 2377 "ext/date/lib/parse_date.c"
 yy50:
YYDEBUG(50, *YYCURSOR);
yych = *++YYCURSOR;
@@ -2381,12 +2382,12 @@
YYDEBUG(51, *YYCURSOR);
++YYCURSOR;
YYDEBUG(52, *YYCURSOR);
-#line 1720 "ext/date/lib/parse_date.re"
+#line 1721 "ext/date/lib/parse_date.re"
{
s->pos = cursor; s->line++;
goto std;
}
-#line 2390 "ext/date/lib/parse_date.c"
+#line 2391 "ext/date/lib/parse_date.c"
 yy53:
YYDEBUG(53, *YYCURSOR);
yych = *++YYCURSOR;
@@ -2777,7 +2778,7 @@
if (yych == 's') goto yy73;
 yy72:
YYDEBUG(72, *YYCURSOR);
-#line 1699 "ext/date/lib/parse_date.re"
+#line 1700 "ext/date/lib/parse_date.re"
{
timelib_ull i;
DEBUG_OUTPUT("relative");
@@ -2792,7 +2793,7 @@
TIMELIB_DEINIT;
return TIMELIB_RELATIVE;
}
-#line 2796 "ext/date/lib/parse_date.c"
+#line 2797 "ext/date/lib/parse_date.c"
 yy73:
YYDEBUG(73, *YYCURSOR);
yych = *++YYCURSOR;
@@ -3545,7 +3546,7 @@
}
 yy167:
YYDEBUG(167, *YYCURSOR);
-#line 1562 "ext/date/lib/parse_date.re"
+#line 1563 "ext/date/lib/parse_date.re"
{
const timelib_relunit* relunit;
DEBUG_OUTPUT("daytext");
@@ -3562,7 +3563,7 @@
TIMELIB_DEINIT;
return TIMELIB_WEEKDAY;
}
-#line 3566 "ext/date/lib/parse_date.c"
+#line 3567 "ext/date/lib/parse_date.c"
 yy168:
YYDEBUG(168, *YYCURSOR);
yych = *++YYCURSOR;
@@ -4039,7 +4040,7 @@
}
 yy194:
YYDEBUG(194, *YYCURSOR);
-#line 1621 "ext/date/lib/parse_date.re"
+#line 1622 "ext/date/lib/parse_date.re"
{
DEBUG_OUTPUT("monthtext");
TIMELIB_INIT;
@@ -4048,7 +4049,7 @@
TIMELIB_DEINIT;
return TIMELIB_DATE_TEXT;
}
-#line 4052 "ext/date/lib/parse_date.c"
+#line 4053 "ext/date/lib/parse_date.c"
 yy195:
YYDEBUG(195, *YYCURSOR);
++YYCURSOR;
@@ -4099,7 +4100,7 @@
}
 yy199:
YYDEBUG(199, *YYCURSOR)

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/misc syslog_basic.phpt syslog_parameters.phpt syslog_vars_variation1.phpt syslog_vars_variation2.phpt

2008-11-05 Thread Kalle Sommer Nielsen

kalle   Wed Nov  5 09:59:47 2008 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/miscsyslog_basic.phpt 
syslog_parameters.phpt 
syslog_vars_variation1.phpt 
syslog_vars_variation2.phpt 
  Log:
  MFH: New tests for syslog
  

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/misc/syslog_basic.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/misc/syslog_basic.phpt
+++ php-src/ext/standard/tests/misc/syslog_basic.phpt
--TEST--
Basic syslog test
--FILE--

===DONE===
--EXPECT--
===DONE===

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/misc/syslog_parameters.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/misc/syslog_parameters.phpt
+++ php-src/ext/standard/tests/misc/syslog_parameters.phpt
--TEST--
Syslog parameter parsing test
--FILE--

--EXPECTF--
Warning: openlog() expects exactly 3 parameters, 0 given in %s on line %d

Warning: openlog() expects parameter 2 to be long, Unicode string given in %s 
on line %d

Warning: syslog() expects exactly 2 parameters, 0 given in %s on line %d

Warning: syslog() expects parameter 1 to be long, Unicode string given in %s on 
line %d

Warning: closelog() expects exactly 0 parameters, 1 given in %s on line %d

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/misc/syslog_vars_variation1.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/misc/syslog_vars_variation1.phpt
+++ php-src/ext/standard/tests/misc/syslog_vars_variation1.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/misc/syslog_vars_variation2.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/misc/syslog_vars_variation2.phpt
+++ php-src/ext/standard/tests/misc/syslog_vars_variation2.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_3) /ext/standard/tests/misc syslog_basic.phpt syslog_parameters.phpt syslog_vars_variation1.phpt syslog_vars_variation2.phpt

2008-11-05 Thread Kalle Sommer Nielsen

kalle   Wed Nov  5 09:58:51 2008 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/miscsyslog_basic.phpt 
syslog_parameters.phpt 
syslog_vars_variation1.phpt 
syslog_vars_variation2.phpt 
  Log:
  MFH: New tests for syslog
  

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/misc/syslog_basic.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/misc/syslog_basic.phpt
+++ php-src/ext/standard/tests/misc/syslog_basic.phpt
--TEST--
Basic syslog test
--FILE--

===DONE===
--EXPECT--
===DONE===

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/misc/syslog_parameters.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/misc/syslog_parameters.phpt
+++ php-src/ext/standard/tests/misc/syslog_parameters.phpt
--TEST--
Syslog parameter parsing test
--FILE--

--EXPECTF--
Warning: openlog() expects exactly 3 parameters, 0 given in %s on line %d

Warning: openlog() expects parameter 2 to be long, Unicode string given in %s 
on line %d

Warning: syslog() expects exactly 2 parameters, 0 given in %s on line %d

Warning: syslog() expects parameter 1 to be long, Unicode string given in %s on 
line %d

Warning: closelog() expects exactly 0 parameters, 1 given in %s on line %d

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/misc/syslog_vars_variation1.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/misc/syslog_vars_variation1.phpt
+++ php-src/ext/standard/tests/misc/syslog_vars_variation1.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/misc/syslog_vars_variation2.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/misc/syslog_vars_variation2.phpt
+++ php-src/ext/standard/tests/misc/syslog_vars_variation2.phpt



-- 
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/misc syslog_basic.phpt syslog_parameters.phpt

2008-11-05 Thread Kalle Sommer Nielsen

kalle   Wed Nov  5 09:58:15 2008 UTC

  Added files: 
/php-src/ext/standard/tests/miscsyslog_basic.phpt 
syslog_parameters.phpt 
  Log:
  New tests for syslog
  

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/misc/syslog_basic.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/misc/syslog_basic.phpt
+++ php-src/ext/standard/tests/misc/syslog_basic.phpt
--TEST--
Basic syslog test
--FILE--

===DONE===
--EXPECT--
===DONE===

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/misc/syslog_parameters.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/misc/syslog_parameters.phpt
+++ php-src/ext/standard/tests/misc/syslog_parameters.phpt
--TEST--
Syslog parameter parsing test
--FILE--

--EXPECTF--
Warning: openlog() expects exactly 3 parameters, 0 given in %s on line %d

Warning: openlog() expects parameter 2 to be long, Unicode string given in %s 
on line %d

Warning: syslog() expects exactly 2 parameters, 0 given in %s on line %d

Warning: syslog() expects parameter 1 to be long, Unicode string given in %s on 
line %d

Warning: closelog() expects exactly 0 parameters, 1 given in %s on line %d



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

[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php

[PHP-CVS] cvs: php-src / run-tests.php

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/fileinfo/libmagic funcs.c softmagic.c

[PHP-CVS] cvs: php-src /ext/fileinfo/libmagic funcs.c softmagic.c

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

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

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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/spl spl_directory.c

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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/simplexml config.m4 config.w32 simplexml.c sxe.c sxe.h /ext/simplexml/tests bug42259.phpt sxe_001.phpt sxe_002.phpt sxe_003.phpt sxe_004.phpt sxe_005.phpt /ext/s

[PHP-CVS] cvs: php-src /ext/simplexml config.m4 config.w32 simplexml.c sxe.c sxe.h /ext/simplexml/tests bug42259.phpt sxe_001.phpt sxe_002.phpt sxe_003.phpt sxe_004.phpt sxe_005.phpt /ext/spl config

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pdo pdo_stmt.c /ext/pdo_sqlite/tests debugdumpparams_001.phpt

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pdo pdo_stmt.c /ext/pdo_sqlite/tests debugdumpparams_001.phpt

[PHP-CVS] cvs: php-src /ext/pdo pdo_stmt.c /ext/pdo_sqlite/tests debugdumpparams_001.phpt

[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/standard basic_functions.c basic_functions.h /ext/standard/tests/general_functions parse_ini_string_001.phpt parse_ini_string_002.phpt ZendEngine2 zend_i

[PHP-CVS] cvs: php-src /ext/standard basic_functions.c basic_functions.h /ext/standard/tests/general_functions parse_ini_string_001.phpt parse_ini_string_002.phpt ZendEngine2 zend_ini_scanner.l

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

[PHP-CVS] cvs: SVNROOT / phpsvn.options.skel run-conversion.php

[PHP-CVS] cvs: php-src(PHP_5_2) / README.TESTING2

[PHP-CVS] cvs: php-src(PHP_5_3) / README.TESTING2

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

Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/gd gd.c

Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/gd gd.c

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/date/lib parse_date.c parse_date.re /ext/date/tests date-parse-by-format001.phpt

[PHP-CVS] cvs: php-src /ext/date/lib parse_date.c parse_date.re /ext/date/tests date-parse-by-format001.phpt

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/misc syslog_basic.phpt syslog_parameters.phpt syslog_vars_variation1.phpt syslog_vars_variation2.phpt

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/misc syslog_basic.phpt syslog_parameters.phpt syslog_vars_variation1.phpt syslog_vars_variation2.phpt

[PHP-CVS] cvs: php-src /ext/standard/tests/misc syslog_basic.phpt syslog_parameters.phpt

28 matches

Site Navigation

Mail list logo

Footer information