[PHP-CVS] cvs: php-src /ext/sqlite/tests sqlite_oo_025.phpt
helly Mon Oct 27 03:43:26 2003 EDT Modified files: /php-src/ext/sqlite/tests sqlite_oo_025.phpt Log: Rename test Index: php-src/ext/sqlite/tests/sqlite_oo_025.phpt diff -u php-src/ext/sqlite/tests/sqlite_oo_025.phpt:1.1 php-src/ext/sqlite/tests/sqlite_oo_025.phpt:1.2 --- php-src/ext/sqlite/tests/sqlite_oo_025.phpt:1.1 Fri Oct 17 13:21:56 2003 +++ php-src/ext/sqlite/tests/sqlite_oo_025.phpt Mon Oct 27 03:43:25 2003 @@ -1,5 +1,5 @@ --TEST-- -sqlite-spl: sqlite / spl integration +sqlite-oo: sqlite / foreach --INI-- sqlite.assoc_case=0 --SKIPIF-- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite/tests sqlite_oo_026.phpt
helly Mon Oct 27 03:43:53 2003 EDT
Added files:
/php-src/ext/sqlite/tests sqlite_oo_026.phpt
Log:
Add another test
Index: php-src/ext/sqlite/tests/sqlite_oo_026.phpt
+++ php-src/ext/sqlite/tests/sqlite_oo_026.phpt
--TEST--
sqlite-oo: unbuffered
--INI--
sqlite.assoc_case=0
--SKIPIF--
--FILE--
query("CREATE TABLE strings(a VARCHAR)");
foreach ($data as $str) {
$db->query("INSERT INTO strings VALUES('$str')");
}
echo "FOREACH\n";
$r = $db->unbuffered_query("SELECT a from strings", SQLITE_NUM);
foreach($r as $idx => $row) {
var_dump($row[0]);
var_dump($row[0]);
}
echo "FOR\n";
$r = $db->unbuffered_query("SELECT a from strings", SQLITE_NUM);
for(;$r->hasMore(); $r->next()) {
$v = $r->column(0);
var_dump($v);
$c = $r->column(0);
var_dump(is_null($c) || $c==$v);
}
echo "===DONE===\n";
?>
--EXPECT--
FOREACH
string(3) "one"
string(3) "one"
string(3) "two"
string(3) "two"
string(5) "three"
string(5) "three"
FOR
string(3) "one"
bool(true)
string(3) "two"
bool(true)
string(5) "three"
bool(true)
===DONE===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/xsl/tests prepare.inc xslt.xml xslt.xsl xslt001.phpt xslt002.phpt xslt003.phpt xslt004.phpt xslt005.phpt xslt006.phpt xslt007.phpt
chregu Mon Oct 27 03:46:56 2003 EDT
Added files:
/php-src/ext/xsl/tests prepare.inc xslt.xml xslt.xsl xslt001.phpt
xslt002.phpt xslt003.phpt xslt004.phpt
xslt005.phpt xslt006.phpt xslt007.phpt
Log:
some tests (test #3 is currently broken due to memleak, fix is on the way)
Index: php-src/ext/xsl/tests/prepare.inc
+++ php-src/ext/xsl/tests/prepare.inc
load(dirname(__FILE__)."/xslt.xml");
if(!$dom) {
echo "Error while parsing the document\n";
exit;
}
$xsl = new domDocument;
$xsl->load(dirname(__FILE__)."/xslt.xsl");
if(!$xsl) {
echo "Error while parsing the document\n";
exit;
}
$proc = new xsltprocessor;
if(!$xsl) {
echo "Error while making xsltprocessor object\n";
exit;
}
?>
Index: php-src/ext/xsl/tests/xslt.xml
+++ php-src/ext/xsl/tests/xslt.xml
Title
a1
b1
c1
a2
c2
ä3
b3
c3
Index: php-src/ext/xsl/tests/xslt.xsl
+++ php-src/ext/xsl/tests/xslt.xsl
http://www.w3.org/1999/XSL/Transform"; >
Index: php-src/ext/xsl/tests/xslt001.phpt
+++ php-src/ext/xsl/tests/xslt001.phpt
--TEST--
Test 1: Transform To XML String
--FILE--
importStylesheet($xsl);
print "\n";
print $proc->transformToXml($dom);
print "\n";
--EXPECT--
Test 1: Transform To XML String
bar
a1 b1 c1
a2 c2
ä3 b3 c3
Index: php-src/ext/xsl/tests/xslt002.phpt
+++ php-src/ext/xsl/tests/xslt002.phpt
--TEST--
Test 2: Transform To HTML String
--FILE--
query("/xsl:stylesheet/xsl:output/@method");
if (count($res) != 1) {
print "No or more than one xsl:output/@method found";
exit;
}
$res[0]->value = "html";
$proc->importStylesheet($xsl);
print "\n";
print $proc->transformToXml($dom);
print "\n";
--EXPECT--
Test 2: Transform To HTML String
bar
a1 b1 c1
a2 c2
ä3 b3 c3
Index: php-src/ext/xsl/tests/xslt003.phpt
+++ php-src/ext/xsl/tests/xslt003.phpt
--TEST--
Test 1: Using Parameters
--FILE--
importStylesheet($xsl);
$proc->setParameter( "", "foo","hello world");
print "\n";
print $proc->transformToXml($dom);
print "\n";
--EXPECT--
Test 1: Transform To XML String
bar
a1 b1 c1
a2 c2
a3 b3 c3
Index: php-src/ext/xsl/tests/xslt004.phpt
+++ php-src/ext/xsl/tests/xslt004.phpt
--TEST--
Test 4: Checking UTF8 Output
--FILE--
query("/xsl:stylesheet/xsl:output/@encoding");
if (count($res) != 1) {
print "No or more than one xsl:output/@encoding found";
exit;
}
$res[0]->value = "utf-8";
$proc->importStylesheet($xsl);
print "\n";
print $proc->transformToXml($dom);
print "\n";
--EXPECT--
Test 4: Checking UTF8 Output
bar
a1 b1 c1
a2 c2
ä3 b3 c3
Index: php-src/ext/xsl/tests/xslt005.phpt
+++ php-src/ext/xsl/tests/xslt005.phpt
--TEST--
Test 5: Checking Indent
--FILE--
query("/xsl:stylesheet/xsl:output/@indent");
if (count($res) != 1) {
print "No or more than one xsl:output/@indent found";
exit;
}
$res[0]->value = "yes";
$proc->importStylesheet($xsl);
print "\n";
print $proc->transformToXml($dom);
print "\n";
--EXPECT--
Test 5: Checking Indent
bar
a1 b1 c1
a2 c2
ä3 b3 c3
Index: php-src/ext/xsl/tests/xslt006.phpt
+++ php-src/ext/xsl/tests/xslt006.phpt
--TEST--
Test 6: Transform To Doc
--FILE--
importStylesheet($xsl);
print "\n";
$doc = $proc->transformToDoc($dom);
print $doc->saveXML();
print "\n";
--EXPECT--
Test 6: Transform To Doc
bar
a1 b1 c1
a2 c2
ä3 b3 c3
Index: php-src/ext/xsl/tests/xslt007.phpt
+++ php-src/ext/xsl/tests/xslt007.phpt
--TEST--
Test 7: Transform To Uri
--FILE--
importStylesheet($xsl);
print "\n";
$doc = $proc->transformToUri($dom, "file://".dirname(__FILE__)."/out.xml");
print file_get_contents(dirname(__FILE__)."/out.xml");
unlink(dirname(__FILE__)."/out.xml");
print "\n";
--EXPECT--
Test 7: Transform To Uri
bar
a1 b1 c1
a2 c2
ä3 b3 c3
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/xsl/tests xslt003.phpt
chregu Mon Oct 27 03:49:12 2003 EDT Modified files: /php-src/ext/xsl/tests xslt003.phpt Log: totally wrong expected output... Index: php-src/ext/xsl/tests/xslt003.phpt diff -u php-src/ext/xsl/tests/xslt003.phpt:1.1 php-src/ext/xsl/tests/xslt003.phpt:1.2 --- php-src/ext/xsl/tests/xslt003.phpt:1.1 Mon Oct 27 03:46:55 2003 +++ php-src/ext/xsl/tests/xslt003.phpt Mon Oct 27 03:49:11 2003 @@ -1,8 +1,8 @@ --TEST-- -Test 1: Using Parameters +Test 3: Using Parameters --FILE-- importStylesheet($xsl); $proc->setParameter( "", "foo","hello world"); @@ -12,10 +12,10 @@ --EXPECT-- -Test 1: Transform To XML String +Test 3: Using Parameters -bar +hello world a1 b1 c1 a2 c2 -a3 b3 c3 +ä3 b3 c3 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mbstring mbstring.cmbstring.h/main rfc1867.c
On Sun, 26 Oct 2003, Moriyoshi Koizumi wrote: > > 3. the new implementation with libmbfl is well tested in PHP 5 > > since last August. > > I doubt it somewhat, since we haven't got no handful of reports from who > put beta with libmbfl in action. Yeah, I'm also doubting this. Let's not do it for 4.3.4 please as it requires atleast one more RC. Derick -- "Interpreting what the GPL actually means is a job best left to those that read the future by examining animal entrails." - Derick Rethans http://derickrethans.nl/ International PHP Magazine http://php-mag.net/ - -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dom/tests book.xml dom_import_simplexml.phpt
chregu Mon Oct 27 06:24:31 2003 EDT Added files: /php-src/ext/dom/tests book.xml dom_import_simplexml.phpt Log: interop test Index: php-src/ext/dom/tests/book.xml +++ php-src/ext/dom/tests/book.xml The Grapes of Wrath John Steinbeck The Pearl John Steinbeck Index: php-src/ext/dom/tests/dom_import_simplexml.phpt +++ php-src/ext/dom/tests/dom_import_simplexml.phpt --TEST-- Interop Test: Import from SimpleXML --SKIPIF-- --FILE-- ownerDocument->saveXML(); ?> --EXPECT-- The Grapes of Wrath John Steinbeck The Pearl John Steinbeck -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/xsl/tests xslt001.phpt xslt002.phpt xslt003.phpt xslt004.phpt xslt005.phpt xslt006.phpt xslt007.phpt
chregu Mon Oct 27 06:28:44 2003 EDT Modified files: /php-src/ext/xsl/tests xslt001.phpt xslt002.phpt xslt003.phpt xslt004.phpt xslt005.phpt xslt006.phpt xslt007.phpt Log: added SKIPIF extension is not loaded checks Index: php-src/ext/xsl/tests/xslt001.phpt diff -u php-src/ext/xsl/tests/xslt001.phpt:1.1 php-src/ext/xsl/tests/xslt001.phpt:1.2 --- php-src/ext/xsl/tests/xslt001.phpt:1.1 Mon Oct 27 03:46:55 2003 +++ php-src/ext/xsl/tests/xslt001.phpt Mon Oct 27 06:28:43 2003 @@ -1,5 +1,7 @@ --TEST-- Test 1: Transform To XML String +--SKIPIF-- + --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/simplexml/tests book.xml simplexml_import_dom.phpt
chregu Mon Oct 27 06:34:46 2003 EDT
Added files:
/php-src/ext/simplexml/testsbook.xml simplexml_import_dom.phpt
Log:
added interop test
Index: php-src/ext/simplexml/tests/book.xml
+++ php-src/ext/simplexml/tests/book.xml
The Grapes of Wrath
John Steinbeck
The Pearl
John Steinbeck
Index: php-src/ext/simplexml/tests/simplexml_import_dom.phpt
+++ php-src/ext/simplexml/tests/simplexml_import_dom.phpt
--TEST--
Interop: simplexml_import_dom
--SKIPIF--
--FILE--
load(dirname(__FILE__)."/book.xml");
if(!$dom) {
echo "Error while parsing the document\n";
exit;
}
$s = simplexml_import_dom($dom);
$books = $s->book;
foreach ($books as $book) {
echo "{$book->title} was written by {$book->author}\n";
}
?>
--EXPECT--
The Grapes of Wrath was written by John Steinbeck
The Pearl was written by John Steinbeck
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/xsl xsltprocessor.c
chregu Mon Oct 27 07:16:35 2003 EDT
Modified files:
/php-src/ext/xslxsltprocessor.c
Log:
fix for test Nr 3 bug (not freeing all params)
Index: php-src/ext/xsl/xsltprocessor.c
diff -u php-src/ext/xsl/xsltprocessor.c:1.14 php-src/ext/xsl/xsltprocessor.c:1.15
--- php-src/ext/xsl/xsltprocessor.c:1.14Sun Oct 26 10:57:31 2003
+++ php-src/ext/xsl/xsltprocessor.c Mon Oct 27 07:16:35 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: xsltprocessor.c,v 1.14 2003/10/26 15:57:31 rrichards Exp $ */
+/* $Id: xsltprocessor.c,v 1.15 2003/10/27 12:16:35 chregu Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -103,7 +103,7 @@
if (!xpath_params) {
xpath_expr =
php_xsl_xslt_string_to_xpathexpr(Z_STRVAL_PP(value) TSRMLS_CC);
} else {
- xpath_expr = Z_STRVAL_PP(value);
+ xpath_expr = estrndup(Z_STRVAL_PP(value),
strlen(Z_STRVAL_PP(value)));
}
if (xpath_expr) {
params[i++] = string_key;
@@ -207,6 +207,10 @@
}
if (params) {
+ clone = 0;
+ while(params[clone]) {
+ efree(params[clone++]);
+ }
efree(params);
}
@@ -258,6 +262,10 @@
}
if (params) {
+ clone = 0;
+ while(params[clone]) {
+ efree(params[clone++]);
+ }
efree(params);
}
@@ -311,6 +319,10 @@
}
if (params) {
+ clone = 0;
+ while(params[clone]) {
+ efree(params[clone++]);
+ }
efree(params);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/xsl/tests skipif.inc
chregu Mon Oct 27 07:17:29 2003 EDT Added files: /php-src/ext/xsl/tests skipif.inc Log: forgot one file Index: php-src/ext/xsl/tests/skipif.inc +++ php-src/ext/xsl/tests/skipif.inc -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dom/tests dom003.phpt
chregu Mon Oct 27 07:52:38 2003 EDT
Added files:
/php-src/ext/dom/tests dom003.phpt
Log:
exception/try/catch test
Index: php-src/ext/dom/tests/dom003.phpt
+++ php-src/ext/dom/tests/dom003.phpt
--TEST--
Test 3: Exception Test
--SKIPIF--
--FILE--
load(dirname(__FILE__)."/book.xml");
$rootNode = $dom->documentElement;
print "--- Catch exception with try/catch\n";
try {
$rootNode->appendChild($rootNode);
} catch (domexception $e) {
var_dump($e);
}
print "--- Don't catch exception with try/catch\n";
$rootNode->appendChild($rootNode);
?>
--EXPECTF--
--- Catch exception with try/catch
object(domexception)#3 (7) {
[""]=>
string(23) "Hierarchy Request Error"
[""]=>
string(0) ""
[""]=>
string(%d) "%s"
[""]=>
int(8)
[""]=>
NULL
["code"]=>
int(3)
["trace"]=>
array(0) {
}
}
--- Don't catch exception with try/catch
Fatal error: Uncaught exception 'domexception' with message 'Hierarchy Request Error'
in %s/dom003.php:%d
Stack trace:
#0 {main}
thrown in %s/dom003.php on line %d
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS /ext/standard basic_functions.cconfig.m4 php_uuencode.h uuencode.c
Ilia, Could you give me some time to reimplement uu*code function to be more suitable for stream operations? Maybe it'd be a good idea to make them available as stream filters also. BTW, as for their names, I prefer convert_uu_encode() / convert_uu_decode(), as I'm thinking of introducing more generic string conversion facility. Moriyoshi "Ilia Alshanetsky" <[EMAIL PROTECTED]> wrote: > iliaa Mon Oct 27 00:35:42 2003 EDT > > Added files: > /php-src/ext/standard uuencode.c php_uuencode.h > > Modified files: > /php-src NEWS > /php-src/ext/standard basic_functions.c config.m4 > Log: > Added uuencode() & uudecode() functions. > > > > -- > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
sniper Mon Oct 27 10:04:02 2003 EDT Modified files: /php-srcNEWS Log: hrm Index: php-src/NEWS diff -u php-src/NEWS:1.1479 php-src/NEWS:1.1480 --- php-src/NEWS:1.1479 Mon Oct 27 00:35:40 2003 +++ php-src/NEWSMon Oct 27 10:04:01 2003 @@ -45,8 +45,8 @@ (Sterling) - Fixed visibility of __construct and __clone. (Marcus) - Fixed bug #25756 (SimpleXML's validate_schema_file() broken). (Moriyoshi) -- Fixed bug #25581 (getimagesize () return incorrect values on bitmap (os2) - files) (Marcus) +- Fixed bug #25581 (getimagesize() returns incorrect values on bitmap (os2) + files). (Marcus) - Fixed bug #25494 (array_merge*() allows non-arrays as argument). (Jay) - Fixed bug #24766 (strange result array from unpack()). (Moriyoshi) - Fixed bug #24729 ($obj = new $className; causes crash when $className is not @@ -54,7 +54,7 @@ - Fixed bug #24565 (cannot read array elements received via $_REQUEST). (Zeev) - Fixed bug #24445 (get_parent_class() returns different values). (Sterling, Stanislav) -- Fixed bug #24403 (preg_replace() problem: Using $this when not in object +- Fixed bug #24403 (preg_replace() problem: Using $this when not in object context). (Zeev) - Fixed bug #24399 (PEAR DB isError crash [instanceof_function fault?]). (Sterling, Marcus) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/xsl/tests documentxpath.xsl streamsinclude.xsl xslt.xsl.gz xslt008.phpt xslt009.phpt
chregu Mon Oct 27 10:12:22 2003 EDT
Added files:
/php-src/ext/xsl/tests documentxpath.xsl streamsinclude.xsl
xslt.xsl.gz xslt008.phpt xslt009.phpt
Log:
- streams test
Index: php-src/ext/xsl/tests/documentxpath.xsl
+++ php-src/ext/xsl/tests/documentxpath.xsl
http://www.w3.org/1999/XSL/Transform"; >
Index: php-src/ext/xsl/tests/streamsinclude.xsl
+++ php-src/ext/xsl/tests/streamsinclude.xsl
http://www.w3.org/1999/XSL/Transform"; >
Index: php-src/ext/xsl/tests/xslt.xsl.gz
+++ php-src/ext/xsl/tests/xslt.xsl.gz
Û?xslt.xsluRM0½çWLH{©ØmÚ{ê¡Roí¡W&ÉØ=äß×ìfY²Úp°üæ}âùÜk85¥ÈTÚ69¢ Vn·ÌÄsµ*¾H
ë_Mç 9Ç×dIiúY? Ýæß¾çÔ§ã?ÏÖ eÜø<ðEShøftaB !¥h]8c2>%Ö 1ÛívøïÏoüë
ë{Õ
âóBjvôÄmJ¹îÎ4d¸Æ
\08åUFõTµiª#îa¯üéwZ1A¯¸nKâzÙr¯¯ãÞ6×q^;)=´y=é`uå
--FILE--
load(dirname(__FILE__)."/streamsinclude.xsl");
if(!$xsl) {
echo "Error while parsing the document\n";
exit;
}
$xp = new domxpath($xsl);
$res = $xp->query("/xsl:stylesheet/xsl:include/@href");
$res[0]->value = "compress.zlib://".dirname(__FILE__)."/xslt.xsl.gz";
$proc->importStylesheet($xsl);
print "\n";
print $proc->transformToXML($dom);
--EXPECT--
Test 8: Stream Wrapper Includes
bar
a1 b1 c1
a2 c2
ä3 b3 c3
Index: php-src/ext/xsl/tests/xslt009.phpt
+++ php-src/ext/xsl/tests/xslt009.phpt
--TEST--
Test 9: Stream Wrapper XPath-Document()
--SKIPIF--
--FILE--
load(dirname(__FILE__)."/documentxpath.xsl");
if(!$xsl) {
echo "Error while parsing the document\n";
exit;
}
$proc->importStylesheet($xsl);
print "\n";
print $proc->transformToXML($dom);
--EXPECT--
Test 9: Stream Wrapper XPath-Document()
foo
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dom/tests book.xml.gz dom004.phpt
chregu Mon Oct 27 10:13:13 2003 EDT
Added files:
/php-src/ext/dom/tests book.xml.gz dom004.phpt
Log:
streams test
Index: php-src/ext/dom/tests/book.xml.gz
+++ php-src/ext/dom/tests/book.xml.gz
n?book.xml³IÊÏÏ.¶ãR°1´MIfINª]HFª{QbAj±B~BxQbI>D
¤(±´$#¿ÈÎ+?#O!¸$53/)59ÛF * 4N j 6sRrÈ1B @ $·
Index: php-src/ext/dom/tests/dom004.phpt
+++ php-src/ext/dom/tests/dom004.phpt
--TEST--
Test 4: Streams Test
--SKIPIF--
--FILE--
load("compress.zlib://".dirname(__FILE__)."/book.xml.gz");
print $dom->saveXML();
--EXPECT--
The Grapes of Wrath
John Steinbeck
The Pearl
John Steinbeck
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dom document.c dom_fe.h
chregu Mon Oct 27 10:32:23 2003 EDT
Modified files:
/php-src/ext/domdocument.c dom_fe.h
Log:
xinclude support readded to ext/dom
Index: php-src/ext/dom/document.c
diff -u php-src/ext/dom/document.c:1.34 php-src/ext/dom/document.c:1.35
--- php-src/ext/dom/document.c:1.34 Sun Oct 26 19:03:28 2003
+++ php-src/ext/dom/document.c Mon Oct 27 10:32:22 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: document.c,v 1.34 2003/10/27 00:03:28 chregu Exp $ */
+/* $Id: document.c,v 1.35 2003/10/27 15:32:22 chregu Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -81,6 +81,7 @@
PHP_FALIAS(saveXML, dom_document_savexml, NULL)
PHP_FALIAS(domdocument, dom_document_document, NULL)
PHP_FALIAS(validate, dom_document_validate, NULL)
+ PHP_FALIAS(xinclude, dom_document_xinclude, NULL)
#if defined(LIBXML_HTML_ENABLED)
PHP_FALIAS(loadHTML, dom_document_load_html, NULL)
PHP_FALIAS(loadHTMLFile, dom_document_load_html_file, NULL)
@@ -1510,6 +1511,28 @@
}
}
/* }}} end dom_document_savexml */
+
+/* {{{ proto int dom_document_xinclude()
+ Substitutues xincludes in a DomDocument */
+PHP_FUNCTION(dom_document_xinclude)
+{
+ zval *id;
+ xmlDoc *docp;
+ int err;
+ dom_object *intern;
+
+ DOM_GET_THIS_OBJ(docp, id, xmlDocPtr, intern);
+
+ err = xmlXIncludeProcess (docp);
+
+ if (err) {
+ RETVAL_LONG(err);
+ } else {
+ RETVAL_FALSE;
+ }
+
+}
+
/* {{{ proto string domnode dom_document_validate();
Since: DOM extended
Index: php-src/ext/dom/dom_fe.h
diff -u php-src/ext/dom/dom_fe.h:1.6 php-src/ext/dom/dom_fe.h:1.7
--- php-src/ext/dom/dom_fe.h:1.6Sun Oct 5 16:45:26 2003
+++ php-src/ext/dom/dom_fe.hMon Oct 27 10:32:22 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: dom_fe.h,v 1.6 2003/10/05 20:45:26 shane Exp $ */
+/* $Id: dom_fe.h,v 1.7 2003/10/27 15:32:22 chregu Exp $ */
#ifndef DOM_FE_H
#define DOM_FE_H
@@ -126,6 +126,7 @@
PHP_FUNCTION(dom_document_loadxml);
PHP_FUNCTION(dom_document_savexml);
PHP_FUNCTION(dom_document_validate);
+PHP_FUNCTION(dom_document_xinclude);
#if defined(LIBXML_HTML_ENABLED)
PHP_FUNCTION(dom_document_load_html);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dom/tests book.xml dom_xinclude.phpt xinclude.xml
chregu Mon Oct 27 10:32:45 2003 EDT Added files: /php-src/ext/dom/tests dom_xinclude.phpt xinclude.xml Modified files: /php-src/ext/dom/tests book.xml Log: xinclude test Index: php-src/ext/dom/tests/book.xml diff -u php-src/ext/dom/tests/book.xml:1.1 php-src/ext/dom/tests/book.xml:1.2 --- php-src/ext/dom/tests/book.xml:1.1 Mon Oct 27 06:24:30 2003 +++ php-src/ext/dom/tests/book.xml Mon Oct 27 10:32:44 2003 @@ -1,3 +1,4 @@ + The Grapes of Wrath Index: php-src/ext/dom/tests/dom_xinclude.phpt +++ php-src/ext/dom/tests/dom_xinclude.phpt --TEST-- Test: Xinclude and Streams --SKIPIF-- --FILE-- load(dirname(__FILE__)."/xinclude.xml"); $dom->xinclude(); print $dom->saveXML(); --EXPECT-- http://www.w3.org/2001/XInclude";> The Grapes of Wrath John Steinbeck The Pearl John Steinbeck Index: php-src/ext/dom/tests/xinclude.xml +++ php-src/ext/dom/tests/xinclude.xml http://www.w3.org/2001/XInclude";> -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32 php4dllts.dsp
andiMon Oct 27 10:49:12 2003 EDT Modified files: /php-src/win32 php4dllts.dsp Log: - Add uuencode.c to the project Index: php-src/win32/php4dllts.dsp diff -u php-src/win32/php4dllts.dsp:1.135 php-src/win32/php4dllts.dsp:1.136 --- php-src/win32/php4dllts.dsp:1.135 Sun Oct 19 17:48:44 2003 +++ php-src/win32/php4dllts.dsp Mon Oct 27 10:49:11 2003 @@ -255,6 +255,10 @@ SOURCE=..\main\strlcpy.c # End Source File +# Begin Source File + +SOURCE=..\ext\standard\uuencode.c +# End Source File # End Group # Begin Group "Header Files" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS /ext/standard basic_functions.cconfig.m4 php_uuencode.h uuencode.c
At 11:57 PM 10/27/2003 +0900, Moriyoshi Koizumi wrote: Ilia, Could you give me some time to reimplement uu*code function to be more suitable for stream operations? Maybe it'd be a good idea to make them available as stream filters also. BTW, as for their names, I prefer convert_uu_encode() / convert_uu_decode(), as I'm thinking of introducing more generic string conversion facility. Sounds good to me although I'd probably go with convert_uuencode() convert_uudecode as uuencode/uudecode are pretty much nouns. Andi Moriyoshi "Ilia Alshanetsky" <[EMAIL PROTECTED]> wrote: > iliaa Mon Oct 27 00:35:42 2003 EDT > > Added files: > /php-src/ext/standard uuencode.c php_uuencode.h > > Modified files: > /php-src NEWS > /php-src/ext/standard basic_functions.c config.m4 > Log: > Added uuencode() & uudecode() functions. > > > > -- > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS /ext/standard basic_functions.cconfig.m4 php_uuencode.h uuencode.c
Moriyoshi, I originally had a uuencode filter, however with the current code I get a far superior performance by being to do certain tricks such as pre-allocation. The most common place uuencoded strings are found are mail & nntp. In those cases the data usually comes is a form of a string rather then a stream, because the entire uuencoded bit has to be 1st parsed out. So, I think the current code has it own merits. That said for 'completion' purposes having uu* stream filter is not a bad idea. Ilia On October 27, 2003 09:57 am, Moriyoshi Koizumi wrote: > Ilia, > > Could you give me some time to reimplement uu*code function to be more > suitable for stream operations? Maybe it'd be a good idea to make them > available as stream filters also. > > BTW, as for their names, I prefer convert_uu_encode() / > convert_uu_decode(), as I'm thinking of introducing more generic string > conversion facility. > > Moriyoshi > > "Ilia Alshanetsky" <[EMAIL PROTECTED]> wrote: > > iliaa Mon Oct 27 00:35:42 2003 EDT > > > > Added files: > > /php-src/ext/standard uuencode.c php_uuencode.h > > > > Modified files: > > /php-srcNEWS > > /php-src/ext/standard basic_functions.c config.m4 > > Log: > > Added uuencode() & uudecode() functions. > > > > > > > > -- > > > > -- > > PHP CVS Mailing List (http://www.php.net/) > > To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mbstring mbstring.cmbstring.h/main rfc1867.c
To summarize this discussion could you please verify that the patch now committed does in fact completely fix the licensing issue. From some of the previous comments (maybe I misunderstood) it seems that new code is too not entirely license safe (??). Thanks, Ilia P.S. Did you see the patch by Joe Orton on internals, it seems that there is a compile problem with mbregex. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS /ext/standard basic_functions.cconfig.m4php_uuencode.h uuencode.c
Ilia Alshanetsky <[EMAIL PROTECTED]> wrote: > Moriyoshi, > > I originally had a uuencode filter, however with the current code I get a far > superior performance by being to do certain tricks such as pre-allocation. > The most common place uuencoded strings are found are mail & nntp. In those > cases the data usually comes is a form of a string rather then a stream, > because the entire uuencoded bit has to be 1st parsed out. > So, I think the current code has it own merits. That said for 'completion' > purposes having uu* stream filter is not a bad idea. Indeed. The current code is well optimised for in-memory operations. However, I don't think it's a good idea to have two differen things that do the virtually same.. Anyway can I see your version of the uuencode filter? Moriyoshi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dom/tests dom005.phpt test.html
chregu Mon Oct 27 12:36:45 2003 EDT Added files: /php-src/ext/dom/tests dom005.phpt test.html Log: added html test Index: php-src/ext/dom/tests/dom005.phpt +++ php-src/ext/dom/tests/dom005.phpt --TEST-- Test 5: HTML Test --SKIPIF-- --FILE-- loadHTMLFile(dirname(__FILE__)."/test.html"); print "--- save as XML\n"; print $dom->saveXML(); print "--- save as HTML\n"; print $dom->saveHTML(); --EXPECT-- --- save as XML http://www.w3.org/TR/REC-html40/loose.dtd";> Hello world This is a not well-formed html files with undeclared entities --- save as HTML http://www.w3.org/TR/REC-html40/loose.dtd";> Hello world This is a not well-formed html files with undeclared entities Index: php-src/ext/dom/tests/test.html +++ php-src/ext/dom/tests/test.html Hello world This is a not well-formed html files with undeclared entities -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mbstring mbstring.cmbstring.h/mainrfc1867.c
Ilia Alshanetsky <[EMAIL PROTECTED]> wrote: > To summarize this discussion could you please verify that the patch now > committed does in fact completely fix the licensing issue. From some of the > previous comments (maybe I misunderstood) it seems that new code is too not > entirely license safe (??). Rui once had a talk with the author of mbfilter about this forked stuff (libmbfl) and the author appears to have accepted our choice. >From what comment did you think it is not completely free from this issue? (if you can remimd me of any) Moriyoshi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mbstring mbstring.cmbstring.h/mainrfc1867.c
On October 27, 2003 12:44 pm, Moriyoshi Koizumi wrote: > From what comment did you think it is not completely free from this > issue? (if you can remimd me of any) I guess the bit about temporary agreements, etc... through me off. Anyhow if we are clear license wise, then great. I'll talk with edin and try to get RC3 rolled out either this evening or tomorrow morning. Ilia -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/mbstring config.m4
moriyoshi Mon Oct 27 12:50:09 2003 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/mbstring config.m4 Log: Fix VPATH build (patch by Joe Orton ) Index: php-src/ext/mbstring/config.m4 diff -u php-src/ext/mbstring/config.m4:1.28.2.4 php-src/ext/mbstring/config.m4:1.28.2.5 --- php-src/ext/mbstring/config.m4:1.28.2.4 Sat Oct 25 23:42:27 2003 +++ php-src/ext/mbstring/config.m4 Mon Oct 27 12:50:07 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.28.2.4 2003/10/26 03:42:27 moriyoshi Exp $ +dnl $Id: config.m4,v 1.28.2.5 2003/10/27 17:50:07 moriyoshi Exp $ dnl AC_DEFUN([PHP_MBSTRING_ADD_SOURCES], [ @@ -53,6 +53,7 @@ AC_DEFINE([HAVE_MBREGEX], 1, [whether to have multibyte regex support]) PHP_MBSTRING_ADD_INCLUDE([mbregex]) +PHP_MBSTRING_ADD_BUILD_DIR([mbregex]) PHP_MBSTRING_ADD_SOURCES([ php_mbregex.c -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dom/tests dom006.phpt
chregu Mon Oct 27 12:51:56 2003 EDT
Added files:
/php-src/ext/dom/tests dom006.phpt
Log:
extending of domDocument class test
Index: php-src/ext/dom/tests/dom006.phpt
+++ php-src/ext/dom/tests/dom006.phpt
--TEST--
Test 6: Extends Test
--SKIPIF--
--FILE--
createElement("title");
$titleElement->appendChild($this->createTextNode($title));
$authorElement = $this->createElement("author");
$authorElement->appendChild($this->createTextNode($author));
$bookElement = $this->createElement("book");
$bookElement->appendChild($titleElement);
$bookElement->appendChild($authorElement);
$this->documentElement->appendChild($bookElement);
}
}
$dom = new books;
$dom->load(dirname(__FILE__)."/book.xml");
$dom->addBook("PHP de Luxe", "Richard Samar, Christian Stocker");
print $dom->saveXML();
--EXPECT--
The Grapes of Wrath
John Steinbeck
The Pearl
John Steinbeck
PHP de LuxeRichard Samar, Christian
Stocker
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mbstring mbstring.cmbstring.h/mainrfc1867.c
Ilia Alshanetsky <[EMAIL PROTECTED]> wrote: > On October 27, 2003 12:44 pm, Moriyoshi Koizumi wrote: > > From what comment did you think it is not completely free from this > > issue? (if you can remimd me of any) > > I guess the bit about temporary agreements, etc... through me off. Anyhow if > we are clear license wise, then great. I'll talk with edin and try to get RC3 > rolled out either this evening or tomorrow morning. Ah, I see. What he mentioned as a "temporary agreement" is that the author permitted us to release that mutant till the libmbfl is confirmed to be stable. Now we have a clean one, I reckon there should be no such concern like you have. Thanks, Moriyoshi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /tests/lang bug25831.phpt
moriyoshi Mon Oct 27 13:14:04 2003 EDT Removed files: (Branch: PHP_4_3) /php-src/tests/lang bug25831.phpt Log: Remove test because the problem won't be fixed for 4.x releases. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS /ext/standard basic_functions.cconfig.m4php_uuencode.h uuencode.c
On October 27, 2003 12:34 pm, Moriyoshi Koizumi wrote: > Indeed. The current code is well optimised for in-memory > operations. However, I don't think it's a good idea to have two > differen things that do the virtually same.. Anyway can I see your > version of the uuencode filter? I'll check my backups, I think I still got the code somewhere :). Ilia -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/apache2handler mod_php5.c
sniper Mon Oct 27 14:05:03 2003 EDT Modified files: /php-src/sapi/apache2handlermod_php5.c Log: - Fix win32 build. Index: php-src/sapi/apache2handler/mod_php5.c diff -u php-src/sapi/apache2handler/mod_php5.c:1.1 php-src/sapi/apache2handler/mod_php5.c:1.2 --- php-src/sapi/apache2handler/mod_php5.c:1.1 Tue Oct 21 07:48:31 2003 +++ php-src/sapi/apache2handler/mod_php5.c Mon Oct 27 14:05:01 2003 @@ -18,8 +18,10 @@ +--+ */ -/* $Id: mod_php5.c,v 1.1 2003/10/21 11:48:31 sniper Exp $ */ +/* $Id: mod_php5.c,v 1.2 2003/10/27 19:05:01 sniper Exp $ */ +#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS + #include "php.h" #include "php_apache.h" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dom document.c
chregu Mon Oct 27 14:52:50 2003 EDT
Modified files:
/php-src/ext/domdocument.c
Log:
use php_error_docref
Index: php-src/ext/dom/document.c
diff -u php-src/ext/dom/document.c:1.35 php-src/ext/dom/document.c:1.36
--- php-src/ext/dom/document.c:1.35 Mon Oct 27 10:32:22 2003
+++ php-src/ext/dom/document.c Mon Oct 27 14:52:50 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: document.c,v 1.35 2003/10/27 15:32:22 chregu Exp $ */
+/* $Id: document.c,v 1.36 2003/10/27 19:52:50 chregu Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -122,7 +122,7 @@
xmlParserCtxtPtr parser;
parser = (xmlParserCtxtPtr) ctx;
- php_error(level, "%s in %s, line: %d", msg, parser->input->filename,
parser->input->line);
+ php_error_docref(NULL TSRMLS_CC, level, "%s in %s, line: %d", msg,
parser->input->filename, parser->input->line);
}
/* }}} end php_dom_ctx_error */
@@ -1754,7 +1754,7 @@
source_len = xmlStrlen(source);
ctxt = htmlCreateMemoryParserCtxt(source, source_len);
}
- ctxt->vctxt.error = php_dom_ctx_warning;
+ ctxt->vctxt.error = php_dom_ctx_error;
ctxt->vctxt.warning = php_dom_ctx_warning;
if (ctxt->sax != NULL) {
ctxt->sax->error = php_dom_ctx_error;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mbstring mbstring.cmbstring.h/main rfc1867.c
I think the patch commited now fix the licensing incompatibility as Moriyoshi said. Rui On Mon, 27 Oct 2003 13:09:18 -0400 Ilia Alshanetsky <[EMAIL PROTECTED]> wrote: > To summarize this discussion could you please verify that the patch now > committed does in fact completely fix the licensing issue. From some of the > previous comments (maybe I misunderstood) it seems that new code is too not > entirely license safe (??). > > Thanks, > > Ilia > > P.S. Did you see the patch by Joe Orton on internals, it seems that there is > a compile problem with mbregex. -- Rui Hirokawa <[EMAIL PROTECTED]> -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mbstring mbstring.cmbstring.h/main rfc1867.c
Perfect, thanks for letting me know. On October 27, 2003 05:20 pm, Rui Hirokawa wrote: > I think the patch commited now fix the licensing incompatibility > as Moriyoshi said. > > Rui -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard file.c
moriyoshi Mon Oct 27 17:36:45 2003 EDT
Modified files:
/php-src/ext/standard file.c
Log:
Fixed bug #26003 (fgetcsv() not binary-safe on null bytes)
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.362 php-src/ext/standard/file.c:1.363
--- php-src/ext/standard/file.c:1.362 Sun Oct 5 09:59:15 2003
+++ php-src/ext/standard/file.c Mon Oct 27 17:36:44 2003
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.362 2003/10/05 13:59:15 moriyoshi Exp $ */
+/* $Id: file.c,v 1.363 2003/10/27 22:36:44 moriyoshi Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -1723,10 +1723,11 @@
static const char *php_fgetcsv_lookup_trailing_spaces(const char *ptr, size_t len,
const char delimiter TSRMLS_DC)
{
int inc_len;
- size_t cnt = 0;
+ unsigned char last_chars[2] = { 0, 0 };
while (len > 0) {
- switch ((inc_len = _php_mblen(ptr, len))) {
+ inc_len = (*ptr == '\0' ? 1: _php_mblen(ptr, len));
+ switch (inc_len) {
case -2:
case -1:
inc_len = 1;
@@ -1734,20 +1735,25 @@
case 0:
goto quit_loop;
case 1:
- if (delimiter != *ptr && isspace((int)*(const unsigned
char *)ptr)) {
- cnt++;
- break;
- }
- /* break is omitted intentionally */
default:
- cnt = 0;
+ last_chars[0] = last_chars[1];
+ last_chars[1] = *ptr;
break;
}
ptr += inc_len;
len -= inc_len;
}
quit_loop:
- return ptr - cnt;
+ switch (last_chars[1]) {
+ case '\n':
+ if (last_chars[0] == '\r') {
+ return ptr - 2;
+ }
+ /* break is omitted intentionally */
+ case '\r':
+ return ptr - 1;
+ }
+ return ptr;
}
/* {{{ proto array fgetcsv(resource fp [,int length [, string delimiter [, string
enclosure]]])
@@ -1853,7 +1859,7 @@
/* 1. Strip any leading space */
for (;;) {
- inc_len = (bptr < limit ? _php_mblen(bptr, limit - bptr): 0);
+ inc_len = (bptr < limit ? (*bptr == '\0' ? 1: _php_mblen(bptr,
limit - bptr)): 0);
switch (inc_len) {
case -2:
case -1:
@@ -1882,7 +1888,7 @@
/* 2A. handle enclosure delimited field */
for (;;) {
- inc_len = (bptr < limit ? _php_mblen(bptr, limit -
bptr): 0);
+ inc_len = (bptr < limit ? (*bptr == '\0' ? 1:
_php_mblen(bptr, limit - bptr)): 0);
switch (inc_len) {
case 0:
switch (state) {
@@ -2019,7 +2025,7 @@
break;
}
bptr += inc_len;
- inc_len = (bptr < limit ? _php_mblen(bptr, limit -
bptr): 0);
+ inc_len = (bptr < limit ? (*bptr == '\0' ? 1:
_php_mblen(bptr, limit - bptr)): 0);
}
quit_loop_3:
comp_end = tptr;
@@ -2033,7 +2039,7 @@
hunk_begin = bptr;
for (;;) {
- inc_len = (bptr < limit ? _php_mblen(bptr, limit -
bptr): 0);
+ inc_len = (bptr < limit ? (*bptr == '\0' ? 1:
_php_mblen(bptr, limit - bptr)): 0);
switch (inc_len) {
case 0:
goto quit_loop_4;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard file.c
moriyoshi Mon Oct 27 17:45:59 2003 EDT Modified files: /php-src/ext/standard file.c Log: Add missing reinitialization call Index: php-src/ext/standard/file.c diff -u php-src/ext/standard/file.c:1.363 php-src/ext/standard/file.c:1.364 --- php-src/ext/standard/file.c:1.363 Mon Oct 27 17:36:44 2003 +++ php-src/ext/standard/file.c Mon Oct 27 17:45:58 2003 @@ -21,7 +21,7 @@ +--+ */ -/* $Id: file.c,v 1.363 2003/10/27 22:36:44 moriyoshi Exp $ */ +/* $Id: file.c,v 1.364 2003/10/27 22:45:58 moriyoshi Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -1731,6 +1731,7 @@ case -2: case -1: inc_len = 1; + _php_mblen(NULL, 0); break; case 0: goto quit_loop; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS /ext/standard basic_functions.c php_uuencode.h uuencode.c
iliaa Mon Oct 27 23:02:12 2003 EDT
Modified files:
/php-srcNEWS
/php-src/ext/standard php_uuencode.h uuencode.c basic_functions.c
Log:
By popular demand renaming uu(encode/decode) to convert_uu(encode/decode).
Index: php-src/NEWS
diff -u php-src/NEWS:1.1480 php-src/NEWS:1.1481
--- php-src/NEWS:1.1480 Mon Oct 27 10:04:01 2003
+++ php-src/NEWSMon Oct 27 23:02:11 2003
@@ -32,8 +32,8 @@
. array_udiff_assoc(). (Andrey)
. array_udiff_uassoc(). (Andrey)
. array_diff_uassoc(). (Andrey)
- . uuencode(). (Ilia)
- . uudecode(). (Ilia)
+ . convert_uuencode(). (Ilia)
+ . convert_uudecode(). (Ilia)
- Added "resume_pos" context option to "ftp://"; wrapper. (Sara)
- Added optional parameter to OCIWriteTemporaryLob() to specify the type of LOB
(Patch by Novicky Marek <[EMAIL PROTECTED]>). (Thies)
Index: php-src/ext/standard/php_uuencode.h
diff -u php-src/ext/standard/php_uuencode.h:1.1 php-src/ext/standard/php_uuencode.h:1.2
--- php-src/ext/standard/php_uuencode.h:1.1 Mon Oct 27 00:35:41 2003
+++ php-src/ext/standard/php_uuencode.h Mon Oct 27 23:02:11 2003
@@ -16,13 +16,13 @@
+--+
*/
-/* $Id: php_uuencode.h,v 1.1 2003/10/27 05:35:41 iliaa Exp $ */
+/* $Id: php_uuencode.h,v 1.2 2003/10/28 04:02:11 iliaa Exp $ */
#ifndef PHP_UUENCODE_H
#define PHP_UUENCODE_H
-PHP_FUNCTION(uudecode);
-PHP_FUNCTION(uuencode);
+PHP_FUNCTION(convert_uudecode);
+PHP_FUNCTION(convert_uuencode);
PHPAPI int php_uudecode(char *src, int src_len, char **dest);
PHPAPI int php_uuencode(char *src, int src_len, char **dest);
Index: php-src/ext/standard/uuencode.c
diff -u php-src/ext/standard/uuencode.c:1.1 php-src/ext/standard/uuencode.c:1.2
--- php-src/ext/standard/uuencode.c:1.1 Mon Oct 27 00:35:41 2003
+++ php-src/ext/standard/uuencode.c Mon Oct 27 23:02:11 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: uuencode.c,v 1.1 2003/10/27 05:35:41 iliaa Exp $ */
+/* $Id: uuencode.c,v 1.2 2003/10/28 04:02:11 iliaa Exp $ */
/*
* Portions of this code are based on Berkeley's uuencode/uudecode
@@ -172,7 +172,7 @@
/* {{{ proto string uuencode(string data)
uuencode a string */
-PHP_FUNCTION(uuencode)
+PHP_FUNCTION(convert_uuencode)
{
char *src, *dst;
int src_len, dst_len;
@@ -189,7 +189,7 @@
/* {{{ proto string uudecode(string data)
decode a uuencoded string */
-PHP_FUNCTION(uudecode)
+PHP_FUNCTION(convert_uudecode)
{
char *src, *dst;
int src_len, dst_len;
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.635
php-src/ext/standard/basic_functions.c:1.636
--- php-src/ext/standard/basic_functions.c:1.635Mon Oct 27 00:35:41 2003
+++ php-src/ext/standard/basic_functions.c Mon Oct 27 23:02:11 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.635 2003/10/27 05:35:41 iliaa Exp $ */
+/* $Id: basic_functions.c,v 1.636 2003/10/28 04:02:11 iliaa Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -490,8 +490,8 @@
PHP_FE(base64_decode,
NULL)
PHP_FE(base64_encode,
NULL)
- PHP_FE(uuencode,
NULL)
- PHP_FE(uudecode,
NULL)
+ PHP_FE(convert_uuencode,
NULL)
+ PHP_FE(convert_uudecode,
NULL)
PHP_FE(abs,
NULL)
PHP_FE(ceil,
NULL)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dom document.c
shane Mon Oct 27 23:21:30 2003 EDT
Modified files:
/php-src/ext/domdocument.c
Log:
fix win32 build
Index: php-src/ext/dom/document.c
diff -u php-src/ext/dom/document.c:1.36 php-src/ext/dom/document.c:1.37
--- php-src/ext/dom/document.c:1.36 Mon Oct 27 14:52:50 2003
+++ php-src/ext/dom/document.c Mon Oct 27 23:21:29 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: document.c,v 1.36 2003/10/27 19:52:50 chregu Exp $ */
+/* $Id: document.c,v 1.37 2003/10/28 04:21:29 shane Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -120,6 +120,7 @@
static void php_dom_ctx_error_level(int level, void *ctx, const char *msg)
{
xmlParserCtxtPtr parser;
+ TSRMLS_FETCH();
parser = (xmlParserCtxtPtr) ctx;
php_error_docref(NULL TSRMLS_CC, level, "%s in %s, line: %d", msg,
parser->input->filename, parser->input->line);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite/libsqlite/src btree_rb.c
iliaa Mon Oct 27 23:22:13 2003 EDT
Modified files:
/php-src/ext/sqlite/libsqlite/src btree_rb.c
Log:
Fixed compiler warning.
Index: php-src/ext/sqlite/libsqlite/src/btree_rb.c
diff -u php-src/ext/sqlite/libsqlite/src/btree_rb.c:1.2
php-src/ext/sqlite/libsqlite/src/btree_rb.c:1.3
--- php-src/ext/sqlite/libsqlite/src/btree_rb.c:1.2 Fri Jun 6 18:44:56 2003
+++ php-src/ext/sqlite/libsqlite/src/btree_rb.c Mon Oct 27 23:22:12 2003
@@ -9,7 +9,7 @@
**May you share freely, never taking more than you give.
**
*
-** $Id: btree_rb.c,v 1.2 2003/06/06 22:44:56 wez Exp $
+** $Id: btree_rb.c,v 1.3 2003/10/28 04:22:12 iliaa Exp $
**
** This file implements an in-core database using Red-Black balanced
** binary trees.
@@ -281,7 +281,7 @@
static void print_node(BtRbNode *pNode)
{
char * str = append_node(0, pNode, 0);
-printf(str);
+printf("%s", str);
}
/*
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
