Kristyna Streitova
de7dee913a
- access_compat shared also for 11sp3 - apache2-implicit-pointer-decl.patch renamed to httpd-implicit-pointer-decl.patch to align with other patches names - apachectl is now wrapper to start_apache2; therefore, it honors HTTPD_INSTANCE variable, see README-instances.txt for details + httpd-apachectl.patch - httpd-2.4.10-apachectl.patch - a2enmod/a2dismod and a2enflag/a2disflag now respect HTTPD_INSTANCE=<instance_name> environment variable, which can be used to specify apache instance name; sysconfig file is expected at /etc/sysconfig/apache2@<instance_name> (see README-instances.txt for details) - provides suse_maintenance_mmn symbol [bnc#915666] (internal) - credits to Roman Drahtmueller: * add reference to /etc/permissions.local to output of %post if setting the permissions of suexec2 fails * do not enable mod_php5 by default any longer * httpd-2.0.49-log_server_status.dif obsoleted * apache2-mod_ssl_npn.patch removed because not used * include mod_reqtimeout.conf in httpd.conf * added cgid-timeout.conf, include it in httpd.conf - fix default value APACHE_MODULES in sysconfig file - %service_* macros for apache2@.service OBS-URL: https://build.opensuse.org/request/show/316550 OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=453
35 lines
826 B
Diff
35 lines
826 B
Diff
--- httpd-2.4.6.orig/server/request.c
|
|
+++ httpd-2.4.6/server/request.c
|
|
@@ -46,10 +46,13 @@
|
|
#include "util_script.h"
|
|
#include "ap_expr.h"
|
|
#include "mod_request.h"
|
|
-
|
|
+#include "http_connection.h"
|
|
#include "mod_core.h"
|
|
#include "mod_auth.h"
|
|
|
|
+#include <unistd.h>
|
|
+#include <sys/types.h>
|
|
+
|
|
#if APR_HAVE_STDARG_H
|
|
#include <stdarg.h>
|
|
#endif
|
|
--- httpd-2.4.6.orig/server/config.c
|
|
+++ httpd-2.4.6/server/config.c
|
|
@@ -48,10 +48,14 @@
|
|
#include "http_request.h" /* for default_handler (see invoke_handler) */
|
|
#include "http_main.h"
|
|
#include "http_vhost.h"
|
|
+#include "http_connection.h"
|
|
#include "util_cfgtree.h"
|
|
#include "util_varbuf.h"
|
|
#include "mpm_common.h"
|
|
|
|
+#include <unistd.h>
|
|
+#include <sys/types.h>
|
|
+
|
|
#define APLOG_UNSET (APLOG_NO_MODULE - 1)
|
|
/* we know core's module_index is 0 */
|
|
#undef APLOG_MODULE_INDEX
|