date:20090313

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/dom attr.c document.c node.c /ext/dom/tests bug47430.phpt

2009-03-13 Thread Rob Richards

rrichards   Fri Mar 13 13:41:43 2009 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/dom/tests  bug47430.phpt 

  Modified files:  
/php-src/ext/domattr.c document.c node.c 
  Log:
  fix bug #47430 (Errors after writing to nodeValue parameter of an absent 
previousSibling)
  add test
  
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/attr.c?r1=1.18.2.2.2.5r2=1.18.2.2.2.6diff_format=u
Index: php-src/ext/dom/attr.c
diff -u php-src/ext/dom/attr.c:1.18.2.2.2.5 php-src/ext/dom/attr.c:1.18.2.2.2.6
--- php-src/ext/dom/attr.c:1.18.2.2.2.5 Wed Dec 31 11:17:37 2008
+++ php-src/ext/dom/attr.c  Fri Mar 13 13:41:42 2009
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: attr.c,v 1.18.2.2.2.5 2008/12/31 11:17:37 sebastian Exp $ */
+/* $Id: attr.c,v 1.18.2.2.2.6 2009/03/13 13:41:42 rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -29,7 +29,6 @@
 
 #include php_dom.h
 
-
 /* {{{ arginfo */
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_attr_is_id, 0, 0, 0)
@@ -99,7 +98,6 @@
 
 /* }}} end DOMAttr::__construct */
 
-
 /* {{{ namestring  
 readonly=yes 
 URL: 
http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-1112119403
@@ -124,8 +122,6 @@
 
 /* }}} */
 
-
-
 /* {{{ specified   boolean 
 readonly=yes 
 URL: 
http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-862529273
@@ -141,8 +137,6 @@
 
 /* }}} */
 
-
-
 /* {{{ value   string  
 readonly=no 
 URL: 
http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-221662474
@@ -210,8 +204,6 @@
 
 /* }}} */
 
-
-
 /* {{{ ownerElementDOMElement  
 readonly=yes 
 URL: 
http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Attr-ownerElement
@@ -229,13 +221,14 @@
return FAILURE;
}
 
+   ALLOC_ZVAL(*retval);
+
nodeparent = nodep-parent;
if (!nodeparent) {
-   return FAILURE;
+   ZVAL_NULL(*retval);
+   return SUCCESS;
}
 
-   ALLOC_ZVAL(*retval);
-
if (NULL == (*retval = php_dom_create_object(nodeparent, ret, NULL, 
*retval, obj TSRMLS_CC))) {
php_error_docref(NULL TSRMLS_CC, E_WARNING,  Cannot create 
required DOM object);
return FAILURE;
@@ -246,8 +239,6 @@
 
 /* }}} */
 
-
-
 /* {{{ schemaTypeInfo  DOMTypeInfo 
 readonly=yes 
 URL: 
http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Attr-schemaTypeInfo
@@ -263,8 +254,6 @@
 
 /* }}} */
 
-
-
 /* {{{ proto boolean dom_attr_is_id();
 URL: 
http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Attr-isId
 Since: DOM Level 3
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/document.c?r1=1.68.2.3.2.11r2=1.68.2.3.2.12diff_format=u
Index: php-src/ext/dom/document.c
diff -u php-src/ext/dom/document.c:1.68.2.3.2.11 
php-src/ext/dom/document.c:1.68.2.3.2.12
--- php-src/ext/dom/document.c:1.68.2.3.2.11Mon Jan 26 19:11:19 2009
+++ php-src/ext/dom/document.c  Fri Mar 13 13:41:42 2009
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: document.c,v 1.68.2.3.2.11 2009/01/26 19:11:19 rrichards Exp $ */
+/* $Id: document.c,v 1.68.2.3.2.12 2009/03/13 13:41:42 rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -283,12 +283,14 @@
return FAILURE;
}
 
+   ALLOC_ZVAL(*retval);
+
dtdptr = xmlGetIntSubset(docp);
if (!dtdptr) {
-   return FAILURE;
+   ZVAL_NULL(*retval);
+   return SUCCESS;
}
 
-   ALLOC_ZVAL(*retval);
if (NULL == (*retval = php_dom_create_object((xmlNodePtr) dtdptr, ret, 
NULL, *retval, obj TSRMLS_CC))) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Cannot create 
required DOM object);
return FAILURE;
@@ -299,8 +301,6 @@
 
 /* }}} */
 
-
-
 /* {{{ implementation  DOMImplementation   
 readonly=yes 
 URL: 
http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1B793EBA
@@ -315,8 +315,6 @@
 
 /* }}} */
 
-
-
 /* {{{ documentElement DOMElement  
 readonly=yes 
 URL: 
http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-87CD092
@@ -335,12 +333,14 @@
return FAILURE;
}
 
+   ALLOC_ZVAL(*retval);
+
root = xmlDocGetRootElement(docp);
if (!root) {
-   return FAILURE;
+   ZVAL_NULL(*retval);
+   return SUCCESS;
}
 
-   ALLOC_ZVAL(*retval);
if (NULL == (*retval = php_dom_create_object(root, ret, NULL, *retval, 
obj TSRMLS_CC))) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Cannot create 
required DOM object);
return FAILURE;
@@ -421,8 +421,6 @@
 
 /* }}} */
 
-
-
 /* {{{ standalone  boolean 
 readonly=no 
 URL:

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/dom attr.c document.c node.c /ext/dom/tests bug47430.phpt

2009-03-13 Thread Rob Richards

rrichards   Fri Mar 13 13:43:29 2009 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/dom/tests  bug47430.phpt 

  Modified files:  
/php-src/ext/domattr.c document.c node.c 
  Log:
  MFB: fix bug #47430 (Errors after writing to nodeValue parameter of an absent 
previousSibling)
  add test
  
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/attr.c?r1=1.18.2.2.2.2.2.11r2=1.18.2.2.2.2.2.12diff_format=u
Index: php-src/ext/dom/attr.c
diff -u php-src/ext/dom/attr.c:1.18.2.2.2.2.2.11 
php-src/ext/dom/attr.c:1.18.2.2.2.2.2.12
--- php-src/ext/dom/attr.c:1.18.2.2.2.2.2.11Wed Dec 31 11:15:36 2008
+++ php-src/ext/dom/attr.c  Fri Mar 13 13:43:29 2009
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: attr.c,v 1.18.2.2.2.2.2.11 2008/12/31 11:15:36 sebastian Exp $ */
+/* $Id: attr.c,v 1.18.2.2.2.2.2.12 2009/03/13 13:43:29 rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -220,13 +220,14 @@
return FAILURE;
}
 
+   ALLOC_ZVAL(*retval);
+
nodeparent = nodep-parent;
if (!nodeparent) {
-   return FAILURE;
+   ZVAL_NULL(*retval);
+   return SUCCESS;
}
 
-   ALLOC_ZVAL(*retval);
-
if (NULL == (*retval = php_dom_create_object(nodeparent, ret, NULL, 
*retval, obj TSRMLS_CC))) {
php_error_docref(NULL TSRMLS_CC, E_WARNING,  Cannot create 
required DOM object);
return FAILURE;
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/document.c?r1=1.68.2.3.2.5.2.14r2=1.68.2.3.2.5.2.15diff_format=u
Index: php-src/ext/dom/document.c
diff -u php-src/ext/dom/document.c:1.68.2.3.2.5.2.14 
php-src/ext/dom/document.c:1.68.2.3.2.5.2.15
--- php-src/ext/dom/document.c:1.68.2.3.2.5.2.14Mon Jan 26 19:10:53 2009
+++ php-src/ext/dom/document.c  Fri Mar 13 13:43:29 2009
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: document.c,v 1.68.2.3.2.5.2.14 2009/01/26 19:10:53 rrichards Exp $ */
+/* $Id: document.c,v 1.68.2.3.2.5.2.15 2009/03/13 13:43:29 rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -251,12 +251,14 @@
return FAILURE;
}
 
+   ALLOC_ZVAL(*retval);
+
dtdptr = xmlGetIntSubset(docp);
if (!dtdptr) {
-   return FAILURE;
+   ZVAL_NULL(*retval);
+   return SUCCESS;
}
 
-   ALLOC_ZVAL(*retval);
if (NULL == (*retval = php_dom_create_object((xmlNodePtr) dtdptr, ret, 
NULL, *retval, obj TSRMLS_CC))) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Cannot create 
required DOM object);
return FAILURE;
@@ -299,12 +301,14 @@
return FAILURE;
}
 
+   ALLOC_ZVAL(*retval);
+
root = xmlDocGetRootElement(docp);
if (!root) {
-   return FAILURE;
+   ZVAL_NULL(*retval);
+   return SUCCESS;
}
 
-   ALLOC_ZVAL(*retval);
if (NULL == (*retval = php_dom_create_object(root, ret, NULL, *retval, 
obj TSRMLS_CC))) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Cannot create 
required DOM object);
return FAILURE;
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/node.c?r1=1.37.2.3.2.8.2.13r2=1.37.2.3.2.8.2.14diff_format=u
Index: php-src/ext/dom/node.c
diff -u php-src/ext/dom/node.c:1.37.2.3.2.8.2.13 
php-src/ext/dom/node.c:1.37.2.3.2.8.2.14
--- php-src/ext/dom/node.c:1.37.2.3.2.8.2.13Tue Jan 13 18:06:48 2009
+++ php-src/ext/dom/node.c  Fri Mar 13 13:43:29 2009
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: node.c,v 1.37.2.3.2.8.2.13 2009/01/13 18:06:48 rrichards Exp $ */
+/* $Id: node.c,v 1.37.2.3.2.8.2.14 2009/03/13 13:43:29 rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -260,7 +260,6 @@
break;
default:
php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid 
Node Type);
-   return FAILURE;
}
 
ALLOC_ZVAL(*retval);
@@ -422,13 +421,14 @@
return FAILURE;
}
 
+   ALLOC_ZVAL(*retval);
+
nodeparent = nodep-parent;
if (!nodeparent) {
-   return FAILURE;
+   ZVAL_NULL(*retval);
+   return SUCCESS;
}
 
-   ALLOC_ZVAL(*retval);
-
if (NULL == (*retval = php_dom_create_object(nodeparent, ret, NULL, 
*retval, obj TSRMLS_CC))) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Cannot create 
required DOM object);
return FAILURE;
@@ -491,12 +491,13 @@
first = nodep-children;
}
 
+   ALLOC_ZVAL(*retval);
+
if (!first) {
-   return FAILURE;
+   ZVAL_NULL(*retval);
+   return SUCCESS;
}
 
-

[PHP-CVS] cvs: php-src /ext/dom attr.c document.c node.c /ext/dom/tests bug47430.phpt

2009-03-13 Thread Rob Richards

rrichards   Fri Mar 13 13:43:57 2009 UTC

  Modified files:  
/php-src/ext/domattr.c document.c node.c 
/php-src/ext/dom/tests  bug47430.phpt 
  Log:
  MFB: fix bug #47430 (Errors after writing to nodeValue parameter of an absent 
previousSibling)
  add test
  
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/attr.c?r1=1.38r2=1.39diff_format=u
Index: php-src/ext/dom/attr.c
diff -u php-src/ext/dom/attr.c:1.38 php-src/ext/dom/attr.c:1.39
--- php-src/ext/dom/attr.c:1.38 Tue Mar 10 23:39:12 2009
+++ php-src/ext/dom/attr.c  Fri Mar 13 13:43:57 2009
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: attr.c,v 1.38 2009/03/10 23:39:12 helly Exp $ */
+/* $Id: attr.c,v 1.39 2009/03/13 13:43:57 rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -220,13 +220,14 @@
return FAILURE;
}
 
+   ALLOC_ZVAL(*retval);
+
nodeparent = nodep-parent;
if (!nodeparent) {
-   return FAILURE;
+   ZVAL_NULL(*retval);
+   return SUCCESS;
}
 
-   ALLOC_ZVAL(*retval);
-
if (NULL == (*retval = php_dom_create_object(nodeparent, ret, NULL, 
*retval, obj TSRMLS_CC))) {
php_error_docref(NULL TSRMLS_CC, E_WARNING,  Cannot create 
required DOM object);
return FAILURE;
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/document.c?r1=1.101r2=1.102diff_format=u
Index: php-src/ext/dom/document.c
diff -u php-src/ext/dom/document.c:1.101 php-src/ext/dom/document.c:1.102
--- php-src/ext/dom/document.c:1.101Tue Mar 10 23:39:12 2009
+++ php-src/ext/dom/document.c  Fri Mar 13 13:43:57 2009
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: document.c,v 1.101 2009/03/10 23:39:12 helly Exp $ */
+/* $Id: document.c,v 1.102 2009/03/13 13:43:57 rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -253,12 +253,14 @@
return FAILURE;
}
 
+   ALLOC_ZVAL(*retval);
+
dtdptr = xmlGetIntSubset(docp);
if (!dtdptr) {
-   return FAILURE;
+   ZVAL_NULL(*retval);
+   return SUCCESS;
}
 
-   ALLOC_ZVAL(*retval);
if (NULL == (*retval = php_dom_create_object((xmlNodePtr) dtdptr, ret, 
NULL, *retval, obj TSRMLS_CC))) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Cannot create 
required DOM object);
return FAILURE;
@@ -301,12 +303,14 @@
return FAILURE;
}
 
+   ALLOC_ZVAL(*retval);
+
root = xmlDocGetRootElement(docp);
if (!root) {
-   return FAILURE;
+   ZVAL_NULL(*retval);
+   return SUCCESS;
}
 
-   ALLOC_ZVAL(*retval);
if (NULL == (*retval = php_dom_create_object(root, ret, NULL, *retval, 
obj TSRMLS_CC))) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Cannot create 
required DOM object);
return FAILURE;
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/node.c?r1=1.70r2=1.71diff_format=u
Index: php-src/ext/dom/node.c
diff -u php-src/ext/dom/node.c:1.70 php-src/ext/dom/node.c:1.71
--- php-src/ext/dom/node.c:1.70 Tue Mar 10 23:39:13 2009
+++ php-src/ext/dom/node.c  Fri Mar 13 13:43:57 2009
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: node.c,v 1.70 2009/03/10 23:39:13 helly Exp $ */
+/* $Id: node.c,v 1.71 2009/03/13 13:43:57 rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -260,7 +260,6 @@
break;
default:
php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid 
Node Type);
-   return FAILURE;
}
 
ALLOC_ZVAL(*retval);
@@ -422,13 +421,14 @@
return FAILURE;
}
 
+   ALLOC_ZVAL(*retval);
+
nodeparent = nodep-parent;
if (!nodeparent) {
-   return FAILURE;
+   ZVAL_NULL(*retval);
+   return SUCCESS;
}
 
-   ALLOC_ZVAL(*retval);
-
if (NULL == (*retval = php_dom_create_object(nodeparent, ret, NULL, 
*retval, obj TSRMLS_CC))) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Cannot create 
required DOM object);
return FAILURE;
@@ -491,12 +491,13 @@
first = nodep-children;
}
 
+   ALLOC_ZVAL(*retval);
+
if (!first) {
-   return FAILURE;
+   ZVAL_NULL(*retval);
+   return SUCCESS;
}
 
-   ALLOC_ZVAL(*retval);
-
if (NULL == (*retval = php_dom_create_object(first, ret, NULL, 
*retval, obj TSRMLS_CC))) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Cannot create 
required DOM object);
return FAILURE;
@@ -527,12 +528,13 @@
last = nodep-last;
}
 
+   ALLOC_ZVAL(*retval);
+

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

2009-03-13 Thread Rob Richards

rrichards   Fri Mar 13 13:45:08 2009 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.1435r2=1.2027.2.547.2.1436diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1435 php-src/NEWS:1.2027.2.547.2.1436
--- php-src/NEWS:1.2027.2.547.2.1435Thu Mar 12 22:54:15 2009
+++ php-src/NEWSFri Mar 13 13:45:07 2009
@@ -10,6 +10,8 @@
   (Kalle)
 - Fixed bug #47435 (FILTER_FLAG_NO_PRIV_RANGE does not work with ipv6
   addresses in the filter extension). (Ilia)
+- Fixed bug #47430 (Errors after writing to nodeValue parameter of an absent 
+  previousSibling). (Rob)
 
 26 Feb 2009, PHP 5.2.9
 - Changed __call() to be invoked on private/protected method access, similar to



-- 
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) /win32/build config.w32

2009-03-13 Thread Rob Richards

rrichards   Fri Mar 13 14:39:08 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/win32/buildconfig.w32 
  Log:
  fix build for VC9
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.40.2.8.2.11r2=1.40.2.8.2.12diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.40.2.8.2.11 
php-src/win32/build/config.w32:1.40.2.8.2.12
--- php-src/win32/build/config.w32:1.40.2.8.2.11Fri Oct 10 23:38:14 2008
+++ php-src/win32/build/config.w32  Fri Mar 13 14:39:08 2009
@@ -1,5 +1,5 @@
 // vim:ft=javascript
-// $Id: config.w32,v 1.40.2.8.2.11 2008/10/10 23:38:14 pajoye Exp $
+// $Id: config.w32,v 1.40.2.8.2.12 2009/03/13 14:39:08 rrichards Exp $
 // Master config file; think of it as a configure.in
 // equivalent.
 
@@ -312,6 +312,10 @@
strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c 
network.c \
php_open_temporary_file.c php_logos.c output.c internal_functions.c 
php_sprintf.c);
 
+if (VCVERS = 14) {
+   AC_DEFINE('HAVE_STRNLEN', 1);
+}
+
 ADD_SOURCES(main/streams, streams.c cast.c memory.c filter.c 
plain_wrapper.c \
userspace.c transports.c xp_socket.c mmap.c);
 



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

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

2009-03-13 Thread Rob Richards

rrichards   Fri Mar 13 19:35:14 2009 UTC

  Modified files:  
/php-src/ext/libxml libxml.c 
  Log:
  add LIBXML_LOADED_VERSION constant that contains currently loaded libxml2 
version
  add libxml2 version being used to info output
  
http://cvs.php.net/viewvc.cgi/php-src/ext/libxml/libxml.c?r1=1.74r2=1.75diff_format=u
Index: php-src/ext/libxml/libxml.c
diff -u php-src/ext/libxml/libxml.c:1.74 php-src/ext/libxml/libxml.c:1.75
--- php-src/ext/libxml/libxml.c:1.74Tue Mar 10 23:39:27 2009
+++ php-src/ext/libxml/libxml.c Fri Mar 13 19:35:14 2009
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: libxml.c,v 1.74 2009/03/10 23:39:27 helly Exp $ */
+/* $Id: libxml.c,v 1.75 2009/03/13 19:35:14 rrichards Exp $ */
 
 #define IS_EXT_MODULE
 
@@ -592,6 +592,7 @@
 
REGISTER_LONG_CONSTANT(LIBXML_VERSION,
LIBXML_VERSION, CONST_CS | CONST_PERSISTENT);
REGISTER_STRING_CONSTANT(LIBXML_DOTTED_VERSION,   
LIBXML_DOTTED_VERSION,  CONST_CS | CONST_PERSISTENT);
+   REGISTER_STRING_CONSTANT(LIBXML_LOADED_VERSION,   (char 
*)xmlParserVersion,   CONST_CS | CONST_PERSISTENT);
 
/* For use with loading xml */
REGISTER_LONG_CONSTANT(LIBXML_NOENT,  XML_PARSE_NOENT,
CONST_CS | CONST_PERSISTENT);
@@ -671,7 +672,8 @@
 {
php_info_print_table_start();
php_info_print_table_row(2, libXML support, active);
-   php_info_print_table_row(2, libXML Version, LIBXML_DOTTED_VERSION);
+   php_info_print_table_row(2, libXML Compiled Version, 
LIBXML_DOTTED_VERSION);
+   php_info_print_table_row(2, libXML Loaded Version, (char 
*)xmlParserVersion);
php_info_print_table_row(2, libXML streams, enabled);
php_info_print_table_end();
 }



-- 
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/curl interface.c

2009-03-13 Thread Stanislav Malyshev

stasFri Mar 13 19:39:49 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/curl   interface.c 
  Log:
  add new CURL options
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.30r2=1.62.2.14.2.27.2.31diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.30 
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.31
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.30Mon Jan 26 15:19:55 2009
+++ php-src/ext/curl/interface.cFri Mar 13 19:39:49 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.27.2.30 2009/01/26 15:19:55 iliaa Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.31 2009/03/13 19:39:49 stas Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -734,6 +734,24 @@
REGISTER_CURL_CONSTANT(CURLE_SSH);
 #endif
 
+#if LIBCURL_VERSION_NUM = 0x071304
+   REGISTER_CURL_CONSTANT(CURLOPT_REDIR_PROTOCOLS);
+   REGISTER_CURL_CONSTANT(CURLOPT_PROTOCOLS);
+   REGISTER_CURL_CONSTANT(CURLPROTO_HTTP);
+   REGISTER_CURL_CONSTANT(CURLPROTO_HTTPS);
+   REGISTER_CURL_CONSTANT(CURLPROTO_FTP);
+   REGISTER_CURL_CONSTANT(CURLPROTO_FTPS);
+   REGISTER_CURL_CONSTANT(CURLPROTO_SCP);
+   REGISTER_CURL_CONSTANT(CURLPROTO_SFTP);
+   REGISTER_CURL_CONSTANT(CURLPROTO_TELNET);
+   REGISTER_CURL_CONSTANT(CURLPROTO_LDAP);
+   REGISTER_CURL_CONSTANT(CURLPROTO_LDAPS);
+   REGISTER_CURL_CONSTANT(CURLPROTO_DICT);
+   REGISTER_CURL_CONSTANT(CURLPROTO_FILE);
+   REGISTER_CURL_CONSTANT(CURLPROTO_TFTP);
+   REGISTER_CURL_CONSTANT(CURLPROTO_ALL);
+#endif
+
 #ifdef PHP_CURL_NEED_OPENSSL_TSL
if (!CRYPTO_get_id_callback()) {
int i, c = CRYPTO_num_locks();
@@ -1407,6 +1425,10 @@
 #if LIBCURL_VERSION_NUM  0x070b01 /* CURLOPT_TCP_NODELAY is available since 
curl 7.11.2 */
case CURLOPT_TCP_NODELAY:
 #endif
+#if LIBCURL_VERSION_NUM = 0x71304
+   case CURLOPT_REDIR_PROTOCOLS:
+   case CURLOPT_PROTOCOLS:
+#endif
convert_to_long_ex(zvalue);
error = curl_easy_setopt(ch-cp, option, 
Z_LVAL_PP(zvalue));
break;



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

2009-03-13 Thread Stanislav Malyshev

stasFri Mar 13 19:41:48 2009 UTC

  Modified files:  
/php-src/ext/curl   interface.c 
  Log:
  add new CURL options
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.147r2=1.148diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.147 php-src/ext/curl/interface.c:1.148
--- php-src/ext/curl/interface.c:1.147  Tue Mar 10 23:39:11 2009
+++ php-src/ext/curl/interface.cFri Mar 13 19:41:48 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.147 2009/03/10 23:39:11 helly Exp $ */
+/* $Id: interface.c,v 1.148 2009/03/13 19:41:48 stas Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -734,6 +734,24 @@
REGISTER_CURL_CONSTANT(CURLE_SSH);
 #endif
 
+#if LIBCURL_VERSION_NUM = 0x071304
+   REGISTER_CURL_CONSTANT(CURLOPT_REDIR_PROTOCOLS);
+   REGISTER_CURL_CONSTANT(CURLOPT_PROTOCOLS);
+   REGISTER_CURL_CONSTANT(CURLPROTO_HTTP);
+   REGISTER_CURL_CONSTANT(CURLPROTO_HTTPS);
+   REGISTER_CURL_CONSTANT(CURLPROTO_FTP);
+   REGISTER_CURL_CONSTANT(CURLPROTO_FTPS);
+   REGISTER_CURL_CONSTANT(CURLPROTO_SCP);
+   REGISTER_CURL_CONSTANT(CURLPROTO_SFTP);
+   REGISTER_CURL_CONSTANT(CURLPROTO_TELNET);
+   REGISTER_CURL_CONSTANT(CURLPROTO_LDAP);
+   REGISTER_CURL_CONSTANT(CURLPROTO_LDAPS);
+   REGISTER_CURL_CONSTANT(CURLPROTO_DICT);
+   REGISTER_CURL_CONSTANT(CURLPROTO_FILE);
+   REGISTER_CURL_CONSTANT(CURLPROTO_TFTP);
+   REGISTER_CURL_CONSTANT(CURLPROTO_ALL);
+#endif
+
 #ifdef PHP_CURL_NEED_OPENSSL_TSL
if (!CRYPTO_get_id_callback()) {
int i, c = CRYPTO_num_locks();
@@ -1420,6 +1438,10 @@
 #if LIBCURL_VERSION_NUM  0x070b01 /* CURLOPT_TCP_NODELAY is available since 
curl 7.11.2 */
case CURLOPT_TCP_NODELAY:
 #endif
+#if LIBCURL_VERSION_NUM = 0x71304
+   case CURLOPT_REDIR_PROTOCOLS:
+   case CURLOPT_PROTOCOLS:
+#endif
convert_to_long_ex(zvalue);
error = curl_easy_setopt(ch-cp, option, 
Z_LVAL_PP(zvalue));
break;



-- 
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/curl interface.c

2009-03-13 Thread Stanislav Malyshev

stasFri Mar 13 19:43:50 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/curl   interface.c 
  Log:
  add new CURL options
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.41r2=1.62.2.14.2.42diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.41 
php-src/ext/curl/interface.c:1.62.2.14.2.42
--- php-src/ext/curl/interface.c:1.62.2.14.2.41 Mon Jan 26 15:25:23 2009
+++ php-src/ext/curl/interface.cFri Mar 13 19:43:49 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.41 2009/01/26 15:25:23 iliaa Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.42 2009/03/13 19:43:49 stas Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -630,6 +630,24 @@
REGISTER_CURL_CONSTANT(CURLFTPSSL_ALL);
 #endif
 
+#if LIBCURL_VERSION_NUM = 0x071304
+   REGISTER_CURL_CONSTANT(CURLOPT_REDIR_PROTOCOLS);
+   REGISTER_CURL_CONSTANT(CURLOPT_PROTOCOLS);
+   REGISTER_CURL_CONSTANT(CURLPROTO_HTTP);
+   REGISTER_CURL_CONSTANT(CURLPROTO_HTTPS);
+   REGISTER_CURL_CONSTANT(CURLPROTO_FTP);
+   REGISTER_CURL_CONSTANT(CURLPROTO_FTPS);
+   REGISTER_CURL_CONSTANT(CURLPROTO_SCP);
+   REGISTER_CURL_CONSTANT(CURLPROTO_SFTP);
+   REGISTER_CURL_CONSTANT(CURLPROTO_TELNET);
+   REGISTER_CURL_CONSTANT(CURLPROTO_LDAP);
+   REGISTER_CURL_CONSTANT(CURLPROTO_LDAPS);
+   REGISTER_CURL_CONSTANT(CURLPROTO_DICT);
+   REGISTER_CURL_CONSTANT(CURLPROTO_FILE);
+   REGISTER_CURL_CONSTANT(CURLPROTO_TFTP);
+   REGISTER_CURL_CONSTANT(CURLPROTO_ALL);
+#endif
+
 #ifdef PHP_CURL_NEED_OPENSSL_TSL
if (!CRYPTO_get_id_callback()) {
int i, c = CRYPTO_num_locks();
@@ -1303,6 +1321,10 @@
 #if LIBCURL_VERSION_NUM  0x070b01 /* CURLOPT_TCP_NODELAY is available since 
curl 7.11.2 */
case CURLOPT_TCP_NODELAY:
 #endif
+#if LIBCURL_VERSION_NUM = 0x71304
+   case CURLOPT_REDIR_PROTOCOLS:
+   case CURLOPT_PROTOCOLS:
+#endif
convert_to_long_ex(zvalue);
error = curl_easy_setopt(ch-cp, option, 
Z_LVAL_PP(zvalue));
break;



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

2009-03-13 Thread Stanislav Malyshev

stasFri Mar 13 19:46:09 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  record new curl options
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1436r2=1.2027.2.547.2.1437diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1436 php-src/NEWS:1.2027.2.547.2.1437
--- php-src/NEWS:1.2027.2.547.2.1436Fri Mar 13 13:45:07 2009
+++ php-src/NEWSFri Mar 13 19:46:09 2009
@@ -1,6 +1,9 @@
 PHPNEWS
 |||
 ?? ??? 2009, PHP 5.2.10
+- Added new CURL options CURLOPT_REDIR_PROTOCOLS, CURLOPT_PROTOCOLS,
+  and CURLPROTO_* for redirect fixes in CURL 7.19.4. (Yoram Bar Haim, Stas)
+
 - Fixed memory corruptions while reading properties of zip files. (Ilia)
 
 - Fixed bug #47639 (pg_copy_from() WARNING: nonstandard use of \\ in a string



-- 
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/dom attr.c document.c node.c /ext/dom/tests bug47430.phpt

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/dom attr.c document.c node.c /ext/dom/tests bug47430.phpt

[PHP-CVS] cvs: php-src /ext/dom attr.c document.c node.c /ext/dom/tests bug47430.phpt

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

[PHP-CVS] cvs: php-src(PHP_5_2) /win32/build config.w32

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

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

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

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

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

10 matches

Site Navigation

Mail list logo

Footer information