php-cli-segv-fixes.patch

   1 --- php-src/ext/tidy/php_tidy.h 2006/01/01 12:50:16     1.26.2.1
   2 +++ php-src/ext/tidy/php_tidy.h 2006/05/24 21:22:13     1.26.2.1.2.1
   3 @@ -40,6 +40,7 @@
   4  #define TIDY_ATTR_ME(name, param) TIDY_METHOD_MAP(name, tam_ ##name, param)
   5
   6  PHP_MINIT_FUNCTION(tidy);
   7 +PHP_MSHUTDOWN_FUNCTION(tidy);
   8  PHP_RINIT_FUNCTION(tidy);
   9  PHP_MINFO_FUNCTION(tidy);
  10
  11 --- php-src/ext/tidy/tidy.c     2006/05/09 23:58:46     1.66.2.8.2.1
  12 +++ php-src/ext/tidy/tidy.c     2006/05/24 21:22:13     1.66.2.8.2.2
  13 @@ -326,7 +326,7 @@
  14         "tidy",
  15         tidy_functions,
  16         PHP_MINIT(tidy),
  17 -       NULL,
  18 +       PHP_MSHUTDOWN(tidy),
  19         PHP_RINIT(tidy),
  20         NULL,
  21         PHP_MINFO(tidy),
  22 @@ -1000,6 +1000,17 @@
  23         return SUCCESS;
  24  }
  25
  26 +PHP_MSHUTDOWN_FUNCTION(tidy)
  27 +{
  28 +#ifdef ZTS
  29 +       ts_free_id(tidy_globals_id);
  30 +#else
  31 +       tidy_globals_dtor(&tidy_globals TSRMLS_CC);
  32 +#endif
  33 +       UNREGISTER_INI_ENTRIES();
  34 +       return SUCCESS;
  35 +}
  36 +
  37  PHP_MINFO_FUNCTION(tidy)
  38  {
  39         php_info_print_table_start();
  40 --- php-src/ext/sybase_ct/php_sybase_ct.c       2006/01/01 12:50:16     1.103.2.5
  41 +++ php-src/ext/sybase_ct/php_sybase_ct.c       2006/05/24 20:21:02     1.103.2.5.2.1
  42 @@ -442,6 +442,11 @@
  43  PHP_MSHUTDOWN_FUNCTION(sybase)
  44  {
  45         UNREGISTER_INI_ENTRIES();
  46 +#ifdef ZTS
  47 +       ts_free_id(sybase_globals_id);
  48 +#else
  49 +       php_sybase_destroy_globals(&sybase_globals TSRMLS_CC);
  50 +#endif
  51  #if 0
  52         ct_exit(context, CS_UNUSED);
  53         cs_ctx_drop(context);