aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--databases/php5-dba/files/patch-config.m413
-rw-r--r--databases/php5-interbase/Makefile1
-rw-r--r--databases/php5-interbase/files/patch-php_ibase_includes.h11
-rw-r--r--lang/php5/Makefile4
-rw-r--r--lang/php5/distinfo12
-rw-r--r--lang/php5/files/patch-ext_standard_string.c159
-rw-r--r--lang/php5/files/patch-main_rfc1867.c20
-rw-r--r--lang/php5/pkg-plist1
-rw-r--r--lang/php53/Makefile4
-rw-r--r--lang/php53/distinfo12
-rw-r--r--lang/php53/files/patch-ext_standard_string.c159
-rw-r--r--lang/php53/files/patch-main_rfc1867.c20
-rw-r--r--lang/php53/pkg-plist1
-rw-r--r--net/php5-sockets/files/patch-sockets.c14
14 files changed, 20 insertions, 411 deletions
diff --git a/databases/php5-dba/files/patch-config.m4 b/databases/php5-dba/files/patch-config.m4
index 18e8156ef723..0e4eca2b7d56 100644
--- a/databases/php5-dba/files/patch-config.m4
+++ b/databases/php5-dba/files/patch-config.m4
@@ -44,15 +44,6 @@
+ THIS_PREFIX=$i
+ THIS_INCLUDE=$i/include/db41/db.h
+ break
- elif test -f "$i/include/db5.0/db.h"; then
+ elif test -f "$i/include/db5.1/db.h"; then
THIS_PREFIX=$i
- THIS_INCLUDE=$i/include/db5.0/db.h
-@@ -323,7 +363,7 @@
- break
- fi
- done
-- PHP_DBA_DB_CHECK(4, db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
-+ PHP_DBA_DB_CHECK(4, db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
- fi
- PHP_DBA_STD_RESULT(db4,Berkeley DB4)
-
+ THIS_INCLUDE=$i/include/db5.1/db.h
diff --git a/databases/php5-interbase/Makefile b/databases/php5-interbase/Makefile
index c354474eb625..9e8c0117c847 100644
--- a/databases/php5-interbase/Makefile
+++ b/databases/php5-interbase/Makefile
@@ -5,7 +5,6 @@
# $FreeBSD$
#
-PORTREVISION= 1
CATEGORIES= databases
MASTERDIR= ${.CURDIR}/../../lang/php5
diff --git a/databases/php5-interbase/files/patch-php_ibase_includes.h b/databases/php5-interbase/files/patch-php_ibase_includes.h
deleted file mode 100644
index eb5b653f74d4..000000000000
--- a/databases/php5-interbase/files/patch-php_ibase_includes.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- php_ibase_includes.h.orig 2011-05-24 10:11:01.000000000 +0200
-+++ php_ibase_includes.h 2011-05-24 10:11:12.000000000 +0200
-@@ -51,7 +51,7 @@
- #define LE_PLINK "Firebird/InterBase persistent link"
- #define LE_TRANS "Firebird/InterBase transaction"
-
--#define IBASE_MSGSIZE 256
-+#define IBASE_MSGSIZE 512
- #define MAX_ERRMSG (IBASE_MSGSIZE*2)
-
- #define IB_DEF_DATE_FMT "%Y-%m-%d"
diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index a8aad4a3f7a1..69e833753109 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME= php5
-PORTVERSION= 5.3.6
-PORTREVISION?= 1
+PORTVERSION= 5.3.7
+PORTREVISION?= 0
CATEGORIES?= lang devel www
MASTER_SITES= ${MASTER_SITE_PHP}
MASTER_SITE_SUBDIR= distributions
diff --git a/lang/php5/distinfo b/lang/php5/distinfo
index 4d76ea661f69..622bbb9a33b3 100644
--- a/lang/php5/distinfo
+++ b/lang/php5/distinfo
@@ -1,6 +1,6 @@
-SHA256 (php-5.3.6.tar.bz2) = 30ae880f22e3ee93eccc9b80e3c58b0d6364d139bb4366dcc27f2fab658d3198
-SIZE (php-5.3.6.tar.bz2) = 10952171
-SHA256 (suhosin-patch-5.3.6-0.9.10.patch.gz) = 48b8151ea441e49a43f3a751b0aa9cef7df7e055948b335d09168df031943f51
-SIZE (suhosin-patch-5.3.6-0.9.10.patch.gz) = 40024
-SHA256 (php-5.3.6-mail-header.patch) = 5cd43388b33fe5703c2c7d1de04d9b7030ee0a65d110c3793dfccb096ed2cc09
-SIZE (php-5.3.6-mail-header.patch) = 3346
+SHA256 (php-5.3.7.tar.bz2) = 58b490af6f919acfafb6e176957b88e3d814eabee68cc147b4d8d20697d88b96
+SIZE (php-5.3.7.tar.bz2) = 11144328
+SHA256 (suhosin-patch-5.3.7-0.9.10.patch.gz) = 48b8151ea441e49a43f3a751b0aa9cef7df7e055948b335d09168df031943f51
+SIZE (suhosin-patch-5.3.7-0.9.10.patch.gz) = 40024
+SHA256 (php-5.3.7-mail-header.patch) = 5cd43388b33fe5703c2c7d1de04d9b7030ee0a65d110c3793dfccb096ed2cc09
+SIZE (php-5.3.7-mail-header.patch) = 3346
diff --git a/lang/php5/files/patch-ext_standard_string.c b/lang/php5/files/patch-ext_standard_string.c
deleted file mode 100644
index 361cc6f16473..000000000000
--- a/lang/php5/files/patch-ext_standard_string.c
+++ /dev/null
@@ -1,159 +0,0 @@
---- ext/standard/string.c.orig 2011/04/13 03:32:19
-+++ ext/standard/string.c 2011/04/13 06:32:41
-@@ -2352,20 +2352,35 @@
-
- zend_hash_internal_pointer_reset_ex(Z_ARRVAL_PP(str), &pos_str);
- while (zend_hash_get_current_data_ex(Z_ARRVAL_PP(str), (void **) &tmp_str, &pos_str) == SUCCESS) {
-- convert_to_string_ex(tmp_str);
-+ zval *orig_str;
-+ zval dummy;
-+ if(Z_TYPE_PP(tmp_str) != IS_STRING) {
-+ dummy = **tmp_str;
-+ orig_str = &dummy;
-+ zval_copy_ctor(orig_str);
-+ convert_to_string(orig_str);
-+ } else {
-+ orig_str = *tmp_str;
-+ }
-
- if (Z_TYPE_PP(from) == IS_ARRAY) {
- if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_PP(from), (void **) &tmp_from, &pos_from)) {
-- convert_to_long_ex(tmp_from);
-+ if(Z_TYPE_PP(tmp_from) != IS_LONG) {
-+ zval dummy = **tmp_from;
-+ zval_copy_ctor(&dummy);
-+ convert_to_long(&dummy);
-+ f = Z_LVAL(dummy);
-+ } else {
-+ f = Z_LVAL_PP(tmp_from);
-+ }
-
-- f = Z_LVAL_PP(tmp_from);
- if (f < 0) {
-- f = Z_STRLEN_PP(tmp_str) + f;
-+ f = Z_STRLEN_P(orig_str) + f;
- if (f < 0) {
- f = 0;
- }
-- } else if (f > Z_STRLEN_PP(tmp_str)) {
-- f = Z_STRLEN_PP(tmp_str);
-+ } else if (f > Z_STRLEN_P(orig_str)) {
-+ f = Z_STRLEN_P(orig_str);
- }
- zend_hash_move_forward_ex(Z_ARRVAL_PP(from), &pos_from);
- } else {
-@@ -2374,72 +2389,94 @@
- } else {
- f = Z_LVAL_PP(from);
- if (f < 0) {
-- f = Z_STRLEN_PP(tmp_str) + f;
-+ f = Z_STRLEN_P(orig_str) + f;
- if (f < 0) {
- f = 0;
- }
-- } else if (f > Z_STRLEN_PP(tmp_str)) {
-- f = Z_STRLEN_PP(tmp_str);
-+ } else if (f > Z_STRLEN_P(orig_str)) {
-+ f = Z_STRLEN_P(orig_str);
- }
- }
-
- if (argc > 3 && Z_TYPE_PP(len) == IS_ARRAY) {
- if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_PP(len), (void **) &tmp_len, &pos_len)) {
-- convert_to_long_ex(tmp_len);
-+ if(Z_TYPE_PP(tmp_len) != IS_LONG) {
-+ zval dummy = **tmp_len;
-+ zval_copy_ctor(&dummy);
-+ convert_to_long(&dummy);
-+ l = Z_LVAL(dummy);
-+ } else {
-+ l = Z_LVAL_PP(tmp_len);
-+ }
-
- l = Z_LVAL_PP(tmp_len);
- zend_hash_move_forward_ex(Z_ARRVAL_PP(len), &pos_len);
- } else {
-- l = Z_STRLEN_PP(tmp_str);
-+ l = Z_STRLEN_P(orig_str);
- }
- } else if (argc > 3) {
- l = Z_LVAL_PP(len);
- } else {
-- l = Z_STRLEN_PP(tmp_str);
-+ l = Z_STRLEN_P(orig_str);
- }
-
- if (l < 0) {
-- l = (Z_STRLEN_PP(tmp_str) - f) + l;
-+ l = (Z_STRLEN_P(orig_str) - f) + l;
- if (l < 0) {
- l = 0;
- }
- }
-
-- if ((f + l) > Z_STRLEN_PP(tmp_str)) {
-- l = Z_STRLEN_PP(tmp_str) - f;
-+ if ((f + l) > Z_STRLEN_P(orig_str)) {
-+ l = Z_STRLEN_P(orig_str) - f;
- }
-
-- result_len = Z_STRLEN_PP(tmp_str) - l;
-+ result_len = Z_STRLEN_P(orig_str) - l;
-
- if (Z_TYPE_PP(repl) == IS_ARRAY) {
- if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_PP(repl), (void **) &tmp_repl, &pos_repl)) {
-- convert_to_string_ex(tmp_repl);
-- result_len += Z_STRLEN_PP(tmp_repl);
-+ zval *repl_str;
-+ zval zrepl;
-+ if(Z_TYPE_PP(tmp_repl) != IS_STRING) {
-+ zrepl = **tmp_repl;
-+ repl_str = &zrepl;
-+ zval_copy_ctor(repl_str);
-+ convert_to_string(repl_str);
-+ } else {
-+ repl_str = *tmp_repl;
-+ }
-+
-+ result_len += Z_STRLEN_P(repl_str);
- zend_hash_move_forward_ex(Z_ARRVAL_PP(repl), &pos_repl);
- result = emalloc(result_len + 1);
-
-- memcpy(result, Z_STRVAL_PP(tmp_str), f);
-- memcpy((result + f), Z_STRVAL_PP(tmp_repl), Z_STRLEN_PP(tmp_repl));
-- memcpy((result + f + Z_STRLEN_PP(tmp_repl)), Z_STRVAL_PP(tmp_str) + f + l, Z_STRLEN_PP(tmp_str) - f - l);
-+ memcpy(result, Z_STRVAL_P(orig_str), f);
-+ memcpy((result + f), Z_STRVAL_P(repl_str), Z_STRLEN_P(repl_str));
-+ memcpy((result + f + Z_STRLEN_P(repl_str)), Z_STRVAL_P(orig_str) + f + l, Z_STRLEN_P(orig_str) - f - l);
-+ if(Z_TYPE_PP(tmp_repl) != IS_STRING) {
-+ zval_dtor(repl_str);
-+ }
- } else {
- result = emalloc(result_len + 1);
-
-- memcpy(result, Z_STRVAL_PP(tmp_str), f);
-- memcpy((result + f), Z_STRVAL_PP(tmp_str) + f + l, Z_STRLEN_PP(tmp_str) - f - l);
-+ memcpy(result, Z_STRVAL_P(orig_str), f);
-+ memcpy((result + f), Z_STRVAL_P(orig_str) + f + l, Z_STRLEN_P(orig_str) - f - l);
- }
- } else {
- result_len += Z_STRLEN_PP(repl);
-
- result = emalloc(result_len + 1);
-
-- memcpy(result, Z_STRVAL_PP(tmp_str), f);
-+ memcpy(result, Z_STRVAL_P(orig_str), f);
- memcpy((result + f), Z_STRVAL_PP(repl), Z_STRLEN_PP(repl));
-- memcpy((result + f + Z_STRLEN_PP(repl)), Z_STRVAL_PP(tmp_str) + f + l, Z_STRLEN_PP(tmp_str) - f - l);
-+ memcpy((result + f + Z_STRLEN_PP(repl)), Z_STRVAL_P(orig_str) + f + l, Z_STRLEN_P(orig_str) - f - l);
- }
-
- result[result_len] = '\0';
- add_next_index_stringl(return_value, result, result_len, 0);
--
-+ if(Z_TYPE_PP(tmp_str) != IS_STRING) {
-+ zval_dtor(orig_str);
-+ }
- zend_hash_move_forward_ex(Z_ARRVAL_PP(str), &pos_str);
- } /*while*/
- } /* if */
diff --git a/lang/php5/files/patch-main_rfc1867.c b/lang/php5/files/patch-main_rfc1867.c
deleted file mode 100644
index 118008e25c88..000000000000
--- a/lang/php5/files/patch-main_rfc1867.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- main/rfc1867.c.orig 2011/06/12 15:03:18
-+++ main/rfc1867.c 2011/06/12 15:14:18
-@@ -1223,7 +1223,7 @@
- #endif
-
- if (!is_anonymous) {
-- if (s && s > filename) {
-+ if (s && s >= filename) {
- safe_php_register_variable(lbuf, s+1, strlen(s+1), NULL, 0 TSRMLS_CC);
- } else {
- safe_php_register_variable(lbuf, filename, strlen(filename), NULL, 0 TSRMLS_CC);
-@@ -1236,7 +1236,7 @@
- } else {
- snprintf(lbuf, llen, "%s[name]", param);
- }
-- if (s && s > filename) {
-+ if (s && s >= filename) {
- register_http_post_files_variable(lbuf, s+1, http_post_files, 0 TSRMLS_CC);
- } else {
- register_http_post_files_variable(lbuf, filename, http_post_files, 0 TSRMLS_CC);
diff --git a/lang/php5/pkg-plist b/lang/php5/pkg-plist
index bc6aa47e196e..0afa4ba28ce6 100644
--- a/lang/php5/pkg-plist
+++ b/lang/php5/pkg-plist
@@ -123,6 +123,7 @@ include/php/ext/standard/crc32.h
include/php/ext/standard/credits.h
include/php/ext/standard/credits_ext.h
include/php/ext/standard/credits_sapi.h
+include/php/ext/standard/crypt_blowfish.h
include/php/ext/standard/crypt_freesec.h
include/php/ext/standard/css.h
include/php/ext/standard/cyr_convert.h
diff --git a/lang/php53/Makefile b/lang/php53/Makefile
index a8aad4a3f7a1..69e833753109 100644
--- a/lang/php53/Makefile
+++ b/lang/php53/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME= php5
-PORTVERSION= 5.3.6
-PORTREVISION?= 1
+PORTVERSION= 5.3.7
+PORTREVISION?= 0
CATEGORIES?= lang devel www
MASTER_SITES= ${MASTER_SITE_PHP}
MASTER_SITE_SUBDIR= distributions
diff --git a/lang/php53/distinfo b/lang/php53/distinfo
index 4d76ea661f69..622bbb9a33b3 100644
--- a/lang/php53/distinfo
+++ b/lang/php53/distinfo
@@ -1,6 +1,6 @@
-SHA256 (php-5.3.6.tar.bz2) = 30ae880f22e3ee93eccc9b80e3c58b0d6364d139bb4366dcc27f2fab658d3198
-SIZE (php-5.3.6.tar.bz2) = 10952171
-SHA256 (suhosin-patch-5.3.6-0.9.10.patch.gz) = 48b8151ea441e49a43f3a751b0aa9cef7df7e055948b335d09168df031943f51
-SIZE (suhosin-patch-5.3.6-0.9.10.patch.gz) = 40024
-SHA256 (php-5.3.6-mail-header.patch) = 5cd43388b33fe5703c2c7d1de04d9b7030ee0a65d110c3793dfccb096ed2cc09
-SIZE (php-5.3.6-mail-header.patch) = 3346
+SHA256 (php-5.3.7.tar.bz2) = 58b490af6f919acfafb6e176957b88e3d814eabee68cc147b4d8d20697d88b96
+SIZE (php-5.3.7.tar.bz2) = 11144328
+SHA256 (suhosin-patch-5.3.7-0.9.10.patch.gz) = 48b8151ea441e49a43f3a751b0aa9cef7df7e055948b335d09168df031943f51
+SIZE (suhosin-patch-5.3.7-0.9.10.patch.gz) = 40024
+SHA256 (php-5.3.7-mail-header.patch) = 5cd43388b33fe5703c2c7d1de04d9b7030ee0a65d110c3793dfccb096ed2cc09
+SIZE (php-5.3.7-mail-header.patch) = 3346
diff --git a/lang/php53/files/patch-ext_standard_string.c b/lang/php53/files/patch-ext_standard_string.c
deleted file mode 100644
index 361cc6f16473..000000000000
--- a/lang/php53/files/patch-ext_standard_string.c
+++ /dev/null
@@ -1,159 +0,0 @@
---- ext/standard/string.c.orig 2011/04/13 03:32:19
-+++ ext/standard/string.c 2011/04/13 06:32:41
-@@ -2352,20 +2352,35 @@
-
- zend_hash_internal_pointer_reset_ex(Z_ARRVAL_PP(str), &pos_str);
- while (zend_hash_get_current_data_ex(Z_ARRVAL_PP(str), (void **) &tmp_str, &pos_str) == SUCCESS) {
-- convert_to_string_ex(tmp_str);
-+ zval *orig_str;
-+ zval dummy;
-+ if(Z_TYPE_PP(tmp_str) != IS_STRING) {
-+ dummy = **tmp_str;
-+ orig_str = &dummy;
-+ zval_copy_ctor(orig_str);
-+ convert_to_string(orig_str);
-+ } else {
-+ orig_str = *tmp_str;
-+ }
-
- if (Z_TYPE_PP(from) == IS_ARRAY) {
- if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_PP(from), (void **) &tmp_from, &pos_from)) {
-- convert_to_long_ex(tmp_from);
-+ if(Z_TYPE_PP(tmp_from) != IS_LONG) {
-+ zval dummy = **tmp_from;
-+ zval_copy_ctor(&dummy);
-+ convert_to_long(&dummy);
-+ f = Z_LVAL(dummy);
-+ } else {
-+ f = Z_LVAL_PP(tmp_from);
-+ }
-
-- f = Z_LVAL_PP(tmp_from);
- if (f < 0) {
-- f = Z_STRLEN_PP(tmp_str) + f;
-+ f = Z_STRLEN_P(orig_str) + f;
- if (f < 0) {
- f = 0;
- }
-- } else if (f > Z_STRLEN_PP(tmp_str)) {
-- f = Z_STRLEN_PP(tmp_str);
-+ } else if (f > Z_STRLEN_P(orig_str)) {
-+ f = Z_STRLEN_P(orig_str);
- }
- zend_hash_move_forward_ex(Z_ARRVAL_PP(from), &pos_from);
- } else {
-@@ -2374,72 +2389,94 @@
- } else {
- f = Z_LVAL_PP(from);
- if (f < 0) {
-- f = Z_STRLEN_PP(tmp_str) + f;
-+ f = Z_STRLEN_P(orig_str) + f;
- if (f < 0) {
- f = 0;
- }
-- } else if (f > Z_STRLEN_PP(tmp_str)) {
-- f = Z_STRLEN_PP(tmp_str);
-+ } else if (f > Z_STRLEN_P(orig_str)) {
-+ f = Z_STRLEN_P(orig_str);
- }
- }
-
- if (argc > 3 && Z_TYPE_PP(len) == IS_ARRAY) {
- if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_PP(len), (void **) &tmp_len, &pos_len)) {
-- convert_to_long_ex(tmp_len);
-+ if(Z_TYPE_PP(tmp_len) != IS_LONG) {
-+ zval dummy = **tmp_len;
-+ zval_copy_ctor(&dummy);
-+ convert_to_long(&dummy);
-+ l = Z_LVAL(dummy);
-+ } else {
-+ l = Z_LVAL_PP(tmp_len);
-+ }
-
- l = Z_LVAL_PP(tmp_len);
- zend_hash_move_forward_ex(Z_ARRVAL_PP(len), &pos_len);
- } else {
-- l = Z_STRLEN_PP(tmp_str);
-+ l = Z_STRLEN_P(orig_str);
- }
- } else if (argc > 3) {
- l = Z_LVAL_PP(len);
- } else {
-- l = Z_STRLEN_PP(tmp_str);
-+ l = Z_STRLEN_P(orig_str);
- }
-
- if (l < 0) {
-- l = (Z_STRLEN_PP(tmp_str) - f) + l;
-+ l = (Z_STRLEN_P(orig_str) - f) + l;
- if (l < 0) {
- l = 0;
- }
- }
-
-- if ((f + l) > Z_STRLEN_PP(tmp_str)) {
-- l = Z_STRLEN_PP(tmp_str) - f;
-+ if ((f + l) > Z_STRLEN_P(orig_str)) {
-+ l = Z_STRLEN_P(orig_str) - f;
- }
-
-- result_len = Z_STRLEN_PP(tmp_str) - l;
-+ result_len = Z_STRLEN_P(orig_str) - l;
-
- if (Z_TYPE_PP(repl) == IS_ARRAY) {
- if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_PP(repl), (void **) &tmp_repl, &pos_repl)) {
-- convert_to_string_ex(tmp_repl);
-- result_len += Z_STRLEN_PP(tmp_repl);
-+ zval *repl_str;
-+ zval zrepl;
-+ if(Z_TYPE_PP(tmp_repl) != IS_STRING) {
-+ zrepl = **tmp_repl;
-+ repl_str = &zrepl;
-+ zval_copy_ctor(repl_str);
-+ convert_to_string(repl_str);
-+ } else {
-+ repl_str = *tmp_repl;
-+ }
-+
-+ result_len += Z_STRLEN_P(repl_str);
- zend_hash_move_forward_ex(Z_ARRVAL_PP(repl), &pos_repl);
- result = emalloc(result_len + 1);
-
-- memcpy(result, Z_STRVAL_PP(tmp_str), f);
-- memcpy((result + f), Z_STRVAL_PP(tmp_repl), Z_STRLEN_PP(tmp_repl));
-- memcpy((result + f + Z_STRLEN_PP(tmp_repl)), Z_STRVAL_PP(tmp_str) + f + l, Z_STRLEN_PP(tmp_str) - f - l);
-+ memcpy(result, Z_STRVAL_P(orig_str), f);
-+ memcpy((result + f), Z_STRVAL_P(repl_str), Z_STRLEN_P(repl_str));
-+ memcpy((result + f + Z_STRLEN_P(repl_str)), Z_STRVAL_P(orig_str) + f + l, Z_STRLEN_P(orig_str) - f - l);
-+ if(Z_TYPE_PP(tmp_repl) != IS_STRING) {
-+ zval_dtor(repl_str);
-+ }
- } else {
- result = emalloc(result_len + 1);
-
-- memcpy(result, Z_STRVAL_PP(tmp_str), f);
-- memcpy((result + f), Z_STRVAL_PP(tmp_str) + f + l, Z_STRLEN_PP(tmp_str) - f - l);
-+ memcpy(result, Z_STRVAL_P(orig_str), f);
-+ memcpy((result + f), Z_STRVAL_P(orig_str) + f + l, Z_STRLEN_P(orig_str) - f - l);
- }
- } else {
- result_len += Z_STRLEN_PP(repl);
-
- result = emalloc(result_len + 1);
-
-- memcpy(result, Z_STRVAL_PP(tmp_str), f);
-+ memcpy(result, Z_STRVAL_P(orig_str), f);
- memcpy((result + f), Z_STRVAL_PP(repl), Z_STRLEN_PP(repl));
-- memcpy((result + f + Z_STRLEN_PP(repl)), Z_STRVAL_PP(tmp_str) + f + l, Z_STRLEN_PP(tmp_str) - f - l);
-+ memcpy((result + f + Z_STRLEN_PP(repl)), Z_STRVAL_P(orig_str) + f + l, Z_STRLEN_P(orig_str) - f - l);
- }
-
- result[result_len] = '\0';
- add_next_index_stringl(return_value, result, result_len, 0);
--
-+ if(Z_TYPE_PP(tmp_str) != IS_STRING) {
-+ zval_dtor(orig_str);
-+ }
- zend_hash_move_forward_ex(Z_ARRVAL_PP(str), &pos_str);
- } /*while*/
- } /* if */
diff --git a/lang/php53/files/patch-main_rfc1867.c b/lang/php53/files/patch-main_rfc1867.c
deleted file mode 100644
index 118008e25c88..000000000000
--- a/lang/php53/files/patch-main_rfc1867.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- main/rfc1867.c.orig 2011/06/12 15:03:18
-+++ main/rfc1867.c 2011/06/12 15:14:18
-@@ -1223,7 +1223,7 @@
- #endif
-
- if (!is_anonymous) {
-- if (s && s > filename) {
-+ if (s && s >= filename) {
- safe_php_register_variable(lbuf, s+1, strlen(s+1), NULL, 0 TSRMLS_CC);
- } else {
- safe_php_register_variable(lbuf, filename, strlen(filename), NULL, 0 TSRMLS_CC);
-@@ -1236,7 +1236,7 @@
- } else {
- snprintf(lbuf, llen, "%s[name]", param);
- }
-- if (s && s > filename) {
-+ if (s && s >= filename) {
- register_http_post_files_variable(lbuf, s+1, http_post_files, 0 TSRMLS_CC);
- } else {
- register_http_post_files_variable(lbuf, filename, http_post_files, 0 TSRMLS_CC);
diff --git a/lang/php53/pkg-plist b/lang/php53/pkg-plist
index bc6aa47e196e..0afa4ba28ce6 100644
--- a/lang/php53/pkg-plist
+++ b/lang/php53/pkg-plist
@@ -123,6 +123,7 @@ include/php/ext/standard/crc32.h
include/php/ext/standard/credits.h
include/php/ext/standard/credits_ext.h
include/php/ext/standard/credits_sapi.h
+include/php/ext/standard/crypt_blowfish.h
include/php/ext/standard/crypt_freesec.h
include/php/ext/standard/css.h
include/php/ext/standard/cyr_convert.h
diff --git a/net/php5-sockets/files/patch-sockets.c b/net/php5-sockets/files/patch-sockets.c
deleted file mode 100644
index 68e0a8e5fd6e..000000000000
--- a/net/php5-sockets/files/patch-sockets.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- sockets.c.orig 2011/05/23 23:51:28
-+++ sockets.c 2011/05/24 00:05:50
-@@ -1336,6 +1336,11 @@
- break;
-
- case AF_UNIX:
-+ if (addr_len >= sizeof(s_un.sun_path)) {
-+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Path too long", php_sock->type);
-+ RETURN_FALSE;
-+ }
-+
- memset(&s_un, 0, sizeof(struct sockaddr_un));
-
- s_un.sun_family = AF_UNIX;
generated by cgit (git 2.34.1) at 2024-12-29 21:51:05 +0800