Advertisement
Guest User

Untitled

a guest
Jan 23rd, 2012
146
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 3.82 KB | None | 0 0
  1. Common subdirectories: suhosin-0.9.33/mbregex and suhosin-0.9.33.new/mbregex
  2. diff -uN suhosin-0.9.33/php_suhosin.h suhosin-0.9.33.new/php_suhosin.h
  3. --- suhosin-0.9.33/php_suhosin.h Thu Jan 19 15:49:18 2012
  4. +++ suhosin-0.9.33.new/php_suhosin.h Mon Jan 23 00:09:41 2012
  5. @@ -308,7 +308,7 @@
  6. char *suhosin_cookie_decryptor(TSRMLS_D);
  7. char *suhosin_getenv(char *name, size_t name_len TSRMLS_DC);
  8. void suhosin_hook_post_handlers(TSRMLS_D);
  9. -void suhosin_unhook_post_handlers();
  10. +void suhosin_unhook_post_handlers(TSRMLS_D);
  11. void suhosin_hook_register_server_variables();
  12. void suhosin_hook_header_handler();
  13. void suhosin_unhook_header_handler();
  14. diff -uN suhosin-0.9.33/post_handler.c suhosin-0.9.33.new/post_handler.c
  15. --- suhosin-0.9.33/post_handler.c Thu Jan 19 15:49:18 2012
  16. +++ suhosin-0.9.33.new/post_handler.c Mon Jan 23 00:09:41 2012
  17. @@ -162,7 +162,7 @@
  18. ini_entry->on_modify = suhosin_OnUpdate_mbstring_encoding_translation;
  19. }
  20.  
  21. -void suhosin_unhook_post_handlers()
  22. +void suhosin_unhook_post_handlers(TSRMLS_D)
  23. {
  24. zend_ini_entry *ini_entry;
  25.  
  26. @@ -186,5 +186,3 @@
  27. * vim600: noet sw=4 ts=4 fdm=marker
  28. * vim<600: noet sw=4 ts=4
  29. */
  30. -
  31. -
  32. diff -uN suhosin-0.9.33/session.c suhosin-0.9.33.new/session.c
  33. --- suhosin-0.9.33/session.c Thu Jan 19 15:49:18 2012
  34. +++ suhosin-0.9.33.new/session.c Mon Jan 23 00:09:41 2012
  35. @@ -1,19 +1,19 @@
  36. /*
  37. +----------------------------------------------------------------------+
  38. - | Suhosin Version 1 |
  39. + | Suhosin Version 1 |
  40. +----------------------------------------------------------------------+
  41. - | Copyright (c) 2006-2007 The Hardened-PHP Project |
  42. - | Copyright (c) 2007-2012 SektionEins GmbH |
  43. + | Copyright (c) 2006-2007 The Hardened-PHP Project |
  44. + | Copyright (c) 2007-2012 SektionEins GmbH |
  45. +----------------------------------------------------------------------+
  46. - | This source file is subject to version 3.01 of the PHP license, |
  47. - | that is bundled with this package in the file LICENSE, and is |
  48. - | available through the world-wide-web at the following url: |
  49. - | http://www.php.net/license/3_01.txt |
  50. + | This source file is subject to version 3.01 of the PHP license, |
  51. + | that is bundled with this package in the file LICENSE, and is |
  52. + | available through the world-wide-web at the following url: |
  53. + | http://www.php.net/license/3_01.txt |
  54. | If you did not receive a copy of the PHP license and are unable to |
  55. - | obtain it through the world-wide-web, please send a note to |
  56. - | license@php.net so we can mail you a copy immediately. |
  57. + | obtain it through the world-wide-web, please send a note to |
  58. + | license@php.net so we can mail you a copy immediately. |
  59. +----------------------------------------------------------------------+
  60. - | Author: Stefan Esser <sesser@sektioneins.de> |
  61. + | Author: Stefan Esser <sesser@sektioneins.de> |
  62. +----------------------------------------------------------------------+
  63. */
  64. /*
  65. diff -uN suhosin-0.9.33/suhosin.c suhosin-0.9.33.new/suhosin.c
  66. --- suhosin-0.9.33/suhosin.c Thu Jan 19 15:49:18 2012
  67. +++ suhosin-0.9.33.new/suhosin.c Mon Jan 23 00:09:41 2012
  68. @@ -189,9 +189,12 @@
  69.  
  70. static void suhosin_shutdown(zend_extension *extension)
  71. {
  72. + TSRMLS_FETCH();
  73. +
  74. + suhosin_unhook_session(TSRMLS_C);
  75. suhosin_unhook_execute();
  76. suhosin_unhook_header_handler();
  77. - suhosin_unhook_post_handlers();
  78. + suhosin_unhook_post_handlers(TSRMLS_C);
  79.  
  80. if (ze != NULL) {
  81. ze->startup = orig_module_startup;
  82. Common subdirectories: suhosin-0.9.33/tests and suhosin-0.9.33.new/tests
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement