mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-19 19:59:43 +00:00
Update to 4.4.2 release.
This commit is contained in:
parent
d844b3df99
commit
9eb17499b3
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=153634
@ -6,8 +6,8 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
PORTNAME= php4
|
PORTNAME= php4
|
||||||
PORTVERSION= 4.4.1
|
PORTVERSION= 4.4.2
|
||||||
PORTREVISION?= 3
|
PORTREVISION?= 0
|
||||||
CATEGORIES?= lang devel www
|
CATEGORIES?= lang devel www
|
||||||
MASTER_SITES= ${MASTER_SITE_PHP:S,$,:release,} \
|
MASTER_SITES= ${MASTER_SITE_PHP:S,$,:release,} \
|
||||||
http://downloads.php.net/ilia/:rc \
|
http://downloads.php.net/ilia/:rc \
|
||||||
|
@ -457,6 +457,11 @@ pre-configure:
|
|||||||
/usr/bin/ar rcs liboracle.a *.o
|
/usr/bin/ar rcs liboracle.a *.o
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
|
.if ${PHP_MODNAME} == "pcre"
|
||||||
|
post-extract:
|
||||||
|
@${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4
|
||||||
|
.endif
|
||||||
|
|
||||||
.if ${PHP_MODNAME} == "snmp"
|
.if ${PHP_MODNAME} == "snmp"
|
||||||
. if defined(WITH_SNMP4) || exists(${LOCALBASE}/lib/libsnmp.so.4)
|
. if defined(WITH_SNMP4) || exists(${LOCALBASE}/lib/libsnmp.so.4)
|
||||||
LIB_DEPENDS+= snmp.4:${PORTSDIR}/net-mgmt/net-snmp4
|
LIB_DEPENDS+= snmp.4:${PORTSDIR}/net-mgmt/net-snmp4
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
MD5 (php-4.4.1.tar.bz2) = 6b5726471189f8a1f26dd7cc5e19b442
|
MD5 (php-4.4.2.tar.bz2) = 28051cd9ef43490dd9727a4d442011b5
|
||||||
SHA256 (php-4.4.1.tar.bz2) = c3010a85089bd464d5bbdda63dd253e0cf779db9670accf1ea5355de7ba448f8
|
SHA256 (php-4.4.2.tar.bz2) = a2024d665125a41611eb64451648d37a81e3579594c8810bb41ac8b2b63f81eb
|
||||||
SIZE (php-4.4.1.tar.bz2) = 4157749
|
SIZE (php-4.4.2.tar.bz2) = 4371185
|
||||||
|
@ -1,13 +0,0 @@
|
|||||||
--- ext/standard/basic_functions.c.orig Fri Nov 4 09:30:04 2005
|
|
||||||
+++ ext/standard/basic_functions.c Fri Nov 4 09:30:56 2005
|
|
||||||
@@ -802,8 +802,8 @@
|
|
||||||
PHP_FE(prev, first_arg_force_ref)
|
|
||||||
PHP_FE(next, first_arg_force_ref)
|
|
||||||
PHP_FE(reset, first_arg_force_ref)
|
|
||||||
- PHP_FE(current, NULL)
|
|
||||||
- PHP_FE(key, NULL)
|
|
||||||
+ PHP_FE(current, first_arg_force_ref)
|
|
||||||
+ PHP_FE(key, first_arg_force_ref)
|
|
||||||
PHP_FE(min, NULL)
|
|
||||||
PHP_FE(max, NULL)
|
|
||||||
PHP_FE(in_array, NULL)
|
|
@ -1,118 +0,0 @@
|
|||||||
--- sapi/apache2handler/sapi_apache2.c.orig Wed Oct 12 23:41:36 2005
|
|
||||||
+++ sapi/apache2handler/sapi_apache2.c Tue Nov 15 23:27:16 2005
|
|
||||||
@@ -453,34 +453,15 @@
|
|
||||||
request_rec *parent_req = NULL;
|
|
||||||
TSRMLS_FETCH();
|
|
||||||
|
|
||||||
-#define PHPAP_INI_OFF \
|
|
||||||
- if (strcmp(r->protocol, "INCLUDED")) { \
|
|
||||||
- zend_try { zend_ini_deactivate(TSRMLS_C); } zend_end_try(); \
|
|
||||||
- } \
|
|
||||||
-
|
|
||||||
conf = ap_get_module_config(r->per_dir_config, &php4_module);
|
|
||||||
-
|
|
||||||
- /* apply_config() needs r in some cases, so allocate server_context early */
|
|
||||||
- ctx = SG(server_context);
|
|
||||||
- if (ctx == NULL) {
|
|
||||||
- ctx = SG(server_context) = apr_pcalloc(r->pool, sizeof(*ctx));
|
|
||||||
- /* register a cleanup so we clear out the SG(server_context)
|
|
||||||
- * after each request. Note: We pass in the pointer to the
|
|
||||||
- * server_context in case this is handled by a different thread.
|
|
||||||
- */
|
|
||||||
- apr_pool_cleanup_register(r->pool, (void *)&SG(server_context), php_server_context_cleanup, apr_pool_cleanup_null);
|
|
||||||
- ctx->r = r;
|
|
||||||
- ctx = NULL; /* May look weird to null it here, but it is to catch the right case in the first_try later on */
|
|
||||||
- } else {
|
|
||||||
- parent_req = ctx->r;
|
|
||||||
- ctx->r = r;
|
|
||||||
- }
|
|
||||||
apply_config(conf);
|
|
||||||
|
|
||||||
if (strcmp(r->handler, PHP_MAGIC_TYPE) && strcmp(r->handler, PHP_SOURCE_MAGIC_TYPE) && strcmp(r->handler, PHP_SCRIPT)) {
|
|
||||||
/* Check for xbithack in this case. */
|
|
||||||
if (!AP2(xbithack) || strcmp(r->handler, "text/html") || !(r->finfo.protection & APR_UEXECUTE)) {
|
|
||||||
- PHPAP_INI_OFF;
|
|
||||||
+ zend_try {
|
|
||||||
+ zend_ini_deactivate(TSRMLS_C);
|
|
||||||
+ } zend_end_try();
|
|
||||||
return DECLINED;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -489,24 +470,32 @@
|
|
||||||
* the configuration; default behaviour is to accept. */
|
|
||||||
if (r->used_path_info == AP_REQ_REJECT_PATH_INFO
|
|
||||||
&& r->path_info && r->path_info[0]) {
|
|
||||||
- PHPAP_INI_OFF;
|
|
||||||
+ zend_try {
|
|
||||||
+ zend_ini_deactivate(TSRMLS_C);
|
|
||||||
+ } zend_end_try();
|
|
||||||
return HTTP_NOT_FOUND;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* handle situations where user turns the engine off */
|
|
||||||
if (!AP2(engine)) {
|
|
||||||
- PHPAP_INI_OFF;
|
|
||||||
+ zend_try {
|
|
||||||
+ zend_ini_deactivate(TSRMLS_C);
|
|
||||||
+ } zend_end_try();
|
|
||||||
return DECLINED;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (r->finfo.filetype == 0) {
|
|
||||||
php_apache_sapi_log_message_ex("script '%s' not found or unable to stat", r);
|
|
||||||
- PHPAP_INI_OFF;
|
|
||||||
+ zend_try {
|
|
||||||
+ zend_ini_deactivate(TSRMLS_C);
|
|
||||||
+ } zend_end_try();
|
|
||||||
return HTTP_NOT_FOUND;
|
|
||||||
}
|
|
||||||
if (r->finfo.filetype == APR_DIR) {
|
|
||||||
php_apache_sapi_log_message_ex("attempt to invoke directory '%s' as script", r);
|
|
||||||
- PHPAP_INI_OFF;
|
|
||||||
+ zend_try {
|
|
||||||
+ zend_ini_deactivate(TSRMLS_C);
|
|
||||||
+ } zend_end_try();
|
|
||||||
return HTTP_FORBIDDEN;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -522,30 +511,24 @@
|
|
||||||
|
|
||||||
zend_first_try {
|
|
||||||
|
|
||||||
+ ctx = SG(server_context);
|
|
||||||
if (ctx == NULL) {
|
|
||||||
-normal:
|
|
||||||
+ ctx = SG(server_context) = apr_pcalloc(r->pool, sizeof(*ctx));
|
|
||||||
+ /* register a cleanup so we clear out the SG(server_context)
|
|
||||||
+ * after each request. Note: We pass in the pointer to the
|
|
||||||
+ * server_context in case this is handled by a different thread.
|
|
||||||
+ */
|
|
||||||
+ apr_pool_cleanup_register(r->pool, (void *)&SG(server_context), php_server_context_cleanup, apr_pool_cleanup_null);
|
|
||||||
+
|
|
||||||
+ ctx->r = r;
|
|
||||||
brigade = apr_brigade_create(r->pool, r->connection->bucket_alloc);
|
|
||||||
- ctx = SG(server_context);
|
|
||||||
ctx->brigade = brigade;
|
|
||||||
|
|
||||||
if (php_apache_request_ctor(r, ctx TSRMLS_CC)!=SUCCESS) {
|
|
||||||
zend_bailout();
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
- if (!parent_req) {
|
|
||||||
- parent_req = ctx->r;
|
|
||||||
- }
|
|
||||||
- if (parent_req && strcmp(parent_req->handler, PHP_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SOURCE_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SCRIPT)) {
|
|
||||||
- if (php_apache_request_ctor(r, ctx TSRMLS_CC)!=SUCCESS) {
|
|
||||||
- zend_bailout();
|
|
||||||
- }
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- /* check if comming due to ErrorDocument */
|
|
||||||
- if (parent_req && parent_req->status != HTTP_OK) {
|
|
||||||
- parent_req = NULL;
|
|
||||||
- goto normal;
|
|
||||||
- }
|
|
||||||
+ parent_req = ctx->r;
|
|
||||||
ctx->r = r;
|
|
||||||
brigade = ctx->brigade;
|
|
||||||
}
|
|
@ -1,22 +0,0 @@
|
|||||||
--- config.m4.orig Thu Sep 8 12:40:37 2005
|
|
||||||
+++ config.m4 Thu Sep 8 12:40:42 2005
|
|
||||||
@@ -114,17 +114,18 @@
|
|
||||||
_SAVE_CPPFLAGS=$CPPFLAGS
|
|
||||||
_SAVE_LDFLAGS=$LDFLAGS
|
|
||||||
CPPFLAGS="$CPPFLAGS -I$LDAP_INCDIR"
|
|
||||||
+ LDFLAGS="$LDFLAGS $LDAP_SHARED_LIBADD"
|
|
||||||
AC_CACHE_CHECK([for 3 arg ldap_set_rebind_proc], ac_cv_3arg_setrebindproc,
|
|
||||||
[AC_TRY_COMPILE([#include <ldap.h>], [ldap_set_rebind_proc(0,0,0)],
|
|
||||||
ac_cv_3arg_setrebindproc=yes, ac_cv_3arg_setrebindproc=no)])
|
|
||||||
if test "$ac_cv_3arg_setrebindproc" = yes; then
|
|
||||||
AC_DEFINE(HAVE_3ARG_SETREBINDPROC,1,[Whether 3 arg set_rebind_proc()])
|
|
||||||
fi
|
|
||||||
- CPPFLAGS=$_SAVE_CPPFLAGS
|
|
||||||
|
|
||||||
dnl Solaris 2.8 claims to be 2004 API, but doesn't have
|
|
||||||
dnl ldap_parse_reference() nor ldap_start_tls_s()
|
|
||||||
AC_CHECK_FUNCS([ldap_parse_result ldap_parse_reference ldap_start_tls_s])
|
|
||||||
+ CPPFLAGS=$_SAVE_CPPFLAGS
|
|
||||||
LDFLAGS=$_SAVE_LDFLAGS
|
|
||||||
|
|
||||||
dnl
|
|
Loading…
Reference in New Issue
Block a user