apache-php.patch 1.4 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950
  1. Index: ext/gd/libgd/gd_arc.c
  2. --- ext/gd/libgd/gd_arc.c.orig 2009-05-26 22:14:31 +0200
  3. +++ ext/gd/libgd/gd_arc.c 2009-07-01 08:56:12 +0200
  4. @@ -53,6 +53,7 @@
  5. }
  6. }
  7. +#if 0
  8. void gdImageFilledEllipse (gdImagePtr im, int mx, int my, int w, int h, int c)
  9. {
  10. int x=0,mx1=0,mx2=0,my1=0,my2=0;
  11. @@ -106,5 +107,6 @@
  12. old_y1 = my1;
  13. }
  14. }
  15. +#endif
  16. Index: ext/gd/libgd/gd_compat.c
  17. --- ext/gd/libgd/gd_compat.c.orig 2009-08-09 15:15:45 +0200
  18. +++ ext/gd/libgd/gd_compat.c 2010-01-19 21:20:30 +0100
  19. @@ -5,6 +5,7 @@
  20. #endif
  21. #ifdef HAVE_GD_JPG
  22. +# include <stdio.h>
  23. # include <jpeglib.h>
  24. #endif
  25. Index: ext/pcre/php_pcre.c
  26. --- ext/pcre/php_pcre.c.orig 2012-01-01 14:15:04.000000000 +0100
  27. +++ ext/pcre/php_pcre.c 2012-02-06 08:48:07.000000000 +0100
  28. @@ -247,6 +247,7 @@
  29. #endif
  30. pcre_cache_entry *pce;
  31. pcre_cache_entry new_entry;
  32. + int dummy;
  33. /* Try to lookup the cached regex entry, and if successful, just pass
  34. back the compiled pattern, otherwise go on and compile it. */
  35. @@ -255,7 +256,7 @@
  36. * We use a quick pcre_info() check to see whether cache is corrupted, and if it
  37. * is, we flush it and compile the pattern from scratch.
  38. */
  39. - if (pcre_info(pce->re, NULL, NULL) == PCRE_ERROR_BADMAGIC) {
  40. + if (pcre_fullinfo(pce->re, NULL, PCRE_INFO_CAPTURECOUNT, &dummy) == PCRE_ERROR_BADMAGIC) {
  41. zend_hash_clean(&PCRE_G(pcre_cache));
  42. } else {
  43. #if HAVE_SETLOCALE