summaryrefslogtreecommitdiff
path: root/lang/php53/files
diff options
context:
space:
mode:
authorFlorian Smeets <flo@FreeBSD.org>2012-05-02 21:22:47 +0000
committerFlorian Smeets <flo@FreeBSD.org>2012-05-02 21:22:47 +0000
commit84d5b2876eae8d6430d9ea9d74f00c9c248a7f2c (patch)
treef8142fcc6c86aae85f98a014fe76ba0dddd0357b /lang/php53/files
parentforced commit to note the repo copy of lang/php5 to lang/php53 (diff)
- take maintainership [1]
- merge update to 5.3.11 from lang/php5 - mark IGNORE until lang/php5 is updated to 5.4.x and all the php53-* ports will be committed Approved by: ale [1]
Notes
Notes: svn path=/head/; revision=295887
Diffstat (limited to 'lang/php53/files')
-rw-r--r--lang/php53/files/patch-ext-pcre-php_pcre.c23
-rw-r--r--lang/php53/files/patch-sapi_apache2filter_config.m411
2 files changed, 0 insertions, 34 deletions
diff --git a/lang/php53/files/patch-ext-pcre-php_pcre.c b/lang/php53/files/patch-ext-pcre-php_pcre.c
deleted file mode 100644
index d51f255d15f4..000000000000
--- a/lang/php53/files/patch-ext-pcre-php_pcre.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- ext/pcre/php_pcre.c 2012/01/01 13:15:04 321634
-+++ ext/pcre/php_pcre.c 2012/02/06 18:18:53 323097
-@@ -241,6 +241,7 @@
- char *pattern;
- int do_study = 0;
- int poptions = 0;
-+ int count = 0;
- unsigned const char *tables = NULL;
- #if HAVE_SETLOCALE
- char *locale = setlocale(LC_CTYPE, NULL);
-@@ -252,10 +253,10 @@
- back the compiled pattern, otherwise go on and compile it. */
- if (zend_hash_find(&PCRE_G(pcre_cache), regex, regex_len+1, (void **)&pce) == SUCCESS) {
- /*
-- * We use a quick pcre_info() check to see whether cache is corrupted, and if it
-+ * We use a quick pcre_fullinfo() check to see whether cache is corrupted, and if it
- * is, we flush it and compile the pattern from scratch.
- */
-- if (pcre_info(pce->re, NULL, NULL) == PCRE_ERROR_BADMAGIC) {
-+ if (pcre_fullinfo(pce->re, NULL, PCRE_INFO_CAPTURECOUNT, &count) == PCRE_ERROR_BADMAGIC) {
- zend_hash_clean(&PCRE_G(pcre_cache));
- } else {
- #if HAVE_SETLOCALE
diff --git a/lang/php53/files/patch-sapi_apache2filter_config.m4 b/lang/php53/files/patch-sapi_apache2filter_config.m4
deleted file mode 100644
index 48a46efa6796..000000000000
--- a/lang/php53/files/patch-sapi_apache2filter_config.m4
+++ /dev/null
@@ -1,11 +0,0 @@
---- sapi/apache2filter/config.m4.orig 2010-07-26 13:06:55.000000000 +0200
-+++ sapi/apache2filter/config.m4 2010-07-26 13:07:19.000000000 +0200
-@@ -118,7 +118,7 @@
- ;;
- esac
-
-- if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser"; then
-+ if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then
- PHP_BUILD_THREAD_SAFE
- fi
- AC_MSG_RESULT(yes)