env-documentroot.patch

   1 revert:
   2
   3 -  * [*cgi] Use physical base dir (alias, userdir) as DOCUMENT_ROOT in cgi environments (fixes #2216)
   4
   5 Index: src/mod_fastcgi.c
   6 ===================================================================
   7 --- src/mod_fastcgi.c   (revision 2794)
   8 +++ src/mod_fastcgi.c   (revision 2793)
   9 @@ -1968,7 +1968,7 @@
  10                         if (!buffer_is_empty(host->docroot)) {
  11                                 buffer_copy_string_buffer(p->path, host->docroot);
  12                         } else {
  13 -                               buffer_copy_string_buffer(p->path, con->physical.basedir);
  14 +                               buffer_copy_string_buffer(p->path, con->physical.doc_root);
  15                         }
  16                         buffer_append_string_buffer(p->path, con->request.pathinfo);
  17                         FCGI_ENV_ADD_CHECK(fcgi_env_add(p->fcgi_env, CONST_STR_LEN("PATH_TRANSLATED"), CONST_BUF_LEN(p->path)),con)
  18 @@ -2008,7 +2008,7 @@
  19                 }
  20
  21                 FCGI_ENV_ADD_CHECK(fcgi_env_add(p->fcgi_env, CONST_STR_LEN("SCRIPT_FILENAME"), CONST_BUF_LEN(p->path)),con)
  22 -               FCGI_ENV_ADD_CHECK(fcgi_env_add(p->fcgi_env, CONST_STR_LEN("DOCUMENT_ROOT"), CONST_BUF_LEN(con->physical.basedir)),con)
  23 +               FCGI_ENV_ADD_CHECK(fcgi_env_add(p->fcgi_env, CONST_STR_LEN("DOCUMENT_ROOT"), CONST_BUF_LEN(con->physical.doc_root)),con)
  24         }
  25
  26         if (host->strip_request_uri->used > 1) {
  27 @@ -3273,7 +3273,6 @@
  28                                  */
  29
  30                                 buffer_copy_string_buffer(con->physical.doc_root, host->docroot);
  31 -                               buffer_copy_string_buffer(con->physical.basedir, host->docroot);
  32
  33                                 buffer_copy_string_buffer(con->physical.path, host->docroot);
  34                                 buffer_append_string_buffer(con->physical.path, con->uri.path);
  35 Index: src/mod_scgi.c
  36 ===================================================================
  37 --- src/mod_scgi.c      (revision 2794)
  38 +++ src/mod_scgi.c      (revision 2793)
  39 @@ -1558,7 +1558,7 @@
  40                 if (!buffer_is_empty(host->docroot)) {
  41                         buffer_copy_string_buffer(p->path, host->docroot);
  42                 } else {
  43 -                       buffer_copy_string_buffer(p->path, con->physical.basedir);
  44 +                       buffer_copy_string_buffer(p->path, con->physical.doc_root);
  45                 }
  46                 buffer_append_string_buffer(p->path, con->request.pathinfo);
  47                 scgi_env_add(p->scgi_env, CONST_STR_LEN("PATH_TRANSLATED"), CONST_BUF_LEN(p->path));
  48 @@ -1589,7 +1589,7 @@
  49                 buffer_copy_string_buffer(p->path, con->physical.path);
  50
  51                 scgi_env_add(p->scgi_env, CONST_STR_LEN("SCRIPT_FILENAME"), CONST_BUF_LEN(p->path));
  52 -               scgi_env_add(p->scgi_env, CONST_STR_LEN("DOCUMENT_ROOT"), CONST_BUF_LEN(con->physical.basedir));
  53 +               scgi_env_add(p->scgi_env, CONST_STR_LEN("DOCUMENT_ROOT"), CONST_BUF_LEN(con->physical.doc_root));
  54         }
  55         scgi_env_add(p->scgi_env, CONST_STR_LEN("REQUEST_URI"), CONST_BUF_LEN(con->request.orig_uri));
  56         if (!buffer_is_equal(con->request.uri, con->request.orig_uri)) {
  57 Index: src/mod_cgi.c
  58 ===================================================================
  59 --- src/mod_cgi.c       (revision 2794)
  60 +++ src/mod_cgi.c       (revision 2793)
  61 @@ -928,7 +928,7 @@
  62                 cgi_env_add(&env, CONST_STR_LEN("CONTENT_LENGTH"), buf, strlen(buf));
  63                 cgi_env_add(&env, CONST_STR_LEN("SCRIPT_FILENAME"), CONST_BUF_LEN(con->physical.path));
  64                 cgi_env_add(&env, CONST_STR_LEN("SCRIPT_NAME"), CONST_BUF_LEN(con->uri.path));
  65 -               cgi_env_add(&env, CONST_STR_LEN("DOCUMENT_ROOT"), CONST_BUF_LEN(con->physical.basedir));
  66 +               cgi_env_add(&env, CONST_STR_LEN("DOCUMENT_ROOT"), CONST_BUF_LEN(con->physical.doc_root));
  67
  68                 /* for valgrind */
  69                 if (NULL != (s = getenv("LD_PRELOAD"))) {