Hello community,
here is the log from the commit of package php5 for openSUSE:Factory checked in
at 2013-08-05 20:50:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/php5 (Old)
and /work/SRC/openSUSE:Factory/.php5.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "php5"
Changes:
--------
--- /work/SRC/openSUSE:Factory/php5/php5.changes 2013-08-01
17:33:44.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.php5.new/php5.changes 2013-08-05
20:50:45.000000000 +0200
@@ -1,0 +2,8 @@
+Thu Aug 1 21:28:15 UTC 2013 - crrodrig...@opensuse.org
+
+- php5-per-mod-log.patch: It turns out that requesting per-module
+ logging support in 2.4 will not do a thing if the expansion
+ of APLOG_USE_MODULE is not visible to all files of the module
+ so place it in the header instead.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ php5-per-mod-log.patch ++++++
--- /var/tmp/diff_new_pack.CPBEx9/_old 2013-08-05 20:50:46.000000000 +0200
+++ /var/tmp/diff_new_pack.CPBEx9/_new 2013-08-05 20:50:46.000000000 +0200
@@ -4,32 +4,17 @@
Fix per-module logging in apache 2.4
-diff --git a/sapi/apache2filter/sapi_apache2.c
b/sapi/apache2filter/sapi_apache2.c
-index 0b51cfb..a8fec5c 100644
---- a/sapi/apache2filter/sapi_apache2.c
-+++ b/sapi/apache2filter/sapi_apache2.c
-@@ -744,6 +744,9 @@ static size_t php_apache_fsizer_stream(void *handle
TSRMLS_DC)
- return 0;
- }
-
-+#ifdef APLOG_USE_MODULE
-+APLOG_USE_MODULE(php5);
-+#endif
- AP_MODULE_DECLARE_DATA module php5_module = {
- STANDARD20_MODULE_STUFF,
- create_php_config, /* create per-directory config
structure */
-diff --git a/sapi/apache2handler/mod_php5.c b/sapi/apache2handler/mod_php5.c
-index 9df4f25..35d5548 100644
---- a/sapi/apache2handler/mod_php5.c
-+++ b/sapi/apache2handler/mod_php5.c
-@@ -25,6 +25,10 @@
- #include "php.h"
- #include "php_apache.h"
+--- php-5.4.17.orig/sapi/apache2handler/php_apache.h
++++ php-5.4.17/sapi/apache2handler/php_apache.h
+@@ -24,7 +24,11 @@
+ #include "httpd.h"
+ #include "http_config.h"
+ #include "http_core.h"
++#include "http_log.h"
+#ifdef APLOG_USE_MODULE
+APLOG_USE_MODULE(php5);
+#endif
-+
- AP_MODULE_DECLARE_DATA module php5_module = {
- STANDARD20_MODULE_STUFF,
- create_php_config, /* create per-directory config
structure */
+ /* Declare this so we can get to it from outside the sapi_apache2.c file */
+ extern module AP_MODULE_DECLARE_DATA php5_module;
+
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
