|
 |
1205ddb |
# ./pullrev.sh 1800306
|
|
|
1205ddb |
|
|
|
1205ddb |
http://svn.apache.org/viewvc?view=revision&revision=1800306
|
|
|
1205ddb |
|
|
|
1205ddb |
diff -uap httpd-2.4.26/modules/mappers/mod_actions.c.r1800306 httpd-2.4.26/modules/mappers/mod_actions.c
|
|
|
1205ddb |
--- httpd-2.4.26/modules/mappers/mod_actions.c.r1800306
|
|
|
1205ddb |
+++ httpd-2.4.26/modules/mappers/mod_actions.c
|
|
|
1205ddb |
@@ -186,8 +186,7 @@
|
|
|
1205ddb |
ap_field_noparam(r->pool, r->content_type);
|
|
|
1205ddb |
|
|
|
1205ddb |
if (action && (t = apr_table_get(conf->action_types, action))) {
|
|
|
1205ddb |
- int virtual = (*t++ == '0' ? 0 : 1);
|
|
|
1205ddb |
- if (!virtual && r->finfo.filetype == APR_NOFILE) {
|
|
|
1205ddb |
+ if (*t++ == '0' && r->finfo.filetype == APR_NOFILE) {
|
|
|
1205ddb |
ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(00652)
|
|
|
1205ddb |
"File does not exist: %s", r->filename);
|
|
|
1205ddb |
return HTTP_NOT_FOUND;
|
|
|
1205ddb |
@@ -198,9 +197,6 @@
|
|
|
1205ddb |
* (will be REDIRECT_HANDLER there)
|
|
|
1205ddb |
*/
|
|
|
1205ddb |
apr_table_setn(r->subprocess_env, "HANDLER", action);
|
|
|
1205ddb |
- if (virtual) {
|
|
|
1205ddb |
- apr_table_setn(r->notes, "virtual_script", "1");
|
|
|
1205ddb |
- }
|
|
|
1205ddb |
}
|
|
|
1205ddb |
|
|
|
1205ddb |
if (script == NULL)
|
|
|
1205ddb |
diff -uap httpd-2.4.26/modules/proxy/mod_proxy_fcgi.c.r1800306 httpd-2.4.26/modules/proxy/mod_proxy_fcgi.c
|
|
|
1205ddb |
--- httpd-2.4.26/modules/proxy/mod_proxy_fcgi.c.r1800306
|
|
|
1205ddb |
+++ httpd-2.4.26/modules/proxy/mod_proxy_fcgi.c
|
|
|
1205ddb |
@@ -321,7 +321,6 @@
|
|
|
1205ddb |
apr_status_t rv;
|
|
|
1205ddb |
apr_size_t avail_len, len, required_len;
|
|
|
1205ddb |
int next_elem, starting_elem;
|
|
|
1205ddb |
- int fpm = 0;
|
|
|
1205ddb |
fcgi_req_config_t *rconf = ap_get_module_config(r->request_config, &proxy_fcgi_module);
|
|
|
1205ddb |
fcgi_dirconf_t *dconf = ap_get_module_config(r->per_dir_config, &proxy_fcgi_module);
|
|
|
1205ddb |
|
|
|
1205ddb |
@@ -354,8 +353,6 @@
|
|
|
1205ddb |
*qs = '\0';
|
|
|
1205ddb |
}
|
|
|
1205ddb |
}
|
|
|
1205ddb |
- } else {
|
|
|
1205ddb |
- fpm = 1;
|
|
|
1205ddb |
}
|
|
|
1205ddb |
|
|
|
1205ddb |
if (newfname) {
|
|
|
1205ddb |
@@ -364,38 +361,9 @@
|
|
|
1205ddb |
}
|
|
|
1205ddb |
}
|
|
|
1205ddb |
|
|
|
1205ddb |
-#if 0
|
|
|
1205ddb |
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(09999)
|
|
|
1205ddb |
- "r->filename: %s", (r->filename ? r->filename : "nil"));
|
|
|
1205ddb |
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(09999)
|
|
|
1205ddb |
- "r->uri: %s", (r->uri ? r->uri : "nil"));
|
|
|
1205ddb |
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(09999)
|
|
|
1205ddb |
- "r->path_info: %s", (r->path_info ? r->path_info : "nil"));
|
|
|
1205ddb |
-#endif
|
|
|
1205ddb |
-
|
|
|
1205ddb |
ap_add_common_vars(r);
|
|
|
1205ddb |
ap_add_cgi_vars(r);
|
|
|
1205ddb |
|
|
|
1205ddb |
- if (fpm || apr_table_get(r->notes, "virtual_script")) {
|
|
|
1205ddb |
- /*
|
|
|
1205ddb |
- * Adjust SCRIPT_NAME, PATH_INFO and PATH_TRANSLATED for PHP-FPM
|
|
|
1205ddb |
- * TODO: Right now, PATH_INFO and PATH_TRANSLATED look OK...
|
|
|
1205ddb |
- */
|
|
|
1205ddb |
- const char *pend;
|
|
|
1205ddb |
- const char *script_name = apr_table_get(r->subprocess_env, "SCRIPT_NAME");
|
|
|
1205ddb |
- pend = script_name + strlen(script_name);
|
|
|
1205ddb |
- if (r->path_info && *r->path_info) {
|
|
|
1205ddb |
- pend = script_name + ap_find_path_info(script_name, r->path_info) - 1;
|
|
|
1205ddb |
- }
|
|
|
1205ddb |
- while (pend != script_name && *pend != '/') {
|
|
|
1205ddb |
- pend--;
|
|
|
1205ddb |
- }
|
|
|
1205ddb |
- apr_table_setn(r->subprocess_env, "SCRIPT_NAME", pend);
|
|
|
1205ddb |
- ap_log_rerror(APLOG_MARK, APLOG_TRACE4, 0, r,
|
|
|
1205ddb |
- "fpm:virtual_script: Modified SCRIPT_NAME to: %s",
|
|
|
1205ddb |
- pend);
|
|
|
1205ddb |
- }
|
|
|
1205ddb |
-
|
|
|
1205ddb |
/* XXX are there any FastCGI specific env vars we need to send? */
|
|
|
1205ddb |
|
|
|
1205ddb |
/* Give admins final option to fine-tune env vars */
|