- PLD merge

[packages/lighttpd.git] / env-documentroot.patch

diff --git a/env-documentroot.patch b/env-documentroot.patch
index eea738e248916ea92c21df69e2cf8a0b35d3eebd..e225dc3e26e9f18548cc64f060151c43434d2279 100644 (file)
--- a/env-documentroot.patch
+++ b/env-documentroot.patch
@@ -2,16 +2,14 @@ revert:
 
 -  * [*cgi] Use physical base dir (alias, userdir) as DOCUMENT_ROOT in cgi environments (fixes #2216)
  
-Index: src/mod_fastcgi.c
-===================================================================
---- src/mod_fastcgi.c  (revision 2794)
-+++ src/mod_fastcgi.c  (revision 2793)
-@@ -1968,7 +1968,7 @@
-                       if (!buffer_is_empty(host->docroot)) {
-                               buffer_copy_string_buffer(p->path, host->docroot);
+--- lighttpd-1.4.36/src/mod_fastcgi.c~ 2015-07-26 18:30:29.000000000 +0300
++++ lighttpd-1.4.36/src/mod_fastcgi.c  2015-07-26 18:31:50.285226477 +0300
+@@ -1918,7 +1918,7 @@
+                       if (!buffer_string_is_empty(host->docroot)) {
+                               buffer_copy_buffer(p->path, host->docroot);
                        } else {
--                              buffer_copy_string_buffer(p->path, con->physical.basedir);
-+                              buffer_copy_string_buffer(p->path, con->physical.doc_root);
+-                              buffer_copy_buffer(p->path, con->physical.basedir);
++                              buffer_copy_buffer(p->path, con->physical.doc_root);
                        }
                        buffer_append_string_buffer(p->path, con->request.pathinfo);
                        FCGI_ENV_ADD_CHECK(fcgi_env_add(p->fcgi_env, CONST_STR_LEN("PATH_TRANSLATED"), CONST_BUF_LEN(p->path)),con)
@@ -24,24 +22,22 @@ Index: src/mod_fastcgi.c
        }
  
        if (host->strip_request_uri->used > 1) {
-@@ -3273,7 +3273,6 @@
+@@ -3108,7 +3108,6 @@
                                 */
  
-                               buffer_copy_string_buffer(con->physical.doc_root, host->docroot);
--                              buffer_copy_string_buffer(con->physical.basedir, host->docroot);
+                               buffer_copy_buffer(con->physical.doc_root, host->docroot);
+-                              buffer_copy_buffer(con->physical.basedir, host->docroot);
  
-                               buffer_copy_string_buffer(con->physical.path, host->docroot);
+                               buffer_copy_buffer(con->physical.path, host->docroot);
                                buffer_append_string_buffer(con->physical.path, con->uri.path);
-Index: src/mod_scgi.c
-===================================================================
---- src/mod_scgi.c     (revision 2794)
-+++ src/mod_scgi.c     (revision 2793)
-@@ -1558,7 +1558,7 @@
-               if (!buffer_is_empty(host->docroot)) {
-                       buffer_copy_string_buffer(p->path, host->docroot);
+--- lighttpd-1.4.36/src/mod_scgi.c~    2015-07-26 18:30:29.000000000 +0300
++++ lighttpd-1.4.36/src/mod_scgi.c     2015-07-26 18:33:12.406160926 +0300
+@@ -1547,7 +1547,7 @@
+               if (!buffer_string_is_empty(host->docroot)) {
+                       buffer_copy_buffer(p->path, host->docroot);
                } else {
--                      buffer_copy_string_buffer(p->path, con->physical.basedir);
-+                      buffer_copy_string_buffer(p->path, con->physical.doc_root);
+-                      buffer_copy_buffer(p->path, con->physical.basedir);
++                      buffer_copy_buffer(p->path, con->physical.doc_root);
                }
                buffer_append_string_buffer(p->path, con->request.pathinfo);
                scgi_env_add(p->scgi_env, CONST_STR_LEN("PATH_TRANSLATED"), CONST_BUF_LEN(p->path));
@@ -56,8 +52,8 @@ Index: src/mod_scgi.c
        if (!buffer_is_equal(con->request.uri, con->request.orig_uri)) {
 Index: src/mod_cgi.c
 ===================================================================
---- src/mod_cgi.c      (revision 2794)
-+++ src/mod_cgi.c      (revision 2793)
+--- ./src/mod_cgi.c    (revision 2794)
++++ ./src/mod_cgi.c    (revision 2793)
 @@ -928,7 +928,7 @@
                cgi_env_add(&env, CONST_STR_LEN("CONTENT_LENGTH"), buf, strlen(buf));
                cgi_env_add(&env, CONST_STR_LEN("SCRIPT_FILENAME"), CONST_BUF_LEN(con->physical.path));