revert parts of last commit - stupid me!

diff --git a/build/rules_common.mk b/build/rules_common.mk
index 9072a71ed09206ff9596aeeeb0904e20f6c2027a..bab3a16343fc6e0c621c28fd1f0fcafa1b5f3cdf 100644 (file)
--- a/build/rules_common.mk
+++ b/build/rules_common.mk
@@ -23,10 +23,10 @@ COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS)
 COMPILE      = $(CC)  $(COMMON_FLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
 CXX_COMPILE  = $(CXX) $(COMMON_FLAGS) $(CXXFLAGS) $(EXTRA_CXXFLAGS)
 
-SHARED_COMPILE = $(SHARED_LIBTOOL) --silent --mode=compile $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) -prefer-pic $(EXTRA_CFLAGS) -c $< && touch $@
-CXX_SHARED_COMPILE = $(SHARED_LIBTOOL) --silent --mode=compile $(CXX) $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) -prefer-pic $(EXTRA_CXXFLAGS) -c $< && touch $@
+SHARED_COMPILE = $(SHARED_LIBTOOL) --mode=compile $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) -prefer-pic $(EXTRA_CFLAGS) -c $< && touch $@
+CXX_SHARED_COMPILE = $(SHARED_LIBTOOL) --mode=compile $(CXX) $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) -prefer-pic $(EXTRA_CXXFLAGS) -c $< && touch $@
 
-LINK = $(LIBTOOL) --silent --mode=link $(COMPILE) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --mode=link $(COMPILE) $(LDFLAGS) -o $@
 
 mkinstalldirs = $(top_srcdir)/build/shtool mkdir -p
 INSTALL = $(top_srcdir)/build/shtool install -c
@@ -42,36 +42,28 @@ CXX_SUFFIX = .cpp
 .SUFFIXES: .slo .c $(CXX_SUFFIX) .lo .o .s .y .l
 
 .c.o:
-       @echo Compiling $<
-       @$(COMPILE) -c $<
+       $(COMPILE) -c $<
 
 $(CXX_SUFFIX).o:
-       @echo Compiling $<
-       @$(CXX_COMPILE) -c $<
+       $(CXX_COMPILE) -c $<
 
 .s.o:
-       @echo Compiling $<
-       @$(COMPILE) -c $<
+       $(COMPILE) -c $<
 
 .c.lo:
-       @echo Compiling $<
-       @$(PHP_COMPILE)
+       $(PHP_COMPILE)
 
 $(CXX_SUFFIX).lo:
-       @echo Compiling $<
-       @$(CXX_PHP_COMPILE)
+       $(CXX_PHP_COMPILE)
 
 .s.lo:
-       @echo Compiling $<
-       @$(PHP_COMPILE)
+       $(PHP_COMPILE)
 
 .c.slo:
-       @echo Compiling $<
-       @$(SHARED_COMPILE)
+       $(SHARED_COMPILE)
 
 $(CXX_SUFFIX).slo:
-       @echo Compiling $<
-       @$(CXX_SHARED_COMPILE)
+       $(CXX_SHARED_COMPILE)
 
 .y.c:
        $(YACC) $(YFLAGS) $< && mv y.tab.c $*.c

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 85215a2ec80ff7d00980fb181f8d971d764f1304..dc1cfe9191270cd0316d65ae40a5f26b408324b7 100644 (file)
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -749,7 +749,6 @@ any .htaccess restrictions anywhere on your site you can leave doc_root undefine
        }
 
        php_request_shutdown((void *) 0);
-
        php_module_shutdown();
 
        STR_FREE(SG(request_info).path_translated);
@@ -760,6 +759,7 @@ any .htaccess restrictions anywhere on your site you can leave doc_root undefine
 #ifdef ZTS
        tsrm_shutdown();
 #endif
+
        return exit_status;
 }