date:20051031

[PHP-CVS] cvs: php-src /ext/simplexml simplexml.c /ext/simplexml/tests 025.phpt

2005-10-31 Thread Marcus Boerger

helly   Mon Oct 31 14:09:13 2005 EDT

  Added files: 
/php-src/ext/simplexml/tests025.phpt 

  Modified files:  
/php-src/ext/simplexml  simplexml.c 
  Log:
  - Add functions to check for registered/in use namespaces
  
  
http://cvs.php.net/diff.php/php-src/ext/simplexml/simplexml.c?r1=1.170r2=1.171ty=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.170 
php-src/ext/simplexml/simplexml.c:1.171
--- php-src/ext/simplexml/simplexml.c:1.170 Sun Oct 30 15:37:07 2005
+++ php-src/ext/simplexml/simplexml.c   Mon Oct 31 14:09:10 2005
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: simplexml.c,v 1.170 2005/10/30 20:37:07 helly Exp $ */
+/* $Id: simplexml.c,v 1.171 2005/10/31 19:09:10 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -896,10 +896,7 @@
 }
 /* }}} */
 
-/* {{{ sxe_objects_compare()
- */
-static int
-sxe_objects_compare(zval *object1, zval *object2 TSRMLS_DC)
+static int sxe_objects_compare(zval *object1, zval *object2 TSRMLS_DC) /* {{{ 
*/
 {
php_sxe_object *sxe1;
php_sxe_object *sxe2;
@@ -1103,6 +1100,99 @@
 }
 /* }}} */
 
+static void sxe_add_namespaces(php_sxe_object *sxe, xmlNodePtr node, zend_bool 
recursive, zval *return_value TSRMLS_DC) /* {{{ */
+{
+   xmlAttrPtr  attr;
+
+   if (node-ns) { 
+   add_assoc_string(return_value, (char*)node-ns-prefix, 
(char*)node-ns-href, 1);
+   }
+
+   attr = node-properties;
+   while (attr) {
+   if (attr-ns) { 
+   add_assoc_string(return_value, (char*)attr-ns-prefix, 
(char*)attr-ns-href, 1);
+   }
+   attr = attr-next;
+   }
+
+   if (recursive) {
+   node = node-children;
+   while (node) {
+   sxe_add_namespaces(sxe, node, recursive, return_value 
TSRMLS_CC);
+   node = node-next;
+   }
+   }
+} /* }}} */
+
+/* {{{ proto string SimpleXMLElement::getNamespaces([bool recursve])
+   Return all namespaces in use */
+SXE_METHOD(getNamespaces)
+{
+   zend_bool   recursive = 0;
+   php_sxe_object *sxe;
+   xmlNodePtr  node;
+
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |b, recursive) 
== FAILURE) {
+   return;
+   }
+
+   array_init(return_value);
+
+   sxe = php_sxe_fetch_object(getThis() TSRMLS_CC);
+   GET_NODE(sxe, node);
+   node = php_sxe_get_first_node(sxe, node TSRMLS_CC);
+
+   while (node) {
+   SKIP_TEXT(node)
+   if (node-type == XML_ELEMENT_NODE) {
+   sxe_add_namespaces(sxe, node, recursive, return_value 
TSRMLS_CC);
+   } else if (node-ns) {
+   add_assoc_string(return_value, (char*)node-ns-prefix, 
(char*)node-ns-href, 1);
+   }
+next_iter:
+   node = node-next;
+   }
+}
+/* }}} */
+
+static void sxe_add_registered_namespaces(php_sxe_object *sxe, xmlDocPtr doc, 
xmlNodePtr node, zend_bool recursive, zval *return_value TSRMLS_DC) /* {{{ */
+{
+   xmlNsPtr *ns = xmlGetNsList(doc, node);
+
+   while (ns  ns[0]) {
+   add_assoc_string(return_value, (char*)ns[0]-prefix, 
(char*)ns[0]-href, 1);
+   ns++;
+   }
+
+   if (recursive) {
+   node = node-children;
+   while (node) {
+   sxe_add_registered_namespaces(sxe, doc, node, 
recursive, return_value TSRMLS_CC);
+   node = node-next;
+   }
+   }
+}
+
+/* {{{ proto string SimpleXMLElement::getDocNamespaces([bool recursve])
+   Return all namespaces registered with document */
+SXE_METHOD(getDocNamespaces)
+{
+   zend_bool   recursive = 0;
+   php_sxe_object *sxe;
+
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |b, recursive) 
== FAILURE) {
+   return;
+   }
+
+   array_init(return_value);
+
+   sxe = php_sxe_fetch_object(getThis() TSRMLS_CC);
+
+   sxe_add_registered_namespaces(sxe, (xmlDocPtr)sxe-document-ptr, 
xmlDocGetRootElement((xmlDocPtr)sxe-document-ptr), recursive, return_value 
TSRMLS_CC);
+}
+/* }}} */
+
 /* {{{ proto object SimpleXMLElement::children()
Finds children of given node */
 SXE_METHOD(children)
@@ -1204,7 +1294,7 @@
int rv;
 
sxe = php_sxe_fetch_object(readobj TSRMLS_CC);
-
+   
if (type == IS_BOOL) {
node = php_sxe_get_first_node(sxe, NULL TSRMLS_CC);
INIT_PZVAL(writeobj);
@@ -1830,9 +1920,11 @@
SXE_ME(__construct,NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL) /* 
must be called */
SXE_ME(asXML,  NULL, ZEND_ACC_PUBLIC)
SXE_ME(xpath,  NULL, ZEND_ACC_PUBLIC)
-   SXE_ME(registerXPathNamespace,  NULL, ZEND_ACC_PUBLIC)
+

[PHP-CVS] cvs: php-src /ext/simplexml php_simplexml_exports.h

2005-10-31 Thread Marcus Boerger

helly   Mon Oct 31 14:47:00 2005 EDT

  Modified files:  
/php-src/ext/simplexml  php_simplexml_exports.h 
  Log:
  - We don't need those
  
http://cvs.php.net/diff.php/php-src/ext/simplexml/php_simplexml_exports.h?r1=1.4r2=1.5ty=u
Index: php-src/ext/simplexml/php_simplexml_exports.h
diff -u php-src/ext/simplexml/php_simplexml_exports.h:1.4 
php-src/ext/simplexml/php_simplexml_exports.h:1.5
--- php-src/ext/simplexml/php_simplexml_exports.h:1.4   Mon Oct  3 12:04:50 2005
+++ php-src/ext/simplexml/php_simplexml_exports.h   Mon Oct 31 14:47:00 2005
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: php_simplexml_exports.h,v 1.4 2005/10/03 16:04:50 helly Exp $ */
+/* $Id: php_simplexml_exports.h,v 1.5 2005/10/31 19:47:00 helly Exp $ */
 
 #ifndef PHP_SIMPLEXML_EXPORTS_H
 #define PHP_SIMPLEXML_EXPORTS_H
@@ -49,9 +49,6 @@
 }
 /* }}} */
 
-ZEND_API void php_sxe_reset_iterator(php_sxe_object *sxe TSRMLS_DC);
-ZEND_API void php_sxe_move_forward_iterator(php_sxe_object *sxe TSRMLS_DC);
-
 typedef struct {
zend_object_iterator  intern;
php_sxe_object*sxe;

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

2005-10-31 Thread Rob Richards

rrichards   Mon Oct 31 14:51:44 2005 EDT

  Modified files:  
/php-src/ext/simplexml  simplexml.c 
  Log:
  check node type before accessing ns - prevent corruption under compact mode
  
http://cvs.php.net/diff.php/php-src/ext/simplexml/simplexml.c?r1=1.171r2=1.172ty=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.171 
php-src/ext/simplexml/simplexml.c:1.172
--- php-src/ext/simplexml/simplexml.c:1.171 Mon Oct 31 14:09:10 2005
+++ php-src/ext/simplexml/simplexml.c   Mon Oct 31 14:51:40 2005
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: simplexml.c,v 1.171 2005/10/31 19:09:10 helly Exp $ */
+/* $Id: simplexml.c,v 1.172 2005/10/31 19:51:40 rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -1119,7 +1119,9 @@
if (recursive) {
node = node-children;
while (node) {
-   sxe_add_namespaces(sxe, node, recursive, return_value 
TSRMLS_CC);
+   if (node-type == XML_ELEMENT_NODE) {
+   sxe_add_namespaces(sxe, node, recursive, 
return_value TSRMLS_CC);
+   }
node = node-next;
}
}
@@ -1147,7 +1149,7 @@
SKIP_TEXT(node)
if (node-type == XML_ELEMENT_NODE) {
sxe_add_namespaces(sxe, node, recursive, return_value 
TSRMLS_CC);
-   } else if (node-ns) {
+   } else if (node-type == XML_ATTRIBUTE_NODE  node-ns) {
add_assoc_string(return_value, (char*)node-ns-prefix, 
(char*)node-ns-href, 1);
}
 next_iter:
@@ -1977,7 +1979,7 @@
 {
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
-   php_info_print_table_row(2, Revision, $Revision: 1.171 $);
+   php_info_print_table_row(2, Revision, $Revision: 1.172 $);
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 /ext/simplexml simplexml.c /ext/simplexml/tests 000.phpt

2005-10-31 Thread Marcus Boerger

helly   Mon Oct 31 15:06:29 2005 EDT

  Modified files:  
/php-src/ext/simplexml  simplexml.c 
/php-src/ext/simplexml/tests000.phpt 
  Log:
  - Implement count interface
  
  http://cvs.php.net/diff.php/php-src/ext/simplexml/simplexml.c?r1=1.172r2=1.173ty=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.172 
php-src/ext/simplexml/simplexml.c:1.173
--- php-src/ext/simplexml/simplexml.c:1.172 Mon Oct 31 14:51:40 2005
+++ php-src/ext/simplexml/simplexml.c   Mon Oct 31 15:06:23 2005
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: simplexml.c,v 1.172 2005/10/31 19:51:40 rrichards Exp $ */
+/* $Id: simplexml.c,v 1.173 2005/10/31 20:06:23 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -53,6 +53,8 @@
 
 static php_sxe_object* php_sxe_object_new(zend_class_entry *ce TSRMLS_DC);
 static zend_object_value php_sxe_register_object(php_sxe_object * TSRMLS_DC);
+static xmlNodePtr php_sxe_reset_iterator(php_sxe_object *sxe, int use_data 
TSRMLS_DC);
+static xmlNodePtr php_sxe_iterator_fetch(php_sxe_object *sxe, xmlNodePtr node, 
int use_data TSRMLS_DC);
 
 /* {{{ _node_as_zval()
  */
@@ -103,7 +105,7 @@
xmlNodePtr retnode = NULL;
 
if (sxe  sxe-iter.type != SXE_ITER_NONE) {
-   php_sxe_reset_iterator(sxe TSRMLS_CC);
+   php_sxe_reset_iterator(sxe, 1 TSRMLS_CC);
if (sxe-iter.data) {
intern = (php_sxe_object 
*)zend_object_store_get_object(sxe-iter.data TSRMLS_CC);
GET_NODE(intern, retnode)
@@ -1332,6 +1334,26 @@
 }
 /* }}} */
 
+static int sxe_count_elements(zval *object, long *count TSRMLS_DC) /* {{{ */
+{
+   php_sxe_object  *sxe;
+   xmlNodePtr   node;
+
+   *count = 0;
+   sxe = php_sxe_fetch_object(object TSRMLS_CC);
+   node = php_sxe_reset_iterator(sxe, 0 TSRMLS_CC);
+   
+   while (node)
+   {
+   (*count)++;
+   node = php_sxe_iterator_fetch(sxe, node-next, 0 TSRMLS_CC);
+   }
+
+
+   return SUCCESS;
+}
+/* }}} */
+
 static zval *sxe_get_value(zval *z TSRMLS_DC)
 {
zval *retval;
@@ -1369,7 +1391,7 @@
NULL, /* zend_get_std_object_handlers()-get_class_name,*/
sxe_objects_compare,
sxe_object_cast,
-   NULL
+   sxe_count_elements
 };
 
 static zend_object_handlers sxe_ze1_object_handlers = {
@@ -1393,7 +1415,7 @@
NULL, /* zend_get_std_object_handlers()-get_class_name,*/
sxe_objects_compare,
sxe_object_cast,
-   NULL
+   sxe_count_elements
 };
 
 static zend_object_value sxe_object_ze1_clone(zval *zobject TSRMLS_DC)
@@ -1664,7 +1686,7 @@
php_sxe_iterator_rewind,
 };
 
-static void php_sxe_iterator_fetch(php_sxe_object *sxe, xmlNodePtr node 
TSRMLS_DC)
+static xmlNodePtr php_sxe_iterator_fetch(php_sxe_object *sxe, xmlNodePtr node, 
int use_data TSRMLS_DC)
 {
char *prefix = sxe-iter.nsprefix;
int test_elem = sxe-iter.type == SXE_ITER_ELEMENT   sxe-iter.name;
@@ -1685,13 +1707,15 @@
node = node-next;
}
 
-   if (node) {
+   if (node  use_data) {
ALLOC_INIT_ZVAL(sxe-iter.data);
_node_as_zval(sxe, node, sxe-iter.data, SXE_ITER_NONE, NULL, 
sxe-iter.nsprefix TSRMLS_CC);
}
+
+   return node;
 }
 
-ZEND_API void php_sxe_reset_iterator(php_sxe_object *sxe TSRMLS_DC)
+static xmlNodePtr php_sxe_reset_iterator(php_sxe_object *sxe, int use_data 
TSRMLS_DC)
 {
xmlNodePtr node;
 
@@ -1712,8 +1736,9 @@
case SXE_ITER_ATTRLIST:
node = (xmlNodePtr) node-properties;
}
-   php_sxe_iterator_fetch(sxe, node TSRMLS_CC);
+   return php_sxe_iterator_fetch(sxe, node, use_data TSRMLS_CC);
}
+   return NULL;
 }
 
 zend_object_iterator *php_sxe_get_iterator(zend_class_entry *ce, zval *object 
TSRMLS_DC)
@@ -1798,7 +1823,7 @@
}
 
if (node) {
-   php_sxe_iterator_fetch(sxe, node-next TSRMLS_CC);
+   php_sxe_iterator_fetch(sxe, node-next, 1 TSRMLS_CC);
}
 }
 
@@ -1815,10 +1840,9 @@
php_sxe_iterator *iterator = (php_sxe_iterator *)iter;
sxe = iterator-sxe;
 
-   php_sxe_reset_iterator(sxe TSRMLS_CC);
+   php_sxe_reset_iterator(sxe, 1 TSRMLS_CC);
 }
 
-
 void *simplexml_export_node(zval *object TSRMLS_DC)
 {
php_sxe_object *sxe;
@@ -1979,7 +2003,7 @@
 {
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
-   php_info_print_table_row(2, Revision, $Revision: 1.172 $);
+   php_info_print_table_row(2, Revision, $Revision: 1.173 $);
php_info_print_table_row(2, Schema support,
 #ifdef LIBXML_SCHEMAS_ENABLED
enabled);

[PHP-CVS] cvs: php-src /ext/spl spl.php spl_sxe.c /ext/spl/tests sxe_005.phpt

2005-10-31 Thread Marcus Boerger

helly   Mon Oct 31 15:29:34 2005 EDT

  Added files: 
/php-src/ext/spl/tests  sxe_005.phpt 

  Modified files:  
/php-src/ext/splspl.php spl_sxe.c 
  Log:
  - Make SimpleXMLIterator implement Countable
  
  
http://cvs.php.net/diff.php/php-src/ext/spl/spl.php?r1=1.61r2=1.62ty=u
Index: php-src/ext/spl/spl.php
diff -u php-src/ext/spl/spl.php:1.61 php-src/ext/spl/spl.php:1.62
--- php-src/ext/spl/spl.php:1.61Mon Oct 10 17:06:54 2005
+++ php-src/ext/spl/spl.php Mon Oct 31 15:29:29 2005
@@ -932,7 +932,7 @@
  * has subelements, hasChildren() returns true.  This will trigger a call to
  * getChildren() which returns the iterator for that sub element.
  */
-class SimpleXMLIterator extends SimpleXMLElement implements RecursiveIterator
+class SimpleXMLIterator extends SimpleXMLElement implements RecursiveIterator, 
Countable
 {
/** @return whether the current node has sub nodes.
 */
@@ -941,6 +941,10 @@
/** @return a SimpleXMLIterator for the current node.
 */
function getChildren(); 
+
+   /** @return number of elements/attributes seen with foreach()
+*/
+   function count();
 }
 
 /** @ingroup SPL
http://cvs.php.net/diff.php/php-src/ext/spl/spl_sxe.c?r1=1.14r2=1.15ty=u
Index: php-src/ext/spl/spl_sxe.c
diff -u php-src/ext/spl/spl_sxe.c:1.14 php-src/ext/spl/spl_sxe.c:1.15
--- php-src/ext/spl/spl_sxe.c:1.14  Sat Oct 29 16:37:59 2005
+++ php-src/ext/spl/spl_sxe.c   Mon Oct 31 15:29:29 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: spl_sxe.c,v 1.14 2005/10/29 20:37:59 helly Exp $ */
+/* $Id: spl_sxe.c,v 1.15 2005/10/31 20:29:29 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include config.h
@@ -32,6 +32,7 @@
 #include spl_engine.h
 #include spl_iterators.h
 #include spl_sxe.h
+#include spl_array.h
 
 zend_class_entry *spl_ce_SimpleXMLIterator = NULL;
 zend_class_entry *spl_ce_SimpleXMLElement;
@@ -135,6 +136,15 @@
return_value-value.obj = zend_objects_store_clone_obj(sxe-iter.data 
TSRMLS_CC);
 }
 
+SPL_METHOD(SimpleXMLIterator, count) /* {{{ */
+{
+   long count = 0;
+
+   Z_OBJ_HANDLER_P(getThis(), count_elements)(getThis(), count TSRMLS_CC);
+   
+   RETURN_LONG(count);
+}
+
 static zend_function_entry spl_funcs_SimpleXMLIterator[] = {
SPL_ME(SimpleXMLIterator, rewind, NULL, ZEND_ACC_PUBLIC)
SPL_ME(SimpleXMLIterator, valid,  NULL, ZEND_ACC_PUBLIC)
@@ -143,6 +153,7 @@
SPL_ME(SimpleXMLIterator, next,   NULL, ZEND_ACC_PUBLIC)
SPL_ME(SimpleXMLIterator, hasChildren,NULL, ZEND_ACC_PUBLIC)
SPL_ME(SimpleXMLIterator, getChildren,NULL, ZEND_ACC_PUBLIC)
+   SPL_ME(SimpleXMLIterator, count,  NULL, ZEND_ACC_PUBLIC)
{NULL, NULL, NULL}
 };
 /* }}} */
@@ -161,6 +172,7 @@
 
REGISTER_SPL_SUB_CLASS_EX(SimpleXMLIterator, SimpleXMLElement, 
spl_ce_SimpleXMLElement-create_object, spl_funcs_SimpleXMLIterator);
REGISTER_SPL_IMPLEMENTS(SimpleXMLIterator, RecursiveIterator);
+   REGISTER_SPL_IMPLEMENTS(SimpleXMLIterator, Countable);
 
return SUCCESS;
 }

http://cvs.php.net/co.php/php-src/ext/spl/tests/sxe_005.phpt?r=1.1p=1
Index: php-src/ext/spl/tests/sxe_005.phpt
+++ php-src/ext/spl/tests/sxe_005.phpt
--TEST--
SPL: SimpleXMLIterator and getChildren()
--SKIPIF--
?php 
if (!extension_loaded(spl)) print skip;
if (!extension_loaded('simplexml')) print 'skip';
if (!extension_loaded(libxml)) print skip LibXML not present;
if (!class_exists('RecursiveIteratorIterator')) print 'skip 
RecursiveIteratorIterator not available';
?
--FILE--
?php 

$xml =EOF
?xml version='1.0'?
sxe
 elem1/
 elem2/
 elem2/
/sxe
EOF;

class SXETest extends SimpleXMLIterator
{
function count()
{
echo __METHOD__ . \n;
return parent::count();
}
}

$sxe = new SXETest($xml);

var_dump(count($sxe));
var_dump(count($sxe-elem1));
var_dump(count($sxe-elem2));

?
===DONE===
--EXPECT--
SXETest::count
int(3)
SXETest::count
int(1)
SXETest::count
int(2)
===DONE===

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

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/simplexml php_simplexml_exports.h simplexml.c

2005-10-31 Thread Marcus Boerger

helly   Mon Oct 31 16:20:48 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/simplexml  php_simplexml_exports.h simplexml.c 
  Log:
  - Drop unnecessary exports to prevent forward BC problems
  
  
http://cvs.php.net/diff.php/php-src/ext/simplexml/php_simplexml_exports.h?r1=1.3.2.1r2=1.3.2.2ty=u
Index: php-src/ext/simplexml/php_simplexml_exports.h
diff -u php-src/ext/simplexml/php_simplexml_exports.h:1.3.2.1 
php-src/ext/simplexml/php_simplexml_exports.h:1.3.2.2
--- php-src/ext/simplexml/php_simplexml_exports.h:1.3.2.1   Mon Oct  3 
12:05:08 2005
+++ php-src/ext/simplexml/php_simplexml_exports.h   Mon Oct 31 16:20:44 2005
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: php_simplexml_exports.h,v 1.3.2.1 2005/10/03 16:05:08 helly Exp $ */
+/* $Id: php_simplexml_exports.h,v 1.3.2.2 2005/10/31 21:20:44 helly Exp $ */
 
 #ifndef PHP_SIMPLEXML_EXPORTS_H
 #define PHP_SIMPLEXML_EXPORTS_H
@@ -49,9 +49,6 @@
 }
 /* }}} */
 
-ZEND_API void php_sxe_reset_iterator(php_sxe_object *sxe TSRMLS_DC);
-ZEND_API void php_sxe_move_forward_iterator(php_sxe_object *sxe TSRMLS_DC);
-
 typedef struct {
zend_object_iterator  intern;
php_sxe_object*sxe;
http://cvs.php.net/diff.php/php-src/ext/simplexml/simplexml.c?r1=1.151.2.4r2=1.151.2.5ty=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.151.2.4 
php-src/ext/simplexml/simplexml.c:1.151.2.5
--- php-src/ext/simplexml/simplexml.c:1.151.2.4 Mon Oct 24 04:29:32 2005
+++ php-src/ext/simplexml/simplexml.c   Mon Oct 31 16:20:44 2005
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: simplexml.c,v 1.151.2.4 2005/10/24 08:29:32 helly Exp $ */
+/* $Id: simplexml.c,v 1.151.2.5 2005/10/31 21:20:44 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -51,6 +51,8 @@
 
 static php_sxe_object* php_sxe_object_new(zend_class_entry *ce TSRMLS_DC);
 static zend_object_value php_sxe_register_object(php_sxe_object * TSRMLS_DC);
+static void php_sxe_reset_iterator(php_sxe_object *sxe TSRMLS_DC);
+static void php_sxe_move_forward_iterator(php_sxe_object *sxe TSRMLS_DC);
 
 /* {{{ _node_as_zval()
  */
@@ -1404,7 +1406,7 @@
php_sxe_iterator_rewind,
 };
 
-ZEND_API void php_sxe_reset_iterator(php_sxe_object *sxe TSRMLS_DC)
+static void php_sxe_reset_iterator(php_sxe_object *sxe TSRMLS_DC)
 {
xmlNodePtr node;
char *prefix;
@@ -1519,7 +1521,7 @@
 
 }
 
-ZEND_API void php_sxe_move_forward_iterator(php_sxe_object *sxe TSRMLS_DC)
+static void php_sxe_move_forward_iterator(php_sxe_object *sxe TSRMLS_DC)
 {
xmlNodePtr  node = NULL;
php_sxe_object  *intern;
@@ -1743,7 +1745,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.4 $);
+   php_info_print_table_row(2, Revision, $Revision: 1.151.2.5 $);
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_1) /ext/curl interface.c

2005-10-31 Thread Ilia Alshanetsky

iliaa   Mon Oct 31 18:44:44 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/curl   interface.c 
  Log:
  Additional open_basedir/safe_mode checks.
  
  
http://cvs.php.net/diff.php/php-src/ext/curl/interface.c?r1=1.62.2.5r2=1.62.2.6ty=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.5 
php-src/ext/curl/interface.c:1.62.2.6
--- php-src/ext/curl/interface.c:1.62.2.5   Wed Oct 26 07:33:25 2005
+++ php-src/ext/curl/interface.cMon Oct 31 18:44:40 2005
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.5 2005/10/26 11:33:25 sniper Exp $ */
+/* $Id: interface.c,v 1.62.2.6 2005/10/31 23:44:40 iliaa Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -119,7 +119,7 @@
RETURN_FALSE;   

\
}   

\


\
-   if (tmp_url-query || php_check_open_basedir(tmp_url-path 
TSRMLS_CC) ||   
 \
+   if (tmp_url-query || tmp_url-fragment || 
php_check_open_basedir(tmp_url-path TSRMLS_CC) ||  
 \
(PG(safe_mode)  !php_checkuid(tmp_url-path, rb+, 
CHECKUID_CHECK_MODE_PARAM))   \
) { 

\
php_url_free(tmp_url);  

\

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

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

2005-10-31 Thread Ilia Alshanetsky

iliaa   Mon Oct 31 18:45:50 2005 EDT

  Modified files:  
/php-src/ext/curl   interface.c 
  Log:
  MFB51: Additional open_basedir/safe_mode checks.
  
  
http://cvs.php.net/diff.php/php-src/ext/curl/interface.c?r1=1.68r2=1.69ty=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.68 php-src/ext/curl/interface.c:1.69
--- php-src/ext/curl/interface.c:1.68   Wed Oct 26 07:33:05 2005
+++ php-src/ext/curl/interface.cMon Oct 31 18:45:50 2005
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.68 2005/10/26 11:33:05 sniper Exp $ */
+/* $Id: interface.c,v 1.69 2005/10/31 23:45:50 iliaa Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -119,7 +119,7 @@
RETURN_FALSE;   

\
}   

\


\
-   if (tmp_url-query || php_check_open_basedir(tmp_url-path 
TSRMLS_CC) ||   
 \
+   if (tmp_url-query || tmp_url-fragment || 
php_check_open_basedir(tmp_url-path TSRMLS_CC) ||  
 \
(PG(safe_mode)  !php_checkuid(tmp_url-path, rb+, 
CHECKUID_CHECK_MODE_PARAM))   \
) { 

\
php_url_free(tmp_url);  

\

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

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

2005-10-31 Thread Ilia Alshanetsky

iliaa   Mon Oct 31 18:47:27 2005 EDT

  Modified files:  (Branch: PHP_4_4)
/php-src/ext/curl   curl.c 
/php-srcNEWS 
  Log:
  MFH: Additional open_basedir/safe_mode checks.
  
  
http://cvs.php.net/diff.php/php-src/ext/curl/curl.c?r1=1.124.2.30.2.3r2=1.124.2.30.2.4ty=u
Index: php-src/ext/curl/curl.c
diff -u php-src/ext/curl/curl.c:1.124.2.30.2.3 
php-src/ext/curl/curl.c:1.124.2.30.2.4
--- php-src/ext/curl/curl.c:1.124.2.30.2.3  Sun Oct 16 22:42:51 2005
+++ php-src/ext/curl/curl.c Mon Oct 31 18:47:21 2005
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: curl.c,v 1.124.2.30.2.3 2005/10/17 02:42:51 iliaa Exp $ */
+/* $Id: curl.c,v 1.124.2.30.2.4 2005/10/31 23:47:21 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -76,7 +76,7 @@
RETURN_FALSE;   

\
}   

\


\
-   if (tmp_url-query || php_check_open_basedir(tmp_url-path 
TSRMLS_CC) ||   
 \
+   if (tmp_url-query || tmp_url-fragment || 
php_check_open_basedir(tmp_url-path TSRMLS_CC) ||  
 \
(PG(safe_mode)  !php_checkuid(tmp_url-path, rb+, 
CHECKUID_CHECK_MODE_PARAM))   \
) { 

\
php_url_free(tmp_url);  

\
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.920.2.63r2=1.1247.2.920.2.64ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.63 php-src/NEWS:1.1247.2.920.2.64
--- php-src/NEWS:1.1247.2.920.2.63  Sun Oct 30 05:55:20 2005
+++ php-src/NEWSMon Oct 31 18:47:24 2005
@@ -1,6 +1,7 @@
 PHP 4  NEWS
 |||
 ?? ??? 2006, Version 4.4.2
+- Missing safe_mode/open_basedir check in cURL extension. (Ilia)
 - Fixed bug #34996 (ImageTrueColorToPalette() crashes when ncolors is 
   zero). (Tony)
 

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

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/ftp config.m4

2005-10-31 Thread Brian France

bfrance Mon Oct 31 19:32:23 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/ftpconfig.m4 
  Log:
  Fixed phpize build (default PHP_OPENSSL to no if not set)
  
http://cvs.php.net/diff.php/php-src/ext/ftp/config.m4?r1=1.7.20.2r2=1.7.20.3ty=u
Index: php-src/ext/ftp/config.m4
diff -u php-src/ext/ftp/config.m4:1.7.20.2 php-src/ext/ftp/config.m4:1.7.20.3
--- php-src/ext/ftp/config.m4:1.7.20.2  Sun Oct  9 16:44:02 2005
+++ php-src/ext/ftp/config.m4   Mon Oct 31 19:32:21 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.7.20.2 2005/10/09 20:44:02 sniper Exp $
+dnl $Id: config.m4,v 1.7.20.3 2005/11/01 00:32:21 bfrance Exp $
 dnl
 
 PHP_ARG_ENABLE(ftp,whether to enable FTP support,
@@ -12,6 +12,9 @@
   AC_DEFINE(HAVE_FTP,1,[Whether you want FTP support])
   PHP_NEW_EXTENSION(ftp, php_ftp.c ftp.c, $ext_shared)
 
+  dnl Empty variable means 'no'
+  test -z $PHP_OPENSSL  PHP_OPENSSL=no
+
   if test $PHP_OPENSSL != no || test $PHP_OPENSSL_DIR != no; then
 PHP_SETUP_OPENSSL(FTP_SHARED_LIBADD)
 PHP_SUBST(FTP_SHARED_LIBADD)

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

[PHP-CVS] cvs: php-src /ext/ftp config.m4

2005-10-31 Thread Brian France

bfrance Mon Oct 31 19:46:49 2005 EDT

  Modified files:  
/php-src/ext/ftpconfig.m4 
  Log:
  MFB: Fixed phpize build (default PHP_OPENSSL to no if not set)
  
http://cvs.php.net/diff.php/php-src/ext/ftp/config.m4?r1=1.10r2=1.11ty=u
Index: php-src/ext/ftp/config.m4
diff -u php-src/ext/ftp/config.m4:1.10 php-src/ext/ftp/config.m4:1.11
--- php-src/ext/ftp/config.m4:1.10  Sun Oct  9 16:44:26 2005
+++ php-src/ext/ftp/config.m4   Mon Oct 31 19:46:44 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.10 2005/10/09 20:44:26 sniper Exp $
+dnl $Id: config.m4,v 1.11 2005/11/01 00:46:44 bfrance Exp $
 dnl
 
 PHP_ARG_ENABLE(ftp,whether to enable FTP support,
@@ -12,6 +12,9 @@
   AC_DEFINE(HAVE_FTP,1,[Whether you want FTP support])
   PHP_NEW_EXTENSION(ftp, php_ftp.c ftp.c, $ext_shared)
 
+  dnl Empty variable means 'no'
+  test -z $PHP_OPENSSL  PHP_OPENSSL=no
+
   if test $PHP_OPENSSL != no || test $PHP_OPENSSL_DIR != no; then
 PHP_SETUP_OPENSSL(FTP_SHARED_LIBADD)
 PHP_SUBST(FTP_SHARED_LIBADD)

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

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo package.xml

2005-10-31 Thread Wez Furlong

wez Mon Oct 31 21:44:13 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/pdopackage.xml 
  Log:
  Prep for PECL release
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo/package.xml?r1=1.19.2.3r2=1.19.2.4ty=u
Index: php-src/ext/pdo/package.xml
diff -u php-src/ext/pdo/package.xml:1.19.2.3 
php-src/ext/pdo/package.xml:1.19.2.4
--- php-src/ext/pdo/package.xml:1.19.2.3Sun Sep 11 15:44:26 2005
+++ php-src/ext/pdo/package.xml Mon Oct 31 21:44:11 2005
@@ -42,9 +42,14 @@
  release
   statebeta/state
   version1.0RC2/version
-  date2005-09-11/date
+  date2005-11-01/date
 
   notes
+** NOTE WELL! **
+All the PDO_XXX constants have been renamed to PDO::XXX form for future
+compatibility with PHP namespaces.  Sorry for the inconvenience, especially
+after Release Candidate 1.
+
 You need to install a PDO database driver to make use of PDO,
 check http://pecl.php.net/package-search.php?pkg_name=PDO
 for a list of available PDO drivers.
@@ -53,34 +58,28 @@
 before using PDO.
 You can obtain it from http://snaps.php.net.
 
-If you are running on Windows, you should download:
-http://snaps.php.net/win32/php5.0-win32-latest.zip
-http://snaps.php.net/win32/PECL_5_0/php_pdo.dll
+If you are running on Windows, you can find a precompiled binary at:
+http://pecl4win.php.net/ext.php/php_pdo.dll
 
 You can find additional PDO drivers at:
-http://snaps.php.net/win32/PECL_5_0/
-
-- Fixed an issue with the installation of the pdo headers
+http://pecl4win.php.net
 
-- Consult the PHP 5.1b3 release notes and http://netevil.org/node.php?nid=325
-  for more recent changes.
+** Changes **
 
-- New fetch modes:
-  PDO_FETCH_FUNC, PDO_FETCH_GROUP, PDO_FETCH_UNIQUE, PDO_FETCH_CLASSTYPE
-- New fetch mode for PHP 5.1 and higher: PDO_FETCH_SERIALIZE
-- Changed signature for PDO::lastInsertId(); it is now:
-string PDO::lastInsertId([string name])
-  this allows arbitrary unique identifiers to be returned, and allows for 
-  better support for RDBMS with sequences.
-- Improved bound parameter emulation when using non-string types.
-- PDOStatement implements SPL Traversable interface when SPL is present.
-
-- Added PDO::quote($string).  Closes PECL Bug #3393
-- Fixed PDO::query() for drivers using bound parameter emulation.
-- Fixed PECL Bug #3434, crash when using odbc with named parameters.
-- Added PDOStatement::fetchObject(string class_name [, NULL|array ctor_args]])
-- PDO_FETCH_CLASS now passes args through to the class constructor
-- Now builds directly via pear install PDO (upgrade to PEAR 1.3.5 first)
+- Changed PDO_XXX constants to PDO::XXX
+- Fixed PECL Bug #5010, problem installing headers
+- renamed pdo_drivers() to PDO::getAvailableDrivers()
+- Various fixes when building with SPL
+- It is now possible to extend PDO and PDOStatement and override their 
constructors
+- PDO::setAttribute(PDO::ATTR_STATEMENT_CLASS) allows you to set your own
+  PDOStatement replacement when extending PDO and PDOStatement
+- Fixed Bug #34687; error information from PDO::query() was not always returned
+- Fixed PECL Bug #5750; uri: DSN was not handled correctly
+- Fixed PECL Bug #5589; segfault when persistent connection attempt fails
+- Fixed Bug #34590; User defined PDOStatement class methods are not callable
+- Fixed Bug #34908; FETCH_INTO segfaults without destination object
+- Fixed PECL Bug #5809; PDOStatement::execute(array(...)) modifies args
+- Fixed PECL Bug #5772; FETCH_FUNC cannot call functions with mixed case names
 
 ** Note **
 

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

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_dblib package.xml

2005-10-31 Thread Wez Furlong

wez Mon Oct 31 21:46:12 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/pdo_dblib  package.xml 
  Log:
  prep for PECL release
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo_dblib/package.xml?r1=1.2.2.1r2=1.2.2.2ty=u
Index: php-src/ext/pdo_dblib/package.xml
diff -u php-src/ext/pdo_dblib/package.xml:1.2.2.1 
php-src/ext/pdo_dblib/package.xml:1.2.2.2
--- php-src/ext/pdo_dblib/package.xml:1.2.2.1   Sun Sep 11 01:27:29 2005
+++ php-src/ext/pdo_dblib/package.xml   Mon Oct 31 21:46:12 2005
@@ -24,11 +24,17 @@
  licensePHP/license
  release
   statebeta/state
-  version1.0RC1/version
-  date2005-09-11/date
+  version1.0RC2/version
+  date2005-11-01/date
 
   notes
-   Update code for API changes in PDO; no actual changes have been made to 
this driver.
+Update code for API changes in PDO; no actual changes have been made to this 
driver.
+
+Windows binaries can be found at:
+http://pecl4win.php.net/ext.php/php_pdo_mssql.dll,
+
+however: you are *strongly* recommended to use PDO_ODBC instead of this driver 
on
+Windows platforms.
   /notes
 
   filelist
@@ -44,7 +50,7 @@
   /filelist
   deps
dep type=php rel=ge version=5.0.3/
-   dep type=ext name=pdo rel=ge version=1.0RC1/
+   dep type=ext name=pdo rel=ge version=1.0RC2/
   /deps
  /release
 /package

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

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_mysql package.xml

2005-10-31 Thread Wez Furlong

wez Mon Oct 31 22:00:07 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/pdo_mysql  package.xml 
  Log:
  prep for PECL release
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/package.xml?r1=1.11.2.1r2=1.11.2.2ty=u
Index: php-src/ext/pdo_mysql/package.xml
diff -u php-src/ext/pdo_mysql/package.xml:1.11.2.1 
php-src/ext/pdo_mysql/package.xml:1.11.2.2
--- php-src/ext/pdo_mysql/package.xml:1.11.2.1  Sun Sep 11 01:27:30 2005
+++ php-src/ext/pdo_mysql/package.xml   Mon Oct 31 22:00:05 2005
@@ -25,17 +25,27 @@
 
  /maintainers
  description
-  This extension provides a Mysql 3.x/4.x driver for PDO.
+  This extension provides a MySQL driver for PDO.
  /description
  licensePHP/license
  release
   statebeta/state
-  version1.0RC1/version
-  date2005-09-11/date
+  version1.0RC2/version
+  date2005-10-01/date
 
   notes
-   Much more robust, featuring native prepared statements and multi-rowset
-   query support.
+** Changes **
+- Improved error detection for OPTIMIZE queries
+- Added PDO::MYSQL_ATTR_LOCAL_INFILE, PDO::MYSQL_ATTR_INIT_COMMAND,
+  PDO::MYSQL_ATTR_READ_DEFAULT_FILE, PDO::MYSQL_ATTR_READ_DEFAULT_GROUP
+- Improved error reporting when using native prepared statements
+- Fixed PECL Bug #5193: improved bounds checking when calling getColumnMeta()
+- Fixed Bug #34630: improved (emulated) LOB support
+- Fixed Bug #34623: crash when selecting longtext fields
+- Fixed PECL Bug #5802; is_null flag was sticking
+- Fixed PECL Bug #5645; added mysql client library version information to 
phpinfo() output.
+
+Windows binaries can be found at 
http://pecl4win.php.net/ext.php/php_pdo_mysql.dll
   /notes
 
   filelist
@@ -51,7 +61,7 @@
   /filelist
   deps
dep type=php rel=ge version=5.0.3/
-   dep type=ext name=pdo rel=ge version=1.0RC1/
+   dep type=ext name=pdo rel=ge version=1.0RC2/
   /deps
  /release
 /package


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

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_oci oci_statement.c

2005-10-31 Thread Wez Furlong

wez Mon Oct 31 22:04:25 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/pdo_ocioci_statement.c 
  Log:
  hrmm, typo fix.
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo_oci/oci_statement.c?r1=1.16.2.5r2=1.16.2.6ty=u
Index: php-src/ext/pdo_oci/oci_statement.c
diff -u php-src/ext/pdo_oci/oci_statement.c:1.16.2.5 
php-src/ext/pdo_oci/oci_statement.c:1.16.2.6
--- php-src/ext/pdo_oci/oci_statement.c:1.16.2.5Sun Oct 30 21:11:27 2005
+++ php-src/ext/pdo_oci/oci_statement.c Mon Oct 31 22:04:25 2005
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: oci_statement.c,v 1.16.2.5 2005/10/31 02:11:27 wez Exp $ */
+/* $Id: oci_statement.c,v 1.16.2.6 2005/11/01 03:04:25 wez Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -138,7 +138,7 @@
}
 
STMT_CALL(OCIStmtExecute, (S-H-svc, S-stmt, S-err,
-   (S-stmt_type == OCI_STMT_SELECT || 
S-have_blobs) : 1, 0, NULL, NULL,
+   (S-stmt_type == OCI_STMT_SELECT || 
S-have_blobs) ? 1 : 0, 0, NULL, NULL,
mode));
 
if (!stmt-executed) {

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

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_oci package.xml

2005-10-31 Thread Wez Furlong

wez Mon Oct 31 22:04:49 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/pdo_ocipackage.xml 
  Log:
  prep for PECL release
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo_oci/package.xml?r1=1.4.2.1r2=1.4.2.2ty=u
Index: php-src/ext/pdo_oci/package.xml
diff -u php-src/ext/pdo_oci/package.xml:1.4.2.1 
php-src/ext/pdo_oci/package.xml:1.4.2.2
--- php-src/ext/pdo_oci/package.xml:1.4.2.1 Sun Sep 11 01:27:30 2005
+++ php-src/ext/pdo_oci/package.xml Mon Oct 31 22:04:49 2005
@@ -17,16 +17,21 @@
  licensePHP/license
  release
   statebeta/state
-  version1.0RC1/version
-  date2005-09-11/date
+  version1.0RC2/version
+  date2005-11-01/date
 
   notes
-   You need to install the PDO core module before you can make use of this one.
-   You also require Oracle OCI 8 or higher client libraries installed on the
-   machine where you intend to build and/or use it.
+You need to install the PDO core module before you can make use of this one.
+You also require Oracle OCI 8 or higher client libraries installed on the
+machine where you intend to build and/or use it.

-   If you are running on windows, you can download the binary from here:
-   http://snaps.php.net/win32/PECL_5_0/php_pdo_oci.dll
+If you are running on windows, you can download the binary from here:
+http://pecl4win.php.net/ext.php/php_pdo_oci.dll
+
+** Changes **
+- Improved handling of long columns
+- Fixed PECL Bug #5722; implemented LOB support.
+
   /notes
 
   filelist
@@ -42,7 +47,7 @@
   /filelist
   deps
dep type=php rel=ge version=5.0.3/
-   dep type=ext rel=ge name=pdo version=1.0RC1/
+   dep type=ext rel=ge name=pdo version=1.0RC2/
   /deps
  /release
 /package

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

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_odbc package.xml

2005-10-31 Thread Wez Furlong

wez Mon Oct 31 22:07:42 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/pdo_odbc   package.xml 
  Log:
  prep for pecl release
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo_odbc/package.xml?r1=1.5.2.1r2=1.5.2.2ty=u
Index: php-src/ext/pdo_odbc/package.xml
diff -u php-src/ext/pdo_odbc/package.xml:1.5.2.1 
php-src/ext/pdo_odbc/package.xml:1.5.2.2
--- php-src/ext/pdo_odbc/package.xml:1.5.2.1Sun Sep 11 01:27:30 2005
+++ php-src/ext/pdo_odbc/package.xmlMon Oct 31 22:07:41 2005
@@ -21,16 +21,15 @@
  licensePHP/license
  release
   statebeta/state
-  version1.0RC1/version
-  date2005-09-11/date
+  version1.0RC2/version
+  date2005-11-01/date
 
   notes
-   You need to install the PDO core module before you can make use of this one.
-   You also require either IBM DB2 CLI libraries or unixODBC.
-
-   If you are running on windows, you can download the binary from here:
-   http://snaps.php.net/win32/PECL_5_0/php_pdo_odbc.dll
+You need to install the PDO core module before you can make use of this one.
+You also require either IBM DB2 CLI libraries or unixODBC.
 
+If you are running on windows, you can download the binary from here:
+http://pecl4win.php.net/ext.php/php_pdo_odbc.dll
   /notes
 
   filelist
@@ -46,7 +45,7 @@
   /filelist
   deps
dep type=php rel=ge version=5.0.3/
-   dep type=ext rel=ge name=pdo version=1.0RC1/
+   dep type=ext rel=ge name=pdo version=1.0RC2/
   /deps
  /release
 /package

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

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_sqlite config.m4

2005-10-31 Thread Wez Furlong

wez Mon Oct 31 22:13:33 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/pdo_sqlite config.m4 
  Log:
  Closes PECL Bug #5633.
  Build tested with 5.0.x as PECL, 5.1 as PECL and 5.1 static
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/config.m4?r1=1.26.2.5r2=1.26.2.6ty=u
Index: php-src/ext/pdo_sqlite/config.m4
diff -u php-src/ext/pdo_sqlite/config.m4:1.26.2.5 
php-src/ext/pdo_sqlite/config.m4:1.26.2.6
--- php-src/ext/pdo_sqlite/config.m4:1.26.2.5   Sat Sep 24 22:28:42 2005
+++ php-src/ext/pdo_sqlite/config.m4Mon Oct 31 22:13:32 2005
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.26.2.5 2005/09/25 02:28:42 wez Exp $
+dnl $Id: config.m4,v 1.26.2.6 2005/11/01 03:13:32 wez Exp $
 dnl config.m4 for extension pdo_sqlite
 dnl vim:et:sw=2:ts=2:
 
@@ -83,14 +83,14 @@
 
   PHP_NEW_EXTENSION(pdo_sqlite,
 $php_pdo_sqlite_sources_core $pdo_sqlite_sources,
-$ext_shared,,-I$ext_builddir/sqlite/src -DPDO_SQLITE_BUNDLED=1 
-DSQLITE_OMIT_CURSOR -I$pdo_inc_path)
+$ext_shared,,-I$ext_srcdir/sqlite/src -DPDO_SQLITE_BUNDLED=1 
-DSQLITE_OMIT_CURSOR -I$pdo_inc_path)
 
   PHP_ADD_BUILD_DIR($ext_builddir/sqlite/src, 1)
   AC_CHECK_SIZEOF(char *,4)
   AC_DEFINE(SQLITE_PTR_SZ, SIZEOF_CHAR_P, [Size of a pointer])
   PDO_SQLITE_VERSION=`cat $ext_srcdir/sqlite/VERSION`
   PDO_SQLITE_VERSION_NUMBER=`echo $PDO_SQLITE_VERSION | $AWK -F. 
'{printf(%d%03d%03d, $1, $2, $3)}'`
-  sed -e s/--VERS--/$PDO_SQLITE_VERSION/ -e 
s/--VERSION-NUMBER--/$PDO_SQLITE_VERSION_NUMBER/ 
$ext_srcdir/sqlite/src/sqlite.h.in  $ext_builddir/sqlite/src/sqlite3.h
+  sed -e s/--VERS--/$PDO_SQLITE_VERSION/ -e 
s/--VERSION-NUMBER--/$PDO_SQLITE_VERSION_NUMBER/ 
$ext_srcdir/sqlite/src/sqlite.h.in  $ext_srcdir/sqlite/src/sqlite3.h
 
   touch $ext_srcdir/sqlite/src/parse.c $ext_srcdir/sqlite/src/parse.h
 

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

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_sqlite package.xml

2005-10-31 Thread Wez Furlong

wez Mon Oct 31 22:16:36 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/pdo_sqlite package.xml 
  Log:
  prep for PECL release
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/package.xml?r1=1.10.2.2r2=1.10.2.3ty=u
Index: php-src/ext/pdo_sqlite/package.xml
diff -u php-src/ext/pdo_sqlite/package.xml:1.10.2.2 
php-src/ext/pdo_sqlite/package.xml:1.10.2.3
--- php-src/ext/pdo_sqlite/package.xml:1.10.2.2 Sun Sep 11 01:46:13 2005
+++ php-src/ext/pdo_sqlite/package.xml  Mon Oct 31 22:16:36 2005
@@ -24,21 +24,23 @@
  licensePHP/license
  release
   statebeta/state
-  version1.0RC1/version
-  date2005-09-11/date
+  version1.0RC2/version
+  date2005-11-01/date
 
   notes
-You need to install the PDO core module before you can make use of this 
one.
-This package includes a bundled SQLite 3 library.
+You need to install the PDO core module before you can make use of this one.
+This package includes a bundled SQLite 3 library.
 
-Windows binary: http://snaps.php.net/win32/PECL_5_0/php_pdo_sqlite.dll
+Windows binary:
+http://pecl4win.php.net/ext.php/php_pdo_sqlite.dll
 
-- Added sqliteCreateFunction() and sqliteCreateAggregate()
-- Fixed PECL Bug #3452; problem when first row of a result set contains a 
NULL value.
-- Upgraded bundled sqlite to 3.1.3
-- setting PDO_ATTR_TIMEOUT controls the busy timeout
-- Fixed PECL Bug #3391; cannot bind NULL parameters
-- Fixed build problem when building the bundled sqlite library
+- Fixed PECL Bug #5633; build issues
+- Added sqliteCreateFunction() and sqliteCreateAggregate()
+- Fixed PECL Bug #3452; problem when first row of a result set contains a NULL 
value.
+- Upgraded bundled sqlite to 3.1.3
+- setting PDO_ATTR_TIMEOUT controls the busy timeout
+- Fixed PECL Bug #3391; cannot bind NULL parameters
+- Fixed build problem when building the bundled sqlite library
   /notes
 
   filelist
@@ -168,7 +170,7 @@
   /filelist
   deps
dep type=php rel=ge version=5.0.3/
-   dep type=ext rel=ge name=pdo version=1.0RC1/
+   dep type=ext rel=ge name=pdo version=1.0RC2/
   /deps
  /release
 /package

-- 
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 025.phpt

[PHP-CVS] cvs: php-src /ext/simplexml php_simplexml_exports.h

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

[PHP-CVS] cvs: php-src /ext/simplexml simplexml.c /ext/simplexml/tests 000.phpt

[PHP-CVS] cvs: php-src /ext/spl spl.php spl_sxe.c /ext/spl/tests sxe_005.phpt

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/simplexml php_simplexml_exports.h simplexml.c

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

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

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

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/ftp config.m4

[PHP-CVS] cvs: php-src /ext/ftp config.m4

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo package.xml

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_dblib package.xml

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_mysql package.xml

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_oci oci_statement.c

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_oci package.xml

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_odbc package.xml

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_sqlite config.m4

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_sqlite package.xml

19 matches

Site Navigation

Mail list logo

Footer information