diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2008-05-02 08:52:07 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2008-05-02 08:52:07 +0000 |
| commit | b23a136b2cac35c0bdf9af6c3fbde3c4f9cb08a4 (patch) | |
| tree | 902ea76bd05797b19fbfb43a1d69d80758396952 /lang/php5/files | |
| parent | Update to 0.16. (diff) | |
Update to 5.2.6 release.
Notes
Notes:
svn path=/head/; revision=212460
Diffstat (limited to 'lang/php5/files')
| -rw-r--r-- | lang/php5/files/patch-ext_standard_basic_functions.c | 31 | ||||
| -rw-r--r-- | lang/php5/files/patch-main_SAPI.c | 16 |
2 files changed, 27 insertions, 20 deletions
diff --git a/lang/php5/files/patch-ext_standard_basic_functions.c b/lang/php5/files/patch-ext_standard_basic_functions.c index ffb8970fdc80..44f865d2da3f 100644 --- a/lang/php5/files/patch-ext_standard_basic_functions.c +++ b/lang/php5/files/patch-ext_standard_basic_functions.c @@ -1,10 +1,33 @@ ---- ext/standard/basic_functions.c.orig Mon Jan 30 16:58:56 2006 -+++ ext/standard/basic_functions.c Mon Jan 30 16:59:13 2006 -@@ -78,6 +78,7 @@ - # include <sys/mman.h> +--- ext/standard/basic_functions.c.orig 2008-05-02 08:44:06.000000000 +0200 ++++ ext/standard/basic_functions.c 2008-05-02 08:54:00.000000000 +0200 +@@ -87,6 +87,7 @@ + # include <sys/loadavg.h> #endif +#define HARTMUT_0 #ifdef HARTMUT_0 #include <getopt.h> #endif +@@ -3861,9 +3862,7 @@ + SetEnvironmentVariable(pe->key, "bugbug"); + #endif + putenv(pe->previous_value); +-# if defined(PHP_WIN32) + efree(pe->previous_value); +-# endif + } else { + # if HAVE_UNSETENV + unsetenv(pe->key); +@@ -4463,12 +4462,8 @@ + pe.previous_value = NULL; + for (env = environ; env != NULL && *env != NULL; env++) { + if (!strncmp(*env, pe.key, pe.key_len) && (*env)[pe.key_len] == '=') { /* found it */ +-#if defined(PHP_WIN32) + /* must copy previous value because MSVCRT's putenv can free the string without notice */ + pe.previous_value = estrdup(*env); +-#else +- pe.previous_value = *env; +-#endif + break; + } + } diff --git a/lang/php5/files/patch-main_SAPI.c b/lang/php5/files/patch-main_SAPI.c index 1b445baf62a4..e257bfeb5bee 100644 --- a/lang/php5/files/patch-main_SAPI.c +++ b/lang/php5/files/patch-main_SAPI.c @@ -1,21 +1,5 @@ --- main/SAPI.c.orig 2007-05-25 11:20:01.000000000 +0200 +++ main/SAPI.c 2008-02-01 23:48:51.000000000 +0100 -@@ -301,6 +301,7 @@ - - /* SG(sapi_headers).http_response_code = 200; */ - SG(sapi_headers).http_status_line = NULL; -+ SG(sapi_headers).mimetype = NULL; - SG(read_post_bytes) = 0; - SG(request_info).post_data = NULL; - SG(request_info).raw_post_data = NULL; -@@ -340,6 +341,7 @@ - SG(sapi_headers).http_response_code = 200; - */ - SG(sapi_headers).http_status_line = NULL; -+ SG(sapi_headers).mimetype = NULL; - SG(headers_sent) = 0; - SG(read_post_bytes) = 0; - SG(request_info).post_data = NULL; @@ -604,7 +606,7 @@ ptr++; len--; |