[BACK]Return to html.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / php / ext / standard

Diff for /embedaddon/php/ext/standard/html.c between versions 1.1.1.2 and 1.1.1.5

version 1.1.1.2, 2012/05/29 12:34:43 version 1.1.1.5, 2014/06/15 20:03:57
Line 2 Line 2
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
    | PHP Version 5                                                        |     | PHP Version 5                                                        |
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
   | Copyright (c) 1997-2012 The PHP Group                                |   | Copyright (c) 1997-2014 The PHP Group                                |
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |     | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |     | that is bundled with this package in the file LICENSE, and is        |
Line 1221  PHPAPI char *php_escape_html_entities_ex(unsigned char Line 1221  PHPAPI char *php_escape_html_entities_ex(unsigned char
         const enc_to_uni *to_uni_table = NULL;          const enc_to_uni *to_uni_table = NULL;
         const entity_ht *inv_map = NULL; /* used for !double_encode */          const entity_ht *inv_map = NULL; /* used for !double_encode */
         /* only used if flags includes ENT_HTML_IGNORE_ERRORS or ENT_HTML_SUBSTITUTE_DISALLOWED_CHARS */          /* only used if flags includes ENT_HTML_IGNORE_ERRORS or ENT_HTML_SUBSTITUTE_DISALLOWED_CHARS */
        const unsigned char *replacement;        const unsigned char *replacement = NULL;
        size_t replacement_len;        size_t replacement_len = 0;
   
         if (all) { /* replace with all named entities */          if (all) { /* replace with all named entities */
                 if (CHARSET_PARTIAL_SUPPORT(charset)) {                  if (CHARSET_PARTIAL_SUPPORT(charset)) {
Line 1596  PHP_FUNCTION(get_html_translation_table) Line 1596  PHP_FUNCTION(get_html_translation_table)
                  flags = ENT_COMPAT;                   flags = ENT_COMPAT;
         int doctype;          int doctype;
         entity_table_opt entity_table;          entity_table_opt entity_table;
        const enc_to_uni *to_uni_table;        const enc_to_uni *to_uni_table = NULL;
         char *charset_hint = NULL;          char *charset_hint = NULL;
         int charset_hint_len;          int charset_hint_len;
         enum entity_charset charset;          enum entity_charset charset;
Line 1628  PHP_FUNCTION(get_html_translation_table) Line 1628  PHP_FUNCTION(get_html_translation_table)
                         unsigned i, j, k,                          unsigned i, j, k,
                                          max_i, max_j, max_k;                                           max_i, max_j, max_k;
                         /* no mapping to unicode required */                          /* no mapping to unicode required */
                        if (CHARSET_SINGLE_BYTE(charset)) {                        if (CHARSET_SINGLE_BYTE(charset)) { /* ISO-8859-1 */
                                max_i = 1; max_j = 1; max_k = 64;                                max_i = 1; max_j = 4; max_k = 64;
                         } else {                          } else {
                                 max_i = 0x1E; max_j = 64; max_k = 64;                                  max_i = 0x1E; max_j = 64; max_k = 64;
                         }                          }
Removed from v.1.1.1.2  
changed lines
  Added in v.1.1.1.5

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>