[Pkg-php-commits] [php/debian-sid] Refreshed 034-apache2_umask_fix.patch

Ondřej Surý ondrej at sury.org
Fri Jan 8 13:50:24 UTC 2010


---
 debian/patches/034-apache2_umask_fix.patch |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/patches/034-apache2_umask_fix.patch b/debian/patches/034-apache2_umask_fix.patch
index ff4d479..7699585 100644
--- a/debian/patches/034-apache2_umask_fix.patch
+++ b/debian/patches/034-apache2_umask_fix.patch
@@ -1,9 +1,9 @@
 
 Save and restore umask across requests correctly.
 
---- php.orig/sapi/apache2handler/sapi_apache2.c
-+++ php/sapi/apache2handler/sapi_apache2.c
-@@ -432,6 +432,19 @@ static apr_status_t php_server_context_c
+--- a/sapi/apache2handler/sapi_apache2.c
++++ b/sapi/apache2handler/sapi_apache2.c
+@@ -437,6 +437,19 @@ static apr_status_t php_server_context_c
  	return APR_SUCCESS;
  }
  
@@ -23,7 +23,7 @@ Save and restore umask across requests correctly.
  static int php_apache_request_ctor(request_rec *r, php_struct *ctx TSRMLS_DC)
  {
  	char *content_length;
-@@ -623,6 +636,8 @@ zend_first_try {
+@@ -628,6 +641,8 @@ zend_first_try {
  	} else {
  		zend_file_handle zfd;
  
@@ -32,7 +32,7 @@ Save and restore umask across requests correctly.
  		zfd.type = ZEND_HANDLE_FILENAME;
  		zfd.filename = (char *) r->filename;
  		zfd.free_filename = 0;
-@@ -634,6 +649,9 @@ zend_first_try {
+@@ -639,6 +654,9 @@ zend_first_try {
  			zend_execute_scripts(ZEND_INCLUDE TSRMLS_CC, NULL, 1, &zfd);
  		}
  
-- 
1.6.3.3





More information about the Pkg-php-commits mailing list