diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2012-04-30 15:06:53 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2012-04-30 15:06:53 +0000 |
| commit | dbe5e951ac015857a6f861c5cc823d12cca8ab5f (patch) | |
| tree | e6c9b23e5555238f36f4d763d8cd088007327d3b /lang/php5/files | |
| parent | Update to 1.4.0 (diff) | |
Update to 5.3.11 release.
Note: this port will be updated to 5.4.x as soon as suhosin will be released,
while php 5.3.x branch will continue to exist in lang/php53.
Notes
Notes:
svn path=/head/; revision=295721
Diffstat (limited to 'lang/php5/files')
| -rw-r--r-- | lang/php5/files/patch-ext-pcre-php_pcre.c | 23 | ||||
| -rw-r--r-- | lang/php5/files/patch-sapi_apache2filter_config.m4 | 11 |
2 files changed, 0 insertions, 34 deletions
diff --git a/lang/php5/files/patch-ext-pcre-php_pcre.c b/lang/php5/files/patch-ext-pcre-php_pcre.c deleted file mode 100644 index d51f255d15f4..000000000000 --- a/lang/php5/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/php5/files/patch-sapi_apache2filter_config.m4 b/lang/php5/files/patch-sapi_apache2filter_config.m4 deleted file mode 100644 index 48a46efa6796..000000000000 --- a/lang/php5/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) |