[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Wed Jul 4 01:31:18 2007 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2737r2=1.2738diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2737 php-src/ChangeLog:1.2738 --- php-src/ChangeLog:1.2737Tue Jul 3 01:31:10 2007 +++ php-src/ChangeLog Wed Jul 4 01:31:18 2007 @@ -1,3 +1,188 @@ +2007-07-03 Ilia Alshanetsky [EMAIL PROTECTED] + +* ext/shmop/package2.xml + ext/shmop/package2.xml: + + file package2.xml was initially added on branch PHP_5_2. + +2007-07-03 Jani Taskinen [EMAIL PROTECTED] + +* configure.in + ext/dom/config.m4 + ext/gd/config.m4 + ext/hash/config.m4 + ext/interbase/config.m4 + ext/json/config.m4 + ext/libxml/config0.m4 + ext/mime_magic/config.m4 + ext/msql/config.m4 + ext/mssql/config.m4 + ext/mysqli/config.m4 + ext/oci8/config.m4 + ext/odbc/config.m4 + ext/pcre/config0.m4 + ext/pdo_dblib/config.m4 + ext/pdo_firebird/config.m4 + ext/pdo_oci/config.m4 + ext/pdo_sqlite/config.m4 + ext/sqlite/config.m4 + ext/sybase/config.m4 + ext/sybase_ct/config.m4 + ext/xsl/config.m4 + ext/zip/config.m4: + - Fix some configure --help texts + +2007-07-03 Dmitry Stogov [EMAIL PROTECTED] + +* Makefile.global + Makefile.global: + Fixed make test mistakes + +2007-07-03 Christopher Jones [EMAIL PROTECTED] + +* ext/oci8/tests/lob_040.phpt: + MFB: new test + +* ext/oci8/tests/lob_040.phpt + ext/oci8/tests/lob_040.phpt: + + file lob_040.phpt was initially added on branch PHP_5_2. + +2007-07-03 Rob Richards [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS: + BFN + +* ext/simplexml/simplexml.c + ext/simplexml/tests/bug41861.phpt: + MFB: fix bug #41861 (getNamespaces() returns namespaces of node's siblings) + add test + +* (PHP_5_2) + ext/simplexml/simplexml.c + ext/simplexml/tests/bug41861.phpt + ext/simplexml/tests/bug41861.phpt: + fix bug #41861 (getNamespaces() returns namespaces of node's siblings) + add test + +2007-07-03 Dmitry Stogov [EMAIL PROTECTED] + +* TSRM/tsrm_virtual_cwd.c + TSRM/tsrm_virtual_cwd.c: + Store existent file in realpath cache + +* ext/standard/basic_functions.c + ext/standard/streamsfuncs.c + ext/standard/streamsfuncs.h + ext/standard/tests/file/include_userstream_001.phpt + ext/standard/tests/file/include_userstream_002.phpt + main/main.c + main/php_globals.h + main/php_streams.h + main/streams/streams.c + main/streams/userspace.c: + Added ability to create local or remote (URL) user streams + Local user streams must not be able to open(), URLs if allow_url_include + is off + Implemented new function stream_is_local() + [ + - stream_wrapper_register() extended with additional optional argument + flags +of type long. This time only one flag is implemented - STREAM_IS_URL, + that +means that userstream wrapper is remote (URL). By default stream is + local. + - stream_is_local() is a new function that accepts stream and tell if this +stream is local or remote (URL) + ] + +2007-07-03 Raghubansh Kumar [EMAIL PROTECTED] + +* ext/standard/tests/file/006_variation1.phpt + ext/standard/tests/file/006_variation2.phpt + ext/standard/tests/file/file_get_contents_file_put_contents_variation1.phpt + ext/standard/tests/file/file_get_contents_file_put_contents_variation2.phpt + ext/standard/tests/file/filesize_variation1-win32.phpt + ext/standard/tests/file/filesize_variation1.phpt + ext/standard/tests/file/filesize_variation2-win32.phpt + ext/standard/tests/file/filesize_variation2.phpt + ext/standard/tests/file/filesize_variation3-win32.phpt + ext/standard/tests/file/filesize_variation3.phpt + ext/standard/tests/file/filesize_variation4-win32.phpt + ext/standard/tests/file/filesize_variation4.phpt + ext/standard/tests/file/fwrite_variation1-win32.phpt + ext/standard/tests/file/fwrite_variation1.phpt + ext/standard/tests/file/fwrite_variation2-win32.phpt + ext/standard/tests/file/fwrite_variation2.phpt + ext/standard/tests/file/fwrite_variation3-win32.phpt + ext/standard/tests/file/fwrite_variation3.phpt + ext/standard/tests/file/fwrite_variation4-win32.phpt + ext/standard/tests/file/fwrite_variation4.phpt: + Smaller testcases for 006_variation.phpt, + file_get_contents_file_put_contents_variation.phpt, + filesize_variation.phpt, filesize_variation-win32.phpt, + fwrite_variation.phpt, fwrite_variation-win32.phpt. + Fix for filesize_variation to match filesize using %d + +* ext/standard/tests/file/006_variation1.phpt +
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/file 006_variation1.phpt 006_variation2.phpt file_get_contents_file_put_contents_variation1.phpt file_get_contents_file_put_contents_variation2.phpt
kraghubaTue Jul 3 07:10:01 2007 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/file006_variation1.phpt filesize_variation2-win32.phpt 006_variation2.phpt filesize_variation3-win32.phpt file_get_contents_file_put_contents_variation1.phpt filesize_variation4-win32.phpt file_get_contents_file_put_contents_variation2.phpt fwrite_variation1-win32.phpt fwrite_variation2-win32.phpt fwrite_variation3-win32.phpt fwrite_variation4-win32.phpt filesize_variation1.phpt filesize_variation2.phpt filesize_variation3.phpt filesize_variation4.phpt fwrite_variation1.phpt fwrite_variation2.phpt fwrite_variation3.phpt fwrite_variation4.phpt filesize_variation1-win32.phpt Log: Smaller testcases for 006_variation.phpt, file_get_contents_file_put_contents_variation.pht, filesize_variation.phpt, filesize_variation-win32.phpt, fwrite_variation.phpt, fwrite_variation-win32.phpt Fix for filesize_variation to match filesize using %d http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/006_variation1.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/file/006_variation1.phpt +++ php-src/ext/standard/tests/file/006_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/filesize_variation2-win32.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/file/filesize_variation2-win32.phpt +++ php-src/ext/standard/tests/file/filesize_variation2-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/006_variation2.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/file/006_variation2.phpt +++ php-src/ext/standard/tests/file/006_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/filesize_variation3-win32.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/file/filesize_variation3-win32.phpt +++ php-src/ext/standard/tests/file/filesize_variation3-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_get_contents_file_put_contents_variation1.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/file/file_get_contents_file_put_contents_variation1.phpt +++ php-src/ext/standard/tests/file/file_get_contents_file_put_contents_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/filesize_variation4-win32.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/file/filesize_variation4-win32.phpt +++ php-src/ext/standard/tests/file/filesize_variation4-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_get_contents_file_put_contents_variation2.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/file/file_get_contents_file_put_contents_variation2.phpt +++ php-src/ext/standard/tests/file/file_get_contents_file_put_contents_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fwrite_variation1-win32.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/file/fwrite_variation1-win32.phpt +++ php-src/ext/standard/tests/file/fwrite_variation1-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fwrite_variation2-win32.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/file/fwrite_variation2-win32.phpt +++ php-src/ext/standard/tests/file/fwrite_variation2-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fwrite_variation3-win32.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/file/fwrite_variation3-win32.phpt +++ php-src/ext/standard/tests/file/fwrite_variation3-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fwrite_variation4-win32.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/file/fwrite_variation4-win32.phpt +++ php-src/ext/standard/tests/file/fwrite_variation4-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/filesize_variation1.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/file/filesize_variation1.phpt +++ php-src/ext/standard/tests/file/filesize_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/filesize_variation2.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/file/filesize_variation2.phpt +++
[PHP-CVS] cvs: php-src /ext/standard basic_functions.c streamsfuncs.c streamsfuncs.h /ext/standard/tests/file include_userstream_001.phpt include_userstream_002.phpt /main main.c php_globals.h php_s
dmitry Tue Jul 3 10:22:56 2007 UTC
Added files:
/php-src/ext/standard/tests/fileinclude_userstream_001.phpt
include_userstream_002.phpt
Modified files:
/php-src/main main.c php_globals.h php_streams.h
/php-src/main/streams streams.c userspace.c
/php-src/ext/standard basic_functions.c streamsfuncs.c
streamsfuncs.h
Log:
Added ability to create local or remote (URL) user streams
Local user streams must not be able to open(), URLs if allow_url_include is
off
Implemented new function stream_is_local()
[
- stream_wrapper_register() extended with additional optional argument flags
of type long. This time only one flag is implemented - STREAM_IS_URL, that
means that userstream wrapper is remote (URL). By default stream is local.
- stream_is_local() is a new function that accepts stream and tell if this
stream is local or remote (URL)
]
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.732r2=1.733diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.732 php-src/main/main.c:1.733
--- php-src/main/main.c:1.732 Fri Jun 15 09:20:53 2007
+++ php-src/main/main.c Tue Jul 3 10:22:55 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.732 2007/06/15 09:20:53 dmitry Exp $ */
+/* $Id: main.c,v 1.733 2007/07/03 10:22:55 dmitry Exp $ */
/* {{{ includes
*/
@@ -1232,6 +1232,7 @@
PG(modules_activated) = 0;
PG(header_is_being_sent) = 0;
PG(connection_status) = PHP_CONNECTION_NORMAL;
+ PG(in_user_include) = 0;
zend_activate(TSRMLS_C);
sapi_activate(TSRMLS_C);
http://cvs.php.net/viewvc.cgi/php-src/main/php_globals.h?r1=1.111r2=1.112diff_format=u
Index: php-src/main/php_globals.h
diff -u php-src/main/php_globals.h:1.111 php-src/main/php_globals.h:1.112
--- php-src/main/php_globals.h:1.111Fri Mar 2 22:04:46 2007
+++ php-src/main/php_globals.h Tue Jul 3 10:22:55 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_globals.h,v 1.111 2007/03/02 22:04:46 stas Exp $ */
+/* $Id: php_globals.h,v 1.112 2007/07/03 10:22:55 dmitry Exp $ */
#ifndef PHP_GLOBALS_H
#define PHP_GLOBALS_H
@@ -142,6 +142,7 @@
zend_bool com_initialized;
#endif
long max_input_nesting_level;
+ zend_bool in_user_include;
};
http://cvs.php.net/viewvc.cgi/php-src/main/php_streams.h?r1=1.128r2=1.129diff_format=u
Index: php-src/main/php_streams.h
diff -u php-src/main/php_streams.h:1.128 php-src/main/php_streams.h:1.129
--- php-src/main/php_streams.h:1.128Sat Mar 3 22:30:07 2007
+++ php-src/main/php_streams.h Tue Jul 3 10:22:55 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_streams.h,v 1.128 2007/03/03 22:30:07 helly Exp $ */
+/* $Id: php_streams.h,v 1.129 2007/07/03 10:22:55 dmitry Exp $ */
#ifndef PHP_STREAMS_H
#define PHP_STREAMS_H
@@ -619,6 +619,9 @@
/* use glob stream for directory open in plain files stream */
#define STREAM_USE_GLOB_DIR_OPEN0x1000
+/* use glob stream for directory open in plain files stream */
+#define STREAM_DISABLE_URL_PROTECTION 0x2000
+
/* Antique - no longer has meaning */
#define IGNORE_URL_WIN 0
@@ -669,7 +672,7 @@
PHP_INI_MH(OnUpdateAllowUrl);
PHPAPI int php_stream_wrapper_is_allowed(const char *wrapper, int wrapper_len,
const char *setting TSRMLS_DC);
-#define php_stream_allow_url_fopen(wrapper, wrapper_len)
php_stream_wrapper_is_allowed((wrapper), (wrapper_len),
PG(allow_url_fopen_list) TSRMLS_CC)
+#define php_stream_allow_url_fopen(wrapper, wrapper_len)
php_stream_wrapper_is_allowed((wrapper), (wrapper_len),
PG(in_user_include)?PG(allow_url_include_list):PG(allow_url_fopen_list)
TSRMLS_CC)
#define php_stream_allow_url_include(wrapper, wrapper_len)
php_stream_wrapper_is_allowed((wrapper), (wrapper_len),
PG(allow_url_include_list) TSRMLS_CC)
/* Give other modules access to the url_stream_wrappers_hash and
stream_filters_hash */
@@ -683,6 +686,8 @@
END_EXTERN_C()
#endif
+/* Definitions for user streams */
+#define PHP_STREAM_IS_URL 1
/*
* Local variables:
* tab-width: 4
http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.151r2=1.152diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.151
php-src/main/streams/streams.c:1.152
--- php-src/main/streams/streams.c:1.151Tue May 8 12:08:41 2007
+++ php-src/main/streams/streams.c Tue Jul 3 10:22:55 2007
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: streams.c,v 1.151 2007/05/08 12:08:41 dmitry Exp $ */
+/* $Id:
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/simplexml simplexml.c /ext/simplexml/tests bug41861.phpt
rrichards Tue Jul 3 14:55:53 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/simplexml/testsbug41861.phpt
Modified files:
/php-src/ext/simplexml simplexml.c
Log:
fix bug #41861 (getNamespaces() returns namespaces of node's siblings)
add test
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.151.2.22.2.30r2=1.151.2.22.2.31diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.151.2.22.2.30
php-src/ext/simplexml/simplexml.c:1.151.2.22.2.31
--- php-src/ext/simplexml/simplexml.c:1.151.2.22.2.30 Mon Jul 2 11:35:18 2007
+++ php-src/ext/simplexml/simplexml.c Tue Jul 3 14:55:53 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.151.2.22.2.30 2007/07/02 11:35:18 rrichards Exp $ */
+/* $Id: simplexml.c,v 1.151.2.22.2.31 2007/07/03 14:55:53 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1396,15 +1396,12 @@
GET_NODE(sxe, node);
node = php_sxe_get_first_node(sxe, node TSRMLS_CC);
- while (node) {
- SKIP_TEXT(node)
+ if (node) {
if (node-type == XML_ELEMENT_NODE) {
sxe_add_namespaces(sxe, node, recursive, return_value
TSRMLS_CC);
} else if (node-type == XML_ATTRIBUTE_NODE node-ns) {
sxe_add_namespace_name(return_value, node-ns);
}
-next_iter:
- node = node-next;
}
}
/* }}} */
@@ -2423,7 +2420,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.151.2.22.2.30 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.151.2.22.2.31 $);
php_info_print_table_row(2, Schema support,
#ifdef LIBXML_SCHEMAS_ENABLED
enabled);
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/bug41861.phpt?view=markuprev=1.1
Index: php-src/ext/simplexml/tests/bug41861.phpt
+++ php-src/ext/simplexml/tests/bug41861.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/simplexml simplexml.c /ext/simplexml/tests bug41861.phpt
rrichards Tue Jul 3 15:02:40 2007 UTC
Modified files:
/php-src/ext/simplexml simplexml.c
/php-src/ext/simplexml/testsbug41861.phpt
Log:
MFB: fix bug #41861 (getNamespaces() returns namespaces of node's siblings)
add test
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.238r2=1.239diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.238
php-src/ext/simplexml/simplexml.c:1.239
--- php-src/ext/simplexml/simplexml.c:1.238 Mon Jul 2 11:53:08 2007
+++ php-src/ext/simplexml/simplexml.c Tue Jul 3 15:02:40 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.238 2007/07/02 11:53:08 dmitry Exp $ */
+/* $Id: simplexml.c,v 1.239 2007/07/03 15:02:40 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1458,15 +1458,12 @@
GET_NODE(sxe, node);
node = php_sxe_get_first_node(sxe, node TSRMLS_CC);
- while (node) {
- SKIP_TEXT(node)
+ if (node) {
if (node-type == XML_ELEMENT_NODE) {
sxe_add_namespaces(sxe, node, recursive, return_value
TSRMLS_CC);
} else if (node-type == XML_ATTRIBUTE_NODE node-ns) {
sxe_add_namespace_name(return_value, node-ns
TSRMLS_CC);
}
-next_iter:
- node = node-next;
}
}
/* }}} */
@@ -2486,7 +2483,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.238 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.239 $);
php_info_print_table_row(2, Schema support,
#ifdef LIBXML_SCHEMAS_ENABLED
enabled);
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/bug41861.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/simplexml/tests/bug41861.phpt
diff -u /dev/null php-src/ext/simplexml/tests/bug41861.phpt:1.2
--- /dev/null Tue Jul 3 15:02:40 2007
+++ php-src/ext/simplexml/tests/bug41861.phpt Tue Jul 3 15:02:40 2007
@@ -0,0 +1,38 @@
+--TEST--
+Bug #41861 (getNamespaces() returns the namespaces of a node's siblings)
+--FILE--
+?php
+
+$xml = simplexml_load_string('root
+ first_node_no_ns /
+ ns1:node1 xmlns:ns1=#ns1 /
+ ns2:node2 xmlns:ns2=#ns2 /
+ ns3:node3 xmlns:ns3=#ns3 /
+ last_node_no_ns /
+/root');
+
+$name = $xml-getName();
+$namespaces = $xml-getNamespaces(True);
+echo root(recursive): '$name' -- namespaces: , implode(', ', $namespaces),
\n;
+$namespaces = $xml-getNamespaces(False);
+echo root(non-recursive): '$name' -- namespaces: , implode(', ',
$namespaces), \n;
+
+foreach (array(null, '#ns1', '#ns2', '#ns3') as $ns)
+{
+ foreach ($xml-children($ns) as $child)
+ {
+ $name = $child-getName();
+ $namespaces = $child-getNamespaces(false);
+
+ echo children($ns): '$name' -- namespaces: , implode(', ',
$namespaces), \n;
+ }
+}
+?
+--EXPECT--
+root(recursive): 'root' -- namespaces: #ns1, #ns2, #ns3
+root(non-recursive): 'root' -- namespaces:
+children(): 'first_node_no_ns' -- namespaces:
+children(): 'last_node_no_ns' -- namespaces:
+children(#ns1): 'node1' -- namespaces: #ns1
+children(#ns2): 'node2' -- namespaces: #ns2
+children(#ns3): 'node3' -- namespaces: #ns3
--
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
rrichards Tue Jul 3 15:03:17 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: BFN http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.812r2=1.2027.2.547.2.813diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.812 php-src/NEWS:1.2027.2.547.2.813 --- php-src/NEWS:1.2027.2.547.2.812 Mon Jul 2 16:42:09 2007 +++ php-src/NEWSTue Jul 3 15:03:16 2007 @@ -45,6 +45,8 @@ - Fixed bug #41867 (getName is broken). (Rob) - Fixed bug #41865 (fputcsv(): 2nd parameter is not optional). (Jani) +- Fixed bug #41861 (getNamespaces() returns the namespaces of a node's + siblings). (Rob) - Fixed bug #41845 (pgsql extension does not compile with PostgreSQL 7.4). (Ilia) - Fixed bug #41813 (segmentation fault when using string offset as an object). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/oci8/tests lob_040.phpt
sixdTue Jul 3 15:10:41 2007 UTC Added files: (Branch: PHP_5_2) /php-src/ext/oci8/tests lob_040.phpt Log: New test http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/lob_040.phpt?view=markuprev=1.1 Index: php-src/ext/oci8/tests/lob_040.phpt +++ php-src/ext/oci8/tests/lob_040.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/oci8/tests lob_040.phpt
sixdTue Jul 3 15:10:53 2007 UTC
Modified files:
/php-src/ext/oci8/tests lob_040.phpt
Log:
MFB: new test
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/lob_040.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/oci8/tests/lob_040.phpt
diff -u /dev/null php-src/ext/oci8/tests/lob_040.phpt:1.2
--- /dev/null Tue Jul 3 15:10:53 2007
+++ php-src/ext/oci8/tests/lob_040.phpt Tue Jul 3 15:10:53 2007
@@ -0,0 +1,1041 @@
+--TEST--
+Bug #37706 (Test LOB locator reuse. Extends simple test of lob_037.phpt)
+--SKIPIF--
+?php if (!extension_loaded('oci8')) die(skip no oci8 extension); ?
+--FILE--
+?php
+
+define('NUMLOBS', 200);
+
+require(dirname(__FILE__).'/connect.inc');
+require(dirname(__FILE__).'/create_table.inc');
+
+for ($i = 0; $i NUMLOBS; $i++) {
+ $s = oci_parse($c, insert into .$schema.$table_name. (id, clob)
values(.$i., '.$i..$i.$i.aaaz'));
+ oci_execute($s);
+}
+
+echo Test 1: CLOB as locator\n;
+
+$s = oci_parse($c, select clob from .$schema.$table_name. order by id);
+oci_execute($s);
+
+$row = array();
+for ($i = 0; $i NUMLOBS; $i++) {
+ $row[$i] = oci_fetch_array($s, OCI_NUM);
+}
+
+for ($i = 0; $i NUMLOBS; $i++) {
+ echo Row $i Size: . $row[$i][0]-size() . \n;;
+ echo Pos 1: . $row[$i][0]-tell() . \n;
+ echo Data: . $row[$i][0]-read(5) . \n;;
+ echo Pos 2: . $row[$i][0]-tell() . \n;
+ echo Data: . $row[$i][0]-read(12) . \n;
+}
+
+echo Done\n;
+
+?
+--EXPECT--
+Test 1: CLOB as locator
+Row 0 Size: 35
+Pos 1: 0
+Data: 0
+Pos 2: 5
+Data: 00aa
+Row 1 Size: 35
+Pos 1: 0
+Data: 1
+Pos 2: 5
+Data: 11aa
+Row 2 Size: 35
+Pos 1: 0
+Data: 2
+Pos 2: 5
+Data: 22aa
+Row 3 Size: 35
+Pos 1: 0
+Data: 3
+Pos 2: 5
+Data: 33aa
+Row 4 Size: 35
+Pos 1: 0
+Data: 4
+Pos 2: 5
+Data: 44aa
+Row 5 Size: 35
+Pos 1: 0
+Data: 5
+Pos 2: 5
+Data: 55aa
+Row 6 Size: 35
+Pos 1: 0
+Data: 6
+Pos 2: 5
+Data: 66aa
+Row 7 Size: 35
+Pos 1: 0
+Data: 7
+Pos 2: 5
+Data: 77aa
+Row 8 Size: 35
+Pos 1: 0
+Data: 8
+Pos 2: 5
+Data: 88aa
+Row 9 Size: 35
+Pos 1: 0
+Data: 9
+Pos 2: 5
+Data: 99aa
+Row 10 Size: 38
+Pos 1: 0
+Data: 10aaa
+Pos 2: 5
+Data: a1010aaa
+Row 11 Size: 38
+Pos 1: 0
+Data: 11aaa
+Pos 2: 5
+Data: aaaa
+Row 12 Size: 38
+Pos 1: 0
+Data: 12aaa
+Pos 2: 5
+Data: a1212aaa
+Row 13 Size: 38
+Pos 1: 0
+Data: 13aaa
+Pos 2: 5
+Data: a1313aaa
+Row 14 Size: 38
+Pos 1: 0
+Data: 14aaa
+Pos 2: 5
+Data: a1414aaa
+Row 15 Size: 38
+Pos 1: 0
+Data: 15aaa
+Pos 2: 5
+Data: a1515aaa
+Row 16 Size: 38
+Pos 1: 0
+Data: 16aaa
+Pos 2: 5
+Data: a1616aaa
+Row 17 Size: 38
+Pos 1: 0
+Data: 17aaa
+Pos 2: 5
+Data: a1717aaa
+Row 18 Size: 38
+Pos 1: 0
+Data: 18aaa
+Pos 2: 5
+Data: a1818aaa
+Row 19 Size: 38
+Pos 1: 0
+Data: 19aaa
+Pos 2: 5
+Data: a1919aaa
+Row 20 Size: 38
+Pos 1: 0
+Data: 20aaa
+Pos 2: 5
+Data: a2020aaa
+Row 21 Size: 38
+Pos 1: 0
+Data: 21aaa
+Pos 2: 5
+Data: a2121aaa
+Row 22 Size: 38
+Pos 1: 0
+Data: 22aaa
+Pos 2: 5
+Data: aaaa
+Row 23 Size: 38
+Pos 1: 0
+Data: 23aaa
+Pos 2: 5
+Data: a2323aaa
+Row 24 Size: 38
+Pos 1: 0
+Data: 24aaa
+Pos 2: 5
+Data: a2424aaa
+Row 25 Size: 38
+Pos 1: 0
+Data: 25aaa
+Pos 2: 5
+Data: a2525aaa
+Row 26 Size: 38
+Pos 1: 0
+Data: 26aaa
+Pos 2: 5
+Data: a2626aaa
+Row 27 Size: 38
+Pos 1: 0
+Data: 27aaa
+Pos 2: 5
+Data: a2727aaa
+Row 28 Size: 38
+Pos 1: 0
+Data: 28aaa
+Pos 2: 5
+Data: a2828aaa
+Row 29 Size: 38
+Pos 1: 0
+Data: 29aaa
+Pos 2: 5
+Data: a2929aaa
+Row 30 Size: 38
+Pos 1: 0
+Data: 30aaa
+Pos 2: 5
+Data: a3030aaa
+Row 31 Size: 38
+Pos 1: 0
+Data: 31aaa
+Pos 2: 5
+Data: a3131aaa
+Row 32 Size: 38
+Pos 1: 0
+Data: 32aaa
+Pos 2: 5
+Data: a3232aaa
+Row 33 Size: 38
+Pos 1: 0
+Data: 33aaa
+Pos 2: 5
+Data: aaaa
+Row 34 Size: 38
+Pos 1: 0
+Data: 34aaa
+Pos 2: 5
+Data: a3434aaa
+Row 35 Size: 38
+Pos 1: 0
+Data: 35aaa
+Pos 2: 5
+Data: a3535aaa
+Row 36 Size: 38
+Pos 1: 0
+Data: 36aaa
+Pos 2: 5
+Data: a3636aaa
+Row 37 Size: 38
+Pos 1: 0
+Data: 37aaa
+Pos 2: 5
+Data: a3737aaa
+Row 38 Size: 38
+Pos 1: 0
+Data: 38aaa
+Pos 2: 5
+Data: a3838aaa
+Row 39 Size: 38
+Pos 1: 0
+Data: 39aaa
+Pos 2: 5
+Data: a3939aaa
+Row 40 Size: 38
+Pos 1: 0
+Data: 40aaa
+Pos 2: 5
+Data: a4040aaa
+Row 41 Size: 38
+Pos 1: 0
+Data: 41aaa
+Pos 2: 5
+Data: a4141aaa
+Row 42 Size: 38
+Pos 1: 0
+Data: 42aaa
+Pos 2: 5
+Data: a4242aaa
+Row 43 Size: 38
+Pos 1: 0
+Data: 43aaa
+Pos 2: 5
+Data: a4343aaa
+Row 44 Size: 38
+Pos 1: 0
+Data: 44aaa
+Pos 2: 5
+Data: aaaa
+Row 45 Size: 38
+Pos 1: 0
+Data: 45aaa
+Pos 2: 5
+Data: a4545aaa
+Row 46 Size: 38
+Pos 1: 0
+Data: 46aaa
+Pos 2: 5
+Data: a4646aaa
+Row 47 Size: 38
[PHP-CVS] cvs: php-src(PHP_5_2) / Makefile.global
dmitry Tue Jul 3 15:56:21 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcMakefile.global Log: Fixed make test mistakes http://cvs.php.net/viewvc.cgi/php-src/Makefile.global?r1=1.57.2.5.2.11r2=1.57.2.5.2.12diff_format=u Index: php-src/Makefile.global diff -u php-src/Makefile.global:1.57.2.5.2.11 php-src/Makefile.global:1.57.2.5.2.12 --- php-src/Makefile.global:1.57.2.5.2.11 Fri Jun 29 15:13:40 2007 +++ php-src/Makefile.global Tue Jul 3 15:56:21 2007 @@ -85,8 +85,8 @@ $(PHP_EXECUTABLE) $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -d extension_dir=modules/ $(PHP_TEST_SHARED_EXTENSIONS) tests/; \ elif test ! -z $(SAPI_CLI_PATH) test -x $(SAPI_CLI_PATH); then \ INI_FILE=`$(top_builddir)/$(SAPI_CLI_PATH) -r 'echo php_ini_loaded_file();'`; \ - if test $(INI_FILE); then \ - $(EGREP) -v '^extension[\t\ ]=' $(INI_FILE) $(top_builddir)/tmp-php.ini; \ + if test $$INI_FILE; then \ + $(EGREP) -v '^extension[\t\ ]*=' $$INI_FILE $(top_builddir)/tmp-php.ini; \ else \ echo $(top_builddir)/tmp-php.ini; \ fi; \ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / Makefile.global
dmitry Tue Jul 3 15:56:43 2007 UTC Modified files: /php-srcMakefile.global Log: Fixed make test mistakes http://cvs.php.net/viewvc.cgi/php-src/Makefile.global?r1=1.81r2=1.82diff_format=u Index: php-src/Makefile.global diff -u php-src/Makefile.global:1.81 php-src/Makefile.global:1.82 --- php-src/Makefile.global:1.81Fri Jun 29 15:13:33 2007 +++ php-src/Makefile.global Tue Jul 3 15:56:43 2007 @@ -83,15 +83,15 @@ $(PHP_EXECUTABLE) $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -U -d extension_dir=modules/ $(PHP_TEST_SHARED_EXTENSIONS) tests/; \ elif test ! -z $(SAPI_CLI_PATH) test -x $(SAPI_CLI_PATH); then \ INI_FILE=`$(top_builddir)/$(SAPI_CLI_PATH) -r 'echo php_ini_loaded_file();'`; \ - if test $(INI_FILE); then \ - $(EGREP) -v '^extension[\t\ ]=' $(INI_FILE) $(top_builddir)/tmp-php.ini; \ + if test $$INI_FILE; then \ + $(EGREP) -v '^extension[\t\ ]*=' $$INI_FILE $(top_builddir)/tmp-php.ini; \ else \ echo $(top_builddir)/tmp-php.ini; \ fi; \ TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \ TEST_PHP_SRCDIR=$(top_srcdir) \ CC=$(CC) \ - $(top_builddir)/$(SAPI_CLI_PATH) $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -U -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \ + $(top_builddir)/$(SAPI_CLI_PATH) $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -c $(top_builddir)/tmp-php.ini -U -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \ else \ echo ERROR: Cannot run tests without CLI sapi.; \ fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in /ext/dom config.m4 /ext/gd config.m4 /ext/hash config.m4 /ext/interbase config.m4 /ext/json config.m4 /ext/libxml config0.m4 /ext/mime_magic config.m4 /ex
sniper Tue Jul 3 17:24:37 2007 UTC Modified files: /php-srcconfigure.in /php-src/ext/domconfig.m4 /php-src/ext/gd config.m4 /php-src/ext/hash config.m4 /php-src/ext/interbase config.m4 /php-src/ext/json config.m4 /php-src/ext/libxml config0.m4 /php-src/ext/mime_magic config.m4 /php-src/ext/msql config.m4 /php-src/ext/mssql config.m4 /php-src/ext/mysqli config.m4 /php-src/ext/oci8 config.m4 /php-src/ext/odbc config.m4 /php-src/ext/pcre config0.m4 /php-src/ext/pdo_dblib config.m4 /php-src/ext/pdo_firebird config.m4 /php-src/ext/pdo_ociconfig.m4 /php-src/ext/pdo_sqlite config.m4 /php-src/ext/sqlite config.m4 /php-src/ext/sybase config.m4 /php-src/ext/sybase_ct config.m4 /php-src/ext/xslconfig.m4 /php-src/ext/zipconfig.m4 Log: - Fix some configure --help texts http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.630r2=1.631diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.630 php-src/configure.in:1.631 --- php-src/configure.in:1.630 Fri Jun 29 01:09:53 2007 +++ php-src/configure.inTue Jul 3 17:24:36 2007 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.630 2007/06/29 01:09:53 sniper Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.631 2007/07/03 17:24:36 sniper Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -719,8 +719,7 @@ PHP_ARG_WITH(config-file-path,[path to configuration file], [ --with-config-file-path=PATH - Set the path in which to look for php.ini - [PREFIX/lib]], DEFAULT, no) + Set the path in which to look for php.ini [PREFIX/lib]], DEFAULT, no) if test $PHP_CONFIG_FILE_PATH = DEFAULT; then case $PHP_LAYOUT in http://cvs.php.net/viewvc.cgi/php-src/ext/dom/config.m4?r1=1.20r2=1.21diff_format=u Index: php-src/ext/dom/config.m4 diff -u php-src/ext/dom/config.m4:1.20 php-src/ext/dom/config.m4:1.21 --- php-src/ext/dom/config.m4:1.20 Sun May 29 23:16:40 2005 +++ php-src/ext/dom/config.m4 Tue Jul 3 17:24:36 2007 @@ -1,9 +1,9 @@ dnl -dnl $Id: config.m4,v 1.20 2005/05/29 23:16:40 sniper Exp $ +dnl $Id: config.m4,v 1.21 2007/07/03 17:24:36 sniper Exp $ dnl PHP_ARG_ENABLE(dom, whether to enable DOM support, -[ --disable-dom Disable new DOM support], yes) +[ --disable-dom Disable DOM support], yes) if test -z $PHP_LIBXML_DIR; then PHP_ARG_WITH(libxml-dir, libxml2 install dir, http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.m4?r1=1.173r2=1.174diff_format=u Index: php-src/ext/gd/config.m4 diff -u php-src/ext/gd/config.m4:1.173 php-src/ext/gd/config.m4:1.174 --- php-src/ext/gd/config.m4:1.173 Fri Jun 1 21:33:30 2007 +++ php-src/ext/gd/config.m4Tue Jul 3 17:24:36 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.173 2007/06/01 21:33:30 sniper Exp $ +dnl $Id: config.m4,v 1.174 2007/07/03 17:24:36 sniper Exp $ dnl dnl @@ -7,8 +7,8 @@ dnl PHP_ARG_WITH(gd, for GD support, -[ --with-gd[=FILE]Include GD support. FILE is the optional pathname to gdlib-config. - If FILE is not set, the bundled GD library will be used]) +[ --with-gd[=FILE]Include GD support. FILE is the optional + pathname to gdlib-config [BUNDLED]]) if test -z $PHP_JPEG_DIR; then PHP_ARG_WITH(jpeg-dir, for the location of libjpeg, http://cvs.php.net/viewvc.cgi/php-src/ext/hash/config.m4?r1=1.11r2=1.12diff_format=u Index: php-src/ext/hash/config.m4 diff -u php-src/ext/hash/config.m4:1.11 php-src/ext/hash/config.m4:1.12 --- php-src/ext/hash/config.m4:1.11 Sun Feb 19 23:43:23 2006 +++ php-src/ext/hash/config.m4 Tue Jul 3 17:24:36 2007 @@ -1,8 +1,8 @@ -dnl $Id: config.m4,v 1.11 2006/02/19 23:43:23 mike Exp $ +dnl $Id: config.m4,v 1.12 2007/07/03 17:24:36 sniper Exp $ dnl config.m4 for extension hash PHP_ARG_ENABLE(hash, whether to enable hash support, -[ --disable-hash Disable hash support], yes) +[ --disable-hash Disable hash support], yes) if test $PHP_HASH != no; then AC_DEFINE(HAVE_HASH_EXT,1,[Have HASH Extension]) http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/config.m4?r1=1.20r2=1.21diff_format=u Index: php-src/ext/interbase/config.m4 diff -u php-src/ext/interbase/config.m4:1.20 php-src/ext/interbase/config.m4:1.21 --- php-src/ext/interbase/config.m4:1.20Wed May 12 14:29:42 2004 +++ php-src/ext/interbase/config.m4 Tue Jul 3 17:24:36 2007 @@ -1,10 +1,10 @@ dnl -dnl $Id: config.m4,v 1.20 2004/05/12 14:29:42 abies Exp $ +dnl $Id: config.m4,v 1.21 2007/07/03 17:24:36 sniper Exp $ dnl PHP_ARG_WITH(interbase,for InterBase support, [ --with-interbase[=DIR] Include InterBase support. DIR is the InterBase base - install directory, defaults to
[PHP-CVS] cvs: php-src(PHP_5_2) / configure.in /ext/dom config.m4 /ext/gd config.m4 /ext/hash config.m4 /ext/interbase config.m4 /ext/json config.m4 /ext/libxml config0.m4 /ext/mbstring config.
sniper Tue Jul 3 17:25:35 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcconfigure.in /php-src/ext/domconfig.m4 /php-src/ext/gd config.m4 /php-src/ext/hash config.m4 /php-src/ext/interbase config.m4 /php-src/ext/json config.m4 /php-src/ext/libxml config0.m4 /php-src/ext/mbstring config.m4 /php-src/ext/mime_magic config.m4 /php-src/ext/msql config.m4 /php-src/ext/mssql config.m4 /php-src/ext/mysqli config.m4 /php-src/ext/oci8 config.m4 /php-src/ext/odbc config.m4 /php-src/ext/pcre config0.m4 /php-src/ext/pdo_dblib config.m4 /php-src/ext/pdo_firebird config.m4 /php-src/ext/pdo_mysql config.m4 /php-src/ext/pdo_ociconfig.m4 /php-src/ext/pdo_sqlite config.m4 /php-src/ext/snmp config.m4 /php-src/ext/sqlite config.m4 /php-src/ext/sybase config.m4 /php-src/ext/sybase_ct config.m4 /php-src/ext/xslconfig.m4 /php-src/ext/zipconfig.m4 /php-src/sapi/cgi config9.m4 Log: MFH: Fix some configure --help texts http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.60r2=1.579.2.52.2.61diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.52.2.60 php-src/configure.in:1.579.2.52.2.61 --- php-src/configure.in:1.579.2.52.2.60Fri Jun 29 01:10:35 2007 +++ php-src/configure.inTue Jul 3 17:25:33 2007 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.579.2.52.2.60 2007/06/29 01:10:35 sniper Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.579.2.52.2.61 2007/07/03 17:25:33 sniper Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -722,8 +722,7 @@ PHP_ARG_WITH(config-file-path,[path to configuration file], [ --with-config-file-path=PATH - Set the path in which to look for php.ini - [PREFIX/lib]], DEFAULT, no) + Set the path in which to look for php.ini [PREFIX/lib]], DEFAULT, no) if test $PHP_CONFIG_FILE_PATH = DEFAULT; then case $PHP_LAYOUT in http://cvs.php.net/viewvc.cgi/php-src/ext/dom/config.m4?r1=1.20r2=1.20.4.1diff_format=u Index: php-src/ext/dom/config.m4 diff -u php-src/ext/dom/config.m4:1.20 php-src/ext/dom/config.m4:1.20.4.1 --- php-src/ext/dom/config.m4:1.20 Sun May 29 23:16:40 2005 +++ php-src/ext/dom/config.m4 Tue Jul 3 17:25:33 2007 @@ -1,9 +1,9 @@ dnl -dnl $Id: config.m4,v 1.20 2005/05/29 23:16:40 sniper Exp $ +dnl $Id: config.m4,v 1.20.4.1 2007/07/03 17:25:33 sniper Exp $ dnl PHP_ARG_ENABLE(dom, whether to enable DOM support, -[ --disable-dom Disable new DOM support], yes) +[ --disable-dom Disable DOM support], yes) if test -z $PHP_LIBXML_DIR; then PHP_ARG_WITH(libxml-dir, libxml2 install dir, http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.m4?r1=1.154.2.1.2.5r2=1.154.2.1.2.6diff_format=u Index: php-src/ext/gd/config.m4 diff -u php-src/ext/gd/config.m4:1.154.2.1.2.5 php-src/ext/gd/config.m4:1.154.2.1.2.6 --- php-src/ext/gd/config.m4:1.154.2.1.2.5 Fri Jun 1 21:34:17 2007 +++ php-src/ext/gd/config.m4Tue Jul 3 17:25:33 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.154.2.1.2.5 2007/06/01 21:34:17 sniper Exp $ +dnl $Id: config.m4,v 1.154.2.1.2.6 2007/07/03 17:25:33 sniper Exp $ dnl dnl @@ -7,8 +7,8 @@ dnl PHP_ARG_WITH(gd, for GD support, -[ --with-gd[=DIR] Include GD support where DIR is GD install prefix. - If DIR is not set, the bundled GD library will be used]) +[ --with-gd[=DIR] Include GD support. DIR is the GD library base + install directory [BUNDLED]]) if test -z $PHP_JPEG_DIR; then PHP_ARG_WITH(jpeg-dir, for the location of libjpeg, http://cvs.php.net/viewvc.cgi/php-src/ext/hash/config.m4?r1=1.10.2.4r2=1.10.2.4.2.1diff_format=u Index: php-src/ext/hash/config.m4 diff -u php-src/ext/hash/config.m4:1.10.2.4 php-src/ext/hash/config.m4:1.10.2.4.2.1 --- php-src/ext/hash/config.m4:1.10.2.4 Sun Feb 19 23:39:53 2006 +++ php-src/ext/hash/config.m4 Tue Jul 3 17:25:33 2007 @@ -1,8 +1,8 @@ -dnl $Id: config.m4,v 1.10.2.4 2006/02/19 23:39:53 mike Exp $ +dnl $Id: config.m4,v 1.10.2.4.2.1 2007/07/03 17:25:33 sniper Exp $ dnl config.m4 for extension hash PHP_ARG_ENABLE(hash, whether to enable hash support, -[ --disable-hash Disable hash support], yes) +[ --disable-hash Disable hash support], yes) if test $PHP_HASH != no; then AC_DEFINE(HAVE_HASH_EXT,1,[Have HASH Extension]) http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/config.m4?r1=1.20r2=1.20.6.1diff_format=u Index: php-src/ext/interbase/config.m4 diff -u php-src/ext/interbase/config.m4:1.20 php-src/ext/interbase/config.m4:1.20.6.1 --- php-src/ext/interbase/config.m4:1.20Wed May 12 14:29:42 2004 +++ php-src/ext/interbase/config.m4 Tue Jul 3
[PHP-CVS] cvs: php-src /ext/simplexml simplexml.c
pollita Wed Jul 4 05:05:32 2007 UTC
Modified files:
/php-src/ext/simplexml simplexml.c
Log:
Fix behavior of empty($sxe-element) and empty($sxe['prop'])
when used on empty elements properties (apply PHP emptiness rules)
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.239r2=1.240diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.239
php-src/ext/simplexml/simplexml.c:1.240
--- php-src/ext/simplexml/simplexml.c:1.239 Tue Jul 3 15:02:40 2007
+++ php-src/ext/simplexml/simplexml.c Wed Jul 4 05:05:32 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.239 2007/07/03 15:02:40 rrichards Exp $ */
+/* $Id: simplexml.c,v 1.240 2007/07/04 05:05:32 pollita Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -797,6 +797,11 @@
attr = attr-next;
}
}
+ if (exists check_empty == 1
+ (!attr-children || !attr-children-content ||
!attr-children-content[0] || !xmlStrcmp(attr-children-content, 0)) ) {
+ /* Attribute with no content in it's text node
*/
+ exists = 0;
+ }
}
if (elements) {
@@ -819,6 +824,11 @@
}
if (node) {
exists = 1;
+if (check_empty == 1
+ (!node-children ||
(node-children-type == XML_TEXT_NODE !node-children-next
+ (!node-children-content ||
!node-children-content[0] || !xmlStrcmp(node-children-content, 0 ) {
+ exists = 0;
+ }
}
}
}
@@ -2483,7 +2493,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.239 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.240 $);
php_info_print_table_row(2, Schema support,
#ifdef LIBXML_SCHEMAS_ENABLED
enabled);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/simplexml simplexml.c
pollita Wed Jul 4 05:05:58 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/simplexml simplexml.c
/php-srcNEWS
Log:
MFH (r-1.240)
Fix behavior of empty($sxe-element) and empty($sxe['prop'])
when used on empty elements properties (apply PHP emptiness rules)
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.151.2.22.2.31r2=1.151.2.22.2.32diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.151.2.22.2.31
php-src/ext/simplexml/simplexml.c:1.151.2.22.2.32
--- php-src/ext/simplexml/simplexml.c:1.151.2.22.2.31 Tue Jul 3 14:55:53 2007
+++ php-src/ext/simplexml/simplexml.c Wed Jul 4 05:05:57 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.151.2.22.2.31 2007/07/03 14:55:53 rrichards Exp $ */
+/* $Id: simplexml.c,v 1.151.2.22.2.32 2007/07/04 05:05:57 pollita Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -787,6 +787,11 @@
attr = attr-next;
}
}
+ if (exists check_empty == 1
+ (!attr-children || !attr-children-content ||
!attr-children-content[0] || !xmlStrcmp(attr-children-content, 0)) ) {
+ /* Attribute with no content in it's text node
*/
+ exists = 0;
+ }
}
if (elements) {
@@ -809,6 +814,11 @@
}
if (node) {
exists = 1;
+if (check_empty == 1
+ (!node-children ||
(node-children-type == XML_TEXT_NODE !node-children-next
+ (!node-children-content ||
!node-children-content[0] || !xmlStrcmp(node-children-content, 0 ) {
+ exists = 0;
+ }
}
}
}
@@ -2420,7 +2430,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.151.2.22.2.31 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.151.2.22.2.32 $);
php_info_print_table_row(2, Schema support,
#ifdef LIBXML_SCHEMAS_ENABLED
enabled);
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.813r2=1.2027.2.547.2.814diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.813 php-src/NEWS:1.2027.2.547.2.814
--- php-src/NEWS:1.2027.2.547.2.813 Tue Jul 3 15:03:16 2007
+++ php-src/NEWSWed Jul 4 05:05:57 2007
@@ -37,6 +37,7 @@
(Ilia)
- Fixed INFILE LOCAL option handling with MySQL extensions not to be allowed
when open_basedir or safe_mode is active. (Stas)
+- Faxed SimpleXML's behavior when used with empty(). (Sara)
- Fixed PECL Bug #11345 (PDO_OCI crash after National language Support
NLS environment initialization error) (Chris Jones)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
