[PHP-CVS] svn: /php/php-src/trunk/ext/tidy/ tidy.c
dmitry Tue, 25 May 2010 11:38:48 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=299737
Log:
Fixed compatibility with Run Time Cache patch
Changed paths:
U php/php-src/trunk/ext/tidy/tidy.c
Modified: php/php-src/trunk/ext/tidy/tidy.c
===
--- php/php-src/trunk/ext/tidy/tidy.c 2010-05-25 10:37:17 UTC (rev 299736)
+++ php/php-src/trunk/ext/tidy/tidy.c 2010-05-25 11:38:48 UTC (rev 299737)
@@ -828,6 +828,9 @@
tidySaveBuffer (obj-ptdoc-doc, output);
if (output.size) {
+ if (!obj-std.properties) {
+ rebuild_object_properties(obj-std);
+ }
MAKE_STD_ZVAL(temp);
ZVAL_STRINGL(temp, (char*)output.bp, output.size-1, TRUE);
zend_hash_update(obj-std.properties, value, sizeof(value),
(void *)temp, sizeof(zval *), NULL);
@@ -836,6 +839,9 @@
tidyBufFree(output);
if (obj-ptdoc-errbuf-size) {
+ if (!obj-std.properties) {
+ rebuild_object_properties(obj-std);
+ }
MAKE_STD_ZVAL(temp);
ZVAL_STRINGL(temp, (char*)obj-ptdoc-errbuf-bp,
obj-ptdoc-errbuf-size-1, TRUE);
zend_hash_update(obj-std.properties, errorBuffer,
sizeof(errorBuffer), (void *)temp, sizeof(zval *), NULL);
@@ -854,6 +860,9 @@
switch(type) {
case is_node:
+ if (!obj-std.properties) {
+ rebuild_object_properties(obj-std);
+ }
tidyBufInit(buf);
tidyNodeGetText(obj-ptdoc-doc, obj-node, buf);
ADD_PROPERTY_STRINGL(obj-std.properties, value,
buf.bp, buf.size-1);
@@ -923,6 +932,9 @@
break;
case is_doc:
+ if (!obj-std.properties) {
+ rebuild_object_properties(obj-std);
+ }
ADD_PROPERTY_NULL(obj-std.properties, errorBuffer);
ADD_PROPERTY_NULL(obj-std.properties, value);
break;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/tidy/ tidy.c
jani Tue, 29 Dec 2009 12:46:48 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=292756
Log:
- WS + CS
Changed paths:
U php/php-src/trunk/ext/tidy/tidy.c
Modified: php/php-src/trunk/ext/tidy/tidy.c
===
--- php/php-src/trunk/ext/tidy/tidy.c 2009-12-29 12:45:51 UTC (rev 292755)
+++ php/php-src/trunk/ext/tidy/tidy.c 2009-12-29 12:46:48 UTC (rev 292756)
@@ -45,7 +45,7 @@
#define FIX_BUFFER(bptr) do { if ((bptr)-size) { (bptr)-bp[(bptr)-size-1] = '\0'; } } while(0)
#define TIDY_SET_CONTEXT \
-zval *object = getThis();
+ zval *object = getThis();
#define TIDY_FETCH_OBJECT \
PHPTidyObj *obj; \
@@ -70,22 +70,22 @@
obj = (PHPTidyObj *) zend_object_store_get_object(object TSRMLS_CC); \
#define TIDY_APPLY_CONFIG_ZVAL(_doc, _val) \
-if(_val) { \
-if(Z_TYPE_PP(_val) == IS_ARRAY) { \
-_php_tidy_apply_config_array(_doc, HASH_OF(*_val) TSRMLS_CC); \
-} else if (Z_TYPE_PP(_val) != IS_NULL) { \
-convert_to_string_ex(_val); \
-TIDY_OPEN_BASEDIR_CHECK(Z_STRVAL_PP(_val)); \
-switch (tidyLoadConfig(_doc, Z_STRVAL_PP(_val))) { \
- case -1: \
-php_error_docref(NULL TSRMLS_CC, E_WARNING, Could not load configuration file '%s', Z_STRVAL_PP(_val)); \
-break; \
- case 1: \
-php_error_docref(NULL TSRMLS_CC, E_NOTICE, There were errors while parsing the configuration file '%s', Z_STRVAL_PP(_val)); \
-break; \
-} \
-} \
-}
+ if (_val) { \
+ if (Z_TYPE_PP(_val) == IS_ARRAY) { \
+ _php_tidy_apply_config_array(_doc, HASH_OF(*_val) TSRMLS_CC); \
+ } else if (Z_TYPE_PP(_val) != IS_NULL) { \
+ convert_to_string_ex(_val); \
+ TIDY_OPEN_BASEDIR_CHECK(Z_STRVAL_PP(_val)); \
+ switch (tidyLoadConfig(_doc, Z_STRVAL_PP(_val))) { \
+case -1: \
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Could not load configuration file '%s', Z_STRVAL_PP(_val)); \
+break; \
+case 1: \
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, There were errors while parsing the configuration file '%s', Z_STRVAL_PP(_val)); \
+break; \
+ } \
+ } \
+ }
#define REGISTER_TIDY_CLASS(classname, name, parent, __flags) \
{ \
@@ -122,16 +122,16 @@
}
#define ADD_PROPERTY_STRINGL(_conv, _table, _key, _string, _len) \
- { \
- zval *tmp; \
- MAKE_STD_ZVAL(tmp); \
- if (_string) { \
- ZVAL_U_STRINGL(_conv, tmp, (char *)_string, _len, 1); \
- } else { \
- ZVAL_EMPTY_STRING(tmp); \
- } \
- zend_ascii_hash_update(_table, #_key, sizeof(#_key), (void *)tmp, sizeof(zval *), NULL); \
- }
+ { \
+ zval *tmp; \
+ MAKE_STD_ZVAL(tmp); \
+ if (_string) { \
+ ZVAL_U_STRINGL(_conv, tmp, (char *)_string, _len, 1); \
+ } else { \
+ ZVAL_EMPTY_STRING(tmp); \
+ } \
+ zend_ascii_hash_update(_table, #_key, sizeof(#_key), (void *)tmp, sizeof(zval *), NULL); \
+}
#define ADD_PROPERTY_LONG(_table, _key, _long) \
{ \
@@ -150,11 +150,11 @@
}
#define ADD_PROPERTY_BOOL(_table, _key, _bool) \
-{ \
- zval *tmp; \
- MAKE_STD_ZVAL(tmp); \
- ZVAL_BOOL(tmp, _bool); \
- zend_ascii_hash_update(_table, #_key, sizeof(#_key), (void *)tmp, sizeof(zval *), NULL); \
+ { \
+ zval *tmp; \
+ MAKE_STD_ZVAL(tmp); \
+ ZVAL_BOOL(tmp, _bool); \
+ zend_ascii_hash_update(_table, #_key, sizeof(#_key), (void *)tmp, sizeof(zval *), NULL); \
}
#define TIDY_OPEN_BASEDIR_CHECK(filename) \
@@ -170,7 +170,7 @@
}
/* }}} */
-/* {{{ ext/tidy structs
+/* {{{ ext/tidy structs
*/
typedef struct _PHPTidyDoc PHPTidyDoc;
typedef struct _PHPTidyObj PHPTidyObj;
@@ -188,22 +188,22 @@
} tidy_base_nodetypes;
struct _PHPTidyDoc {
- TidyDoc doc;
- TidyBuffer *errbuf;
- unsigned int ref_count;
+ TidyDoc doc;
+ TidyBuffer *errbuf;
+ unsigned int ref_count;
};
typedef struct _PHPTidyConv {
- UConverter *conv;
- unsigned long ref_count;
+ UConverter *conv;
+ unsigned long ref_count;
} PHPTidyConv;
struct _PHPTidyObj {
- zend_object std;
- TidyNodenode;
- tidy_obj_type type;
- PHPTidyDoc *ptdoc;
- PHPTidyConv *converter;
+ zend_object std;
+ TidyNode node;
+ tidy_obj_type type;
+ PHPTidyDoc *ptdoc;
+ PHPTidyConv *converter;
};
/* }}} */
@@ -384,7 +384,7 @@
PHP_FE(tidy_parse_string, arginfo_tidy_parse_string)
PHP_FE(tidy_parse_file, arginfo_tidy_parse_file)
PHP_FE(tidy_get_output, arginfo_tidy_get_output)
- PHP_FE(tidy_get_error_buffer, arginfo_tidy_get_error_buffer)
+ PHP_FE(tidy_get_error_buffer, arginfo_tidy_get_error_buffer)
PHP_FE(tidy_clean_repair, arginfo_tidy_clean_repair)
PHP_FE(tidy_repair_string, arginfo_tidy_repair_string)
PHP_FE(tidy_repair_file, arginfo_tidy_repair_file)
@@ -398,7 +398,7 @@
PHP_FE(tidy_error_count, arginfo_tidy_error_count)
[PHP-CVS] svn: /php/php-src/trunk/ext/tidy/ tidy.c
jani Tue, 29 Dec 2009 12:57:38 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=292757
Log:
- Try prevent accidents
Changed paths:
U php/php-src/trunk/ext/tidy/tidy.c
Modified: php/php-src/trunk/ext/tidy/tidy.c
===
--- php/php-src/trunk/ext/tidy/tidy.c 2009-12-29 12:46:48 UTC (rev 292756)
+++ php/php-src/trunk/ext/tidy/tidy.c 2009-12-29 12:57:38 UTC (rev 292757)
@@ -59,7 +59,7 @@
RETURN_FALSE; \
} \
} \
- obj = (PHPTidyObj *) zend_object_store_get_object(object TSRMLS_CC);
\
+ obj = (PHPTidyObj *) zend_object_store_get_object(object TSRMLS_CC);
#define TIDY_FETCH_ONLY_OBJECT \
PHPTidyObj *obj;\
@@ -67,7 +67,7 @@
if (zend_parse_parameters_none() == FAILURE) { \
return; \
} \
- obj = (PHPTidyObj *) zend_object_store_get_object(object TSRMLS_CC);
\
+ obj = (PHPTidyObj *) zend_object_store_get_object(object TSRMLS_CC);
#define TIDY_APPLY_CONFIG_ZVAL(_doc, _val) \
if (_val) { \
@@ -131,7 +131,7 @@
ZVAL_EMPTY_STRING(tmp); \
} \
zend_ascii_hash_update(_table, #_key, sizeof(#_key), (void
*)tmp, sizeof(zval *), NULL); \
-}
+ }
#define ADD_PROPERTY_LONG(_table, _key, _long) \
{ \
@@ -158,9 +158,9 @@
}
#define TIDY_OPEN_BASEDIR_CHECK(filename) \
-if (php_check_open_basedir(filename TSRMLS_CC)) { \
- RETURN_FALSE; \
-} \
+ if (php_check_open_basedir(filename TSRMLS_CC)) { \
+ RETURN_FALSE; \
+ }
#define TIDY_SET_DEFAULT_CONFIG(_doc) \
if (TG(default_config) TG(default_config)[0]) { \
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/tidy/ tidy.c
jani Tue, 29 Dec 2009 13:00:09 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=292758
Log:
- Last ws pollution, I hope.
Changed paths:
U php/php-src/trunk/ext/tidy/tidy.c
Modified: php/php-src/trunk/ext/tidy/tidy.c
===
--- php/php-src/trunk/ext/tidy/tidy.c 2009-12-29 12:57:38 UTC (rev 292757)
+++ php/php-src/trunk/ext/tidy/tidy.c 2009-12-29 13:00:09 UTC (rev 292758)
@@ -155,7 +155,7 @@
MAKE_STD_ZVAL(tmp); \
ZVAL_BOOL(tmp, _bool); \
zend_ascii_hash_update(_table, #_key, sizeof(#_key), (void
*)tmp, sizeof(zval *), NULL); \
- }
+ }
#define TIDY_OPEN_BASEDIR_CHECK(filename) \
if (php_check_open_basedir(filename TSRMLS_CC)) { \
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/tidy/ tidy.c
kalleTue, 01 Sep 2009 14:05:00 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=287943
Log:
Fixes #49428 - Patch by Patrick Allaert
Bug: http://bugs.php.net/49428 (Assigned) cannot use array returned by
tidy_get_config()
Changed paths:
U php/php-src/trunk/ext/tidy/tidy.c
Modified: php/php-src/trunk/ext/tidy/tidy.c
===
--- php/php-src/trunk/ext/tidy/tidy.c 2009-09-01 13:41:18 UTC (rev 287942)
+++ php/php-src/trunk/ext/tidy/tidy.c 2009-09-01 14:05:00 UTC (rev 287943)
@@ -1479,15 +1479,15 @@
opt_value = php_tidy_get_opt_val(obj-ptdoc, opt, optt
TSRMLS_CC);
switch (optt) {
case TidyString:
- add_assoc_ascii_string(return_value, opt_name,
(char*)opt_value, 0);
+ add_ascii_assoc_string(return_value, opt_name,
(char*)opt_value, 1);
break;
case TidyInteger:
- add_assoc_long(return_value, opt_name,
(long)opt_value);
+ add_ascii_assoc_long(return_value, opt_name,
(long)opt_value);
break;
case TidyBoolean:
- add_assoc_bool(return_value, opt_name,
(long)opt_value);
+ add_ascii_assoc_bool(return_value, opt_name,
(long)opt_value);
break;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
