diff options
| author | Ondřej Surý <ondrej@sury.org> | 2015-02-20 10:08:10 +0100 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2015-02-20 10:08:10 +0100 |
| commit | 560df718bd3aaa57cf6717d6d11545f5c94abeeb (patch) | |
| tree | 0dcc2686cd9e169ce9d4880559c82ebac49c8f32 | |
| parent | a57d8616e445fced92a44241e4e4971f2b3119b2 (diff) | |
| download | php-560df718bd3aaa57cf6717d6d11545f5c94abeeb.tar.gz | |
Update patches for 5.6.6 release
| -rw-r--r-- | debian/patches/php-fpm-getallheaders.patch | 2 | ||||
| -rw-r--r-- | debian/patches/php-fpm-sysconfdir.patch | 2 | ||||
| -rw-r--r-- | debian/patches/revert-f07b8f36ae8099e29d19fbe8806bc07b21dcd4ac.patch | 14 |
3 files changed, 9 insertions, 9 deletions
diff --git a/debian/patches/php-fpm-getallheaders.patch b/debian/patches/php-fpm-getallheaders.patch index 7e6a69897..6e30b560e 100644 --- a/debian/patches/php-fpm-getallheaders.patch +++ b/debian/patches/php-fpm-getallheaders.patch @@ -18,7 +18,7 @@ Subject: [PATCH 1/2] getallheaders for php-fpm #62596 #ifndef PHP_WIN32 /* these globals used for forking children on unix systems */ -@@ -1546,8 +1548,89 @@ PHP_FUNCTION(fastcgi_finish_request) /* +@@ -1550,8 +1552,89 @@ PHP_FUNCTION(fastcgi_finish_request) /* } /* }}} */ diff --git a/debian/patches/php-fpm-sysconfdir.patch b/debian/patches/php-fpm-sysconfdir.patch index 3efd60cce..387476f16 100644 --- a/debian/patches/php-fpm-sysconfdir.patch +++ b/debian/patches/php-fpm-sysconfdir.patch @@ -1,6 +1,6 @@ --- php5.orig/sapi/fpm/fpm/fpm_conf.c +++ php5/sapi/fpm/fpm/fpm_conf.c -@@ -1659,7 +1659,7 @@ int fpm_conf_init_main(int test_conf, in +@@ -1661,7 +1661,7 @@ int fpm_conf_init_main(int test_conf, in char *tmp; if (fpm_globals.prefix == NULL) { diff --git a/debian/patches/revert-f07b8f36ae8099e29d19fbe8806bc07b21dcd4ac.patch b/debian/patches/revert-f07b8f36ae8099e29d19fbe8806bc07b21dcd4ac.patch index 31d03c743..1bb6590ef 100644 --- a/debian/patches/revert-f07b8f36ae8099e29d19fbe8806bc07b21dcd4ac.patch +++ b/debian/patches/revert-f07b8f36ae8099e29d19fbe8806bc07b21dcd4ac.patch @@ -1,5 +1,5 @@ reverted: ---- a/ext/standard/tests/file/bug68532.phpt +--- php5.orig/ext/standard/tests/file/bug68532.phpt +++ /dev/null @@ -1,25 +0,0 @@ ---TEST-- @@ -27,9 +27,9 @@ reverted: ---EXPECT-- -memoryStream = dGVzdA== -fileStream = dGVzdA== ---- a/ext/standard/tests/file/stream_rfc2397_007.phpt -+++ b/ext/standard/tests/file/stream_rfc2397_007.phpt -@@ -95,7 +95,6 @@ +--- php5.orig/ext/standard/tests/file/stream_rfc2397_007.phpt ++++ php5/ext/standard/tests/file/stream_rfc2397_007.phpt +@@ -95,7 +95,6 @@ int(5) bool(false) ===GETC=== string(1) "5" @@ -37,9 +37,9 @@ reverted: int(6) bool(true) ===REWIND=== ---- a/main/streams/memory.c -+++ b/main/streams/memory.c -@@ -87,19 +87,15 @@ +--- php5.orig/main/streams/memory.c ++++ php5/main/streams/memory.c +@@ -86,19 +86,15 @@ static size_t php_stream_memory_read(php php_stream_memory_data *ms = (php_stream_memory_data*)stream->abstract; assert(ms != NULL); |