diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2009-09-22 10:36:31 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2009-09-22 10:36:31 +0000 |
| commit | d8637e03c9ddbfb6eb72bd335bd41553145a717c (patch) | |
| tree | 37121111581ff151225df3381a27e4e1f553d654 /lang/php53/files | |
| parent | Update to 1.27. (diff) | |
Update to 5.2.11 release.
(Do not link to thread library when building a thread-safe only lib)
Feature safe: yes
Notes
Notes:
svn path=/head/; revision=241911
Diffstat (limited to 'lang/php53/files')
| -rw-r--r-- | lang/php53/files/patch-TSRM_threads.m4 | 22 | ||||
| -rw-r--r-- | lang/php53/files/patch-ext_standard_php_dns.h (renamed from lang/php53/files/patch-ext_standard_dns.h) | 4 | ||||
| -rw-r--r-- | lang/php53/files/patch-main_SAPI.c | 20 |
3 files changed, 13 insertions, 33 deletions
diff --git a/lang/php53/files/patch-TSRM_threads.m4 b/lang/php53/files/patch-TSRM_threads.m4 index 6208eac7f79c..227f6d26c9d5 100644 --- a/lang/php53/files/patch-TSRM_threads.m4 +++ b/lang/php53/files/patch-TSRM_threads.m4 @@ -1,11 +1,11 @@ ---- TSRM/threads.m4.orig Wed Apr 27 15:22:18 2005 -+++ TSRM/threads.m4 Wed May 3 10:02:34 2006 -@@ -164,7 +164,7 @@ - dnl - AC_DEFUN([PTHREADS_ASSIGN_VARS],[ - if test -n "$ac_cv_pthreads_lib"; then -- LIBS="$LIBS -l$ac_cv_pthreads_lib" -+ LIBS="$LIBS $ac_cv_pthreads_lib" - fi - - if test -n "$ac_cv_pthreads_cflags"; then +--- TSRM/threads.m4.orig 2005-04-27 15:22:18.000000000 +0200 ++++ TSRM/threads.m4 2009-09-22 10:01:37.000000000 +0200 +@@ -79,7 +79,7 @@ + pthread_mutexattr_t mattr; + int data = 1; + pthread_mutexattr_init(&mattr); +- return pthread_create(&thd, NULL, thread_routine, &data); ++ return 0; + } ], [ + pthreads_working=yes + ], [ diff --git a/lang/php53/files/patch-ext_standard_dns.h b/lang/php53/files/patch-ext_standard_php_dns.h index 1ea8751970c8..8ab9e9c01d38 100644 --- a/lang/php53/files/patch-ext_standard_dns.h +++ b/lang/php53/files/patch-ext_standard_php_dns.h @@ -1,5 +1,5 @@ ---- ext/standard/dns.h.orig Sun Jun 19 11:57:31 2005 -+++ ext/standard/dns.h Sun Jun 19 12:03:37 2005 +--- ext/standard/php_dns.h.orig Sun Jun 19 11:57:31 2005 ++++ ext/standard/php_dns.h Sun Jun 19 12:03:37 2005 @@ -25,6 +25,10 @@ #if HAVE_RES_NMKQUERY && HAVE_RES_NSEND && HAVE_DN_EXPAND && HAVE_DN_SKIPNAME diff --git a/lang/php53/files/patch-main_SAPI.c b/lang/php53/files/patch-main_SAPI.c deleted file mode 100644 index e257bfeb5bee..000000000000 --- a/lang/php53/files/patch-main_SAPI.c +++ /dev/null @@ -1,20 +0,0 @@ ---- main/SAPI.c.orig 2007-05-25 11:20:01.000000000 +0200 -+++ main/SAPI.c 2008-02-01 23:48:51.000000000 +0100 -@@ -604,7 +606,7 @@ - ptr++; - len--; - } --#if HAVE_ZLIB -+#if 1 - if(!strncmp(ptr, "image/", sizeof("image/")-1)) { - zend_alter_ini_entry("zlib.output_compression", sizeof("zlib.output_compression"), "0", sizeof("0") - 1, PHP_INI_USER, PHP_INI_STAGE_RUNTIME); - } -@@ -758,7 +760,7 @@ - return SUCCESS; - } - --#if HAVE_ZLIB -+#if 1 - /* Add output compression headers at this late stage in order to make - it possible to switch it off inside the script. */ - |