[PHP-CVS] cvs: php-src(PHP_5_2) /ext/imap php_imap.c
felipe Thu Apr 17 11:04:49 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/imap php_imap.c
Log:
- Fix typo
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.208.2.7.2.30r2=1.208.2.7.2.31diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.208.2.7.2.30
php-src/ext/imap/php_imap.c:1.208.2.7.2.31
--- php-src/ext/imap/php_imap.c:1.208.2.7.2.30 Tue Apr 8 00:03:34 2008
+++ php-src/ext/imap/php_imap.c Thu Apr 17 11:04:49 2008
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_imap.c,v 1.208.2.7.2.30 2008/04/08 00:03:34 iliaa Exp $ */
+/* $Id: php_imap.c,v 1.208.2.7.2.31 2008/04/17 11:04:49 felipe Exp $ */
#define IMAP41
@@ -792,7 +792,7 @@
#ifdef SET_MAXLOGINTRIALS
if (myargc == 5) {
convert_to_long_ex(retries);
- if (retries 0) {
+ if (Z_LVAL_PP(retries) 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING ,Retries
must be greater or equal to 0);
} else {
mail_parameters(NIL, SET_MAXLOGINTRIALS, (void *)
Z_LVAL_PP(retries));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/imap php_imap.c
felipe Thu Apr 17 11:08:13 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/imap php_imap.c
Log:
- Fixed typo
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.208.2.7.2.26.2.9r2=1.208.2.7.2.26.2.10diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.9
php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.10
--- php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.9 Tue Apr 8 00:01:48 2008
+++ php-src/ext/imap/php_imap.c Thu Apr 17 11:08:13 2008
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_imap.c,v 1.208.2.7.2.26.2.9 2008/04/08 00:01:48 iliaa Exp $ */
+/* $Id: php_imap.c,v 1.208.2.7.2.26.2.10 2008/04/17 11:08:13 felipe Exp $ */
#define IMAP41
@@ -798,7 +798,7 @@
#ifdef SET_MAXLOGINTRIALS
if (myargc == 5) {
convert_to_long_ex(retries);
- if (retries 0) {
+ if (Z_LVAL_PP(retries) 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING ,Retries
must be greater or equal to 0);
} else {
mail_parameters(NIL, SET_MAXLOGINTRIALS, (void *)
Z_LVAL_PP(retries));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/imap php_imap.c
felipe Thu Apr 17 11:08:32 2008 UTC
Modified files:
/php-src/ext/imap php_imap.c
Log:
- Fixed typo
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.249r2=1.250diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.249 php-src/ext/imap/php_imap.c:1.250
--- php-src/ext/imap/php_imap.c:1.249 Tue Apr 8 00:02:01 2008
+++ php-src/ext/imap/php_imap.c Thu Apr 17 11:08:32 2008
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_imap.c,v 1.249 2008/04/08 00:02:01 iliaa Exp $ */
+/* $Id: php_imap.c,v 1.250 2008/04/17 11:08:32 felipe Exp $ */
#define IMAP41
@@ -796,7 +796,7 @@
#ifdef SET_MAXLOGINTRIALS
if (myargc == 5) {
convert_to_long_ex(retries);
- if (retries 0) {
+ if (Z_LVAL_PP(retries) 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING ,Retries
must be greater or equal to 0);
} else {
mail_parameters(NIL, SET_MAXLOGINTRIALS, (void *)
Z_LVAL_PP(retries));
--
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
tony2001Thu Apr 17 11:48:53 2008 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: make Matt happy =) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1143r2=1.2027.2.547.2.1144diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1143 php-src/NEWS:1.2027.2.547.2.1144 --- php-src/NEWS:1.2027.2.547.2.1143Wed Apr 16 17:21:44 2008 +++ php-src/NEWSThu Apr 17 11:48:53 2008 @@ -7,7 +7,7 @@ 10 Apr 2008, PHP 5.2.6RC5 - Fixed incorrect heredoc handling when label is used within the block. - (Matt Wilmas) + (Matt) - Fixed bug #44673 (With CGI argv/argc starts from arguments, not from script) (Dmitry) - Fixed bug #44667 (proc_open() does not handle pipes with the mode 'wb' -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dom element.c /ext/dom/tests bug44648.phpt
rrichards Thu Apr 17 20:19:53 2008 UTC
Added files:
/php-src/ext/dom/tests bug44648.phpt
Modified files:
/php-src/ext/domelement.c
Log:
fix bug #44648 (Attribute names not checked for wellformedness)
fix some warnings
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/element.c?r1=1.56r2=1.57diff_format=u
Index: php-src/ext/dom/element.c
diff -u php-src/ext/dom/element.c:1.56 php-src/ext/dom/element.c:1.57
--- php-src/ext/dom/element.c:1.56 Mon Feb 4 15:22:40 2008
+++ php-src/ext/dom/element.c Thu Apr 17 20:19:52 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: element.c,v 1.56 2008/02/04 15:22:40 sebastian Exp $ */
+/* $Id: element.c,v 1.57 2008/04/17 20:19:52 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -270,7 +270,7 @@
ns = nodep-ns;
if (ns != NULL ns-prefix) {
qname = xmlStrdup(ns-prefix);
- qname = xmlStrcat(qname, :);
+ qname = xmlStrcat(qname, (xmlChar *):);
qname = xmlStrcat(qname, nodep-name);
ZVAL_XML_STRING(*retval, (char *)qname, ZSTR_DUPLICATE);
xmlFree(qname);
@@ -307,7 +307,7 @@
if (nqname != NULL) {
xmlNsPtr ns;
xmlChar *prefix = xmlStrndup(name, len);
- if (prefix xmlStrEqual(prefix, xmlns)) {
+ if (prefix xmlStrEqual(prefix, (xmlChar *)xmlns)) {
ns = elem-nsDef;
while (ns) {
if (xmlStrEqual(ns-prefix, nqname)) {
@@ -326,7 +326,7 @@
return (xmlNodePtr)xmlHasNsProp(elem, nqname, ns-href);
}
} else {
- if (xmlStrEqual(name, xmlns)) {
+ if (xmlStrEqual(name, (xmlChar *)xmlns)) {
xmlNsPtr nsPtr = elem-nsDef;
while (nsPtr) {
if (nsPtr-prefix == NULL) {
@@ -348,7 +348,8 @@
{
zval *id;
xmlNode *nodep;
- char *name, *value = NULL;
+ char *name;
+ xmlChar *value = NULL;
dom_object *intern;
xmlNodePtr attr;
int name_len;
@@ -392,7 +393,7 @@
zval *id, *rv = NULL;
xmlNode *nodep;
xmlNodePtr attr = NULL;
- int ret, name_len, value_len;
+ int ret, name_len, value_len, name_valid;
dom_object *intern;
char *name, *value;
@@ -405,6 +406,12 @@
RETURN_FALSE;
}
+ name_valid = xmlValidateName((xmlChar *) name, 0);
+ if (name_valid != 0) {
+ php_dom_throw_error(INVALID_CHARACTER_ERR, 1 TSRMLS_CC);
+ RETURN_FALSE;
+ }
+
DOM_GET_OBJ(nodep, id, xmlNodePtr, intern);
if (dom_node_is_read_only(nodep) == SUCCESS) {
@@ -426,12 +433,12 @@
}
- if (xmlStrEqual((xmlChar *)name, xmlns)) {
+ if (xmlStrEqual((xmlChar *)name, (xmlChar *)xmlns)) {
if (xmlNewNs(nodep, (xmlChar *)value, NULL)) {
RETURN_TRUE;
}
} else {
- attr = (xmlNodePtr)xmlSetProp(nodep, (xmlChar *) name, value);
+ attr = (xmlNodePtr)xmlSetProp(nodep, (xmlChar *) name, (xmlChar
*)value);
}
if (!attr) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, No such attribute
'%s', name);
@@ -528,7 +535,7 @@
if (attrp-children) {
attrp = xmlNewDocNode(nodep-doc, NULL, (xmlChar *)
attrp-children, attrp-name);
} else {
- attrp = xmlNewDocNode(nodep-doc, NULL, xmlns,
attrp-name);
+ attrp = xmlNewDocNode(nodep-doc, NULL, (xmlChar
*)xmlns, attrp-name);
}
attrp-type = XML_NAMESPACE_DECL;
attrp-parent = nsparent;
@@ -679,7 +686,8 @@
xmlNsPtr nsptr;
dom_object *intern;
int uri_len = 0, name_len = 0;
- char *uri, *name, *strattr;
+ char *uri, *name;
+ xmlChar *strattr;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
Os!s, id, dom_element_class_entry, uri, uri_len, UG(utf8_conv), name,
name_len, UG(utf8_conv)) == FAILURE) {
return;
@@ -690,11 +698,11 @@
strattr = xmlGetNsProp(elemp, (xmlChar *) name, (xmlChar *) uri);
if (strattr != NULL) {
- RETVAL_XML_STRING(strattr, ZSTR_DUPLICATE);
+ RETVAL_XML_STRING((char *)strattr, ZSTR_DUPLICATE);
xmlFree(strattr);
} else {
- if (xmlStrEqual((xmlChar *) uri, DOM_XMLNS_NAMESPACE)) {
- nsptr = dom_get_nsdecl(elemp, name);
+ if (xmlStrEqual((xmlChar *) uri, (xmlChar
*)DOM_XMLNS_NAMESPACE)) {
+ nsptr = dom_get_nsdecl(elemp, (xmlChar *)name);
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/dom element.c /ext/dom/tests bug44648.phpt
rrichards Thu Apr 17 20:21:04 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/dom/tests bug44648.phpt
Modified files:
/php-src/ext/domelement.c
Log:
MFH: fix bug #44648 (Attribute names not checked for wellformedness)
add test
fix some warnings
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/element.c?r1=1.36.2.4.2.8.2.3r2=1.36.2.4.2.8.2.4diff_format=u
Index: php-src/ext/dom/element.c
diff -u php-src/ext/dom/element.c:1.36.2.4.2.8.2.3
php-src/ext/dom/element.c:1.36.2.4.2.8.2.4
--- php-src/ext/dom/element.c:1.36.2.4.2.8.2.3 Mon Feb 4 15:22:59 2008
+++ php-src/ext/dom/element.c Thu Apr 17 20:21:04 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: element.c,v 1.36.2.4.2.8.2.3 2008/02/04 15:22:59 sebastian Exp $ */
+/* $Id: element.c,v 1.36.2.4.2.8.2.4 2008/04/17 20:21:04 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -187,8 +187,8 @@
php_std_error_handling();
return;
}
-
php_std_error_handling();
+
name_valid = xmlValidateName((xmlChar *) name, 0);
if (name_valid != 0) {
php_dom_throw_error(INVALID_CHARACTER_ERR, 1 TSRMLS_CC);
@@ -270,7 +270,7 @@
ns = nodep-ns;
if (ns != NULL ns-prefix) {
qname = xmlStrdup(ns-prefix);
- qname = xmlStrcat(qname, :);
+ qname = xmlStrcat(qname, (xmlChar *):);
qname = xmlStrcat(qname, nodep-name);
ZVAL_STRING(*retval, (char *)qname, 1);
xmlFree(qname);
@@ -307,7 +307,7 @@
if (nqname != NULL) {
xmlNsPtr ns;
xmlChar *prefix = xmlStrndup(name, len);
- if (prefix xmlStrEqual(prefix, xmlns)) {
+ if (prefix xmlStrEqual(prefix, (xmlChar *)xmlns)) {
ns = elem-nsDef;
while (ns) {
if (xmlStrEqual(ns-prefix, nqname)) {
@@ -326,7 +326,7 @@
return (xmlNodePtr)xmlHasNsProp(elem, nqname, ns-href);
}
} else {
- if (xmlStrEqual(name, xmlns)) {
+ if (xmlStrEqual(name, (xmlChar *)xmlns)) {
xmlNsPtr nsPtr = elem-nsDef;
while (nsPtr) {
if (nsPtr-prefix == NULL) {
@@ -348,7 +348,8 @@
{
zval *id;
xmlNode *nodep;
- char *name, *value = NULL;
+ char *name;
+ xmlChar *value = NULL;
dom_object *intern;
xmlNodePtr attr;
int name_len;
@@ -363,20 +364,20 @@
if (attr) {
switch (attr-type) {
case XML_ATTRIBUTE_NODE:
- value = xmlNodeListGetString(attr-doc, attr-children,
1);
+ value = xmlNodeListGetString(attr-doc,
attr-children, 1);
break;
case XML_NAMESPACE_DECL:
value = xmlStrdup(((xmlNsPtr)attr)-href);
break;
default:
- value =
xmlStrdup(((xmlAttributePtr)attr)-defaultValue);
+ value =
xmlStrdup(((xmlAttributePtr)attr)-defaultValue);
}
}
if (value == NULL) {
RETURN_EMPTY_STRING();
} else {
- RETVAL_STRING(value, 1);
+ RETVAL_STRING((char *)value, 1);
xmlFree(value);
}
}
@@ -392,7 +393,7 @@
zval *id, *rv = NULL;
xmlNode *nodep;
xmlNodePtr attr = NULL;
- int ret, name_len, value_len;
+ int ret, name_len, value_len, name_valid;
dom_object *intern;
char *name, *value;
@@ -405,6 +406,12 @@
RETURN_FALSE;
}
+ name_valid = xmlValidateName((xmlChar *) name, 0);
+ if (name_valid != 0) {
+ php_dom_throw_error(INVALID_CHARACTER_ERR, 1 TSRMLS_CC);
+ RETURN_FALSE;
+ }
+
DOM_GET_OBJ(nodep, id, xmlNodePtr, intern);
if (dom_node_is_read_only(nodep) == SUCCESS) {
@@ -416,7 +423,7 @@
if (attr != NULL) {
switch (attr-type) {
case XML_ATTRIBUTE_NODE:
- node_list_unlink(attr-children TSRMLS_CC);
+ node_list_unlink(attr-children TSRMLS_CC);
break;
case XML_NAMESPACE_DECL:
RETURN_FALSE;
@@ -426,12 +433,12 @@
}
- if (xmlStrEqual((xmlChar *)name, xmlns)) {
+ if (xmlStrEqual((xmlChar *)name, (xmlChar *)xmlns)) {
if (xmlNewNs(nodep, (xmlChar *)value, NULL)) {
RETURN_TRUE;
}
} else {
- attr =
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS
rrichards Thu Apr 17 20:23:49 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: BFN http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.159r2=1.2027.2.547.2.965.2.160diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.159 php-src/NEWS:1.2027.2.547.2.965.2.160 --- php-src/NEWS:1.2027.2.547.2.965.2.159 Tue Apr 15 15:48:20 2008 +++ php-src/NEWSThu Apr 17 20:23:49 2008 @@ -147,6 +147,7 @@ - Fixed possible crash in ext/soap because of uninitialized value. (Zdash Urf) - Fixed PECL bug #12431 (OCI8 ping functionality is broken). (Oracle Corp.) +- Fixed bug #44648 (Attribute names not checked for wellformedness). (Rob) - Fixed bug #44414 (Incomplete reporting about abstract methods). (Dmitry) - Fixed bug #44390 (mysqli_bind_param/bind_result and Object member variables) (Andrey) -- 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
iliaa Fri Apr 18 01:00:56 2008 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.1144r2=1.2027.2.547.2.1145diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1144 php-src/NEWS:1.2027.2.547.2.1145 --- php-src/NEWS:1.2027.2.547.2.1144Thu Apr 17 11:48:53 2008 +++ php-src/NEWSFri Apr 18 01:00:56 2008 @@ -1,6 +1,7 @@ PHPNEWS ||| ?? Apr 2008, PHP 5.2.6 +- Fixed two possible crashes inside posix extension (Tony) - Fixed bug #44703 (htmlspecialchars() does not detect bad character set argument). (Andy Wharmby) - Fixed bug #44742 (timezone_offset_get() causes segmentation faults). (Derick) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/oci8 package2.xml
sixdFri Apr 18 02:33:59 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/oci8 package2.xml Log: Update description http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/package2.xml?r1=1.1.2.8.2.4r2=1.1.2.8.2.5diff_format=u Index: php-src/ext/oci8/package2.xml diff -u php-src/ext/oci8/package2.xml:1.1.2.8.2.4 php-src/ext/oci8/package2.xml:1.1.2.8.2.5 --- php-src/ext/oci8/package2.xml:1.1.2.8.2.4 Fri Apr 18 00:05:27 2008 +++ php-src/ext/oci8/package2.xml Fri Apr 18 02:33:59 2008 @@ -5,8 +5,8 @@ http://pear.php.net/dtd/package-2.0.xsd; nameoci8/name channelpecl.php.net/channel - summaryOCI8 functions/summary - descriptionThese functions allow you to access Oracle database servers using the Oracle Call Interface (OCI8). + summaryExtension for Oracle Database/summary + descriptionThis extension allows you to access Oracle databases using the Oracle Call Interface (OCI8). It can be built using Oracle 9.2, 10.2 or 11.1 client libraries, and allows Oracle's standard cross-version connectivity. /description lead nameAntony Dovgal/name -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/oci8 php_oci8.h
sixdFri Apr 18 02:34:43 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/oci8 php_oci8.h Log: Set extension status back to dev http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/php_oci8.h?r1=1.36.2.2.2.1.2.5r2=1.36.2.2.2.1.2.6diff_format=u Index: php-src/ext/oci8/php_oci8.h diff -u php-src/ext/oci8/php_oci8.h:1.36.2.2.2.1.2.5 php-src/ext/oci8/php_oci8.h:1.36.2.2.2.1.2.6 --- php-src/ext/oci8/php_oci8.h:1.36.2.2.2.1.2.5Fri Apr 18 00:05:27 2008 +++ php-src/ext/oci8/php_oci8.h Fri Apr 18 02:34:42 2008 @@ -25,7 +25,7 @@ +--+ */ -/* $Id: php_oci8.h,v 1.36.2.2.2.1.2.5 2008/04/18 00:05:27 sixd Exp $ */ +/* $Id: php_oci8.h,v 1.36.2.2.2.1.2.6 2008/04/18 02:34:42 sixd Exp $ */ #if HAVE_OCI8 # ifndef PHP_OCI8_H @@ -46,7 +46,7 @@ */ #undef PHP_OCI8_VERSION #endif -#define PHP_OCI8_VERSION 1.3.2 Beta +#define PHP_OCI8_VERSION 1.3.3-dev extern zend_module_entry oci8_module_entry; #define phpext_oci8_ptr oci8_module_entry -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/oci8 php_oci8.h
sixdFri Apr 18 02:35:08 2008 UTC Modified files: /php-src/ext/oci8 php_oci8.h Log: MFB: Set extension status back to dev http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/php_oci8.h?r1=1.45r2=1.46diff_format=u Index: php-src/ext/oci8/php_oci8.h diff -u php-src/ext/oci8/php_oci8.h:1.45 php-src/ext/oci8/php_oci8.h:1.46 --- php-src/ext/oci8/php_oci8.h:1.45Fri Apr 18 00:04:44 2008 +++ php-src/ext/oci8/php_oci8.h Fri Apr 18 02:35:08 2008 @@ -25,7 +25,7 @@ +--+ */ -/* $Id: php_oci8.h,v 1.45 2008/04/18 00:04:44 sixd Exp $ */ +/* $Id: php_oci8.h,v 1.46 2008/04/18 02:35:08 sixd Exp $ */ #if HAVE_OCI8 # ifndef PHP_OCI8_H @@ -39,7 +39,7 @@ /* * The version of the OCI8 extension. */ -#define PHP_OCI8_VERSION 1.3.2 Beta +#define PHP_OCI8_VERSION 1.3.3-dev extern zend_module_entry oci8_module_entry; #define phpext_oci8_ptr oci8_module_entry -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
