[PHP-DEV] CVS update: php3/functions From: ssb (php-dev <email protected>)
Date: 10/21/98

Date: Wednesday October 21, 1998 @ 13:32
Author: ssb

Update of /repository/php3/functions
In directory asf:/u2/tmp/cvs-serv6511

Modified Files:
        xml.c
Log Message:
* some bugfixes
* case-fold to uppercase instead of lowercase

Index: php3/functions/xml.c
diff -c php3/functions/xml.c:1.4 php3/functions/xml.c:1.5
*** php3/functions/xml.c:1.4 Wed Oct 21 09:45:01 1998
--- php3/functions/xml.c Wed Oct 21 13:32:42 1998
***************
*** 27,33 ****
     +----------------------------------------------------------------------+
   */
  
! /* $Id: xml.c,v 1.4 1998/10/21 13:45:01 ssb Exp $ */
  
  #include "php.h"
  #include "internal_functions.h"
--- 27,33 ----
     +----------------------------------------------------------------------+
   */
  
! /* $Id: xml.c,v 1.5 1998/10/21 17:32:42 ssb Exp $ */
  
  #include "php.h"
  #include "internal_functions.h"
***************
*** 52,57 ****
--- 52,61 ----
   * - Implement XML_SetUnknownEncodingHandler()
   */
  
+ /* Known bugs:
+ * - Weird things happen with <![CDATA[]]> sections.
+ */
+
  /* {{{ thread safety stuff */
  
  # ifdef THREAD_SAFE
***************
*** 425,436 ****
  {
          pval *ret = emalloc(sizeof(pval));
  
          if (len == 0) {
                  len = php3i_xmlcharlen(s);
          }
! if (s == NULL) {
! var_reset(ret);
! } else if (sizeof(XML_Char) == 1) {
                  ret->type = IS_STRING;
                  ret->value.str.len = len;
                  ret->value.str.val = emalloc(len);
--- 429,442 ----
  {
          pval *ret = emalloc(sizeof(pval));
  
+ if (s == NULL) {
+ var_reset(ret);
+ return ret;
+ }
          if (len == 0) {
                  len = php3i_xmlcharlen(s);
          }
! if (sizeof(XML_Char) == 1) {
                  ret->type = IS_STRING;
                  ret->value.str.len = len;
                  ret->value.str.val = emalloc(len);
***************
*** 493,499 ****
                  pval *retval, *args[3];
  
                  if (parser->case_folding) {
! name = _php3_strtolower(estrdup(name));
                  }
                  args[0] = php3i_longpval(parser->index);
                  args[1] = php3i_stringpval(name);
--- 499,505 ----
                  pval *retval, *args[3];
  
                  if (parser->case_folding) {
! name = _php3_strtoupper(estrdup(name));
                  }
                  args[0] = php3i_longpval(parser->index);
                  args[1] = php3i_stringpval(name);
***************
*** 503,509 ****
                          char *key = (char *)attributes[0];
                          char *value = (char *)attributes[1];
                          if (parser->case_folding) {
! key = _php3_strtolower(estrdup(key));
                          }
                          add_assoc_string(args[2], key, value, 1);
                          if (parser->case_folding) {
--- 509,515 ----
                          char *key = (char *)attributes[0];
                          char *value = (char *)attributes[1];
                          if (parser->case_folding) {
! key = _php3_strtoupper(estrdup(key));
                          }
                          add_assoc_string(args[2], key, value, 1);
                          if (parser->case_folding) {
***************
*** 533,539 ****
                  pval *retval, *args[2];
  
                  if (parser->case_folding) {
! name = _php3_strtolower(estrdup(name));
                  }
                  args[0] = php3i_longpval(parser->index);
                  args[1] = php3i_stringpval(name);
--- 539,545 ----
                  pval *retval, *args[2];
  
                  if (parser->case_folding) {
! name = _php3_strtoupper(estrdup(name));
                  }
                  args[0] = php3i_longpval(parser->index);
                  args[1] = php3i_stringpval(name);

--
PHP Development Mailing List   http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe <email protected>
For help: php-dev-help <email protected>