Merge branch 'busybox' into merge

Conflicts:
	debianutils/which.c
	editors/vi.c
	libbb/executable.c

1 files changed, 3 insertions, 2 deletions

diff --git a/networking/wget.c b/networking/wget.c
index f13ca1c74..774accf7a 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -650,7 +650,7 @@ static void NOINLINE retrieve_file_data(FILE *dfp)
 #if ENABLE_FEATURE_WGET_TIMEOUT
                                 second_cnt = G.timeout_seconds;
 #endif
-                                continue;
+                                goto bump;
                         }
 
                         /* n <= 0.
@@ -683,11 +683,12 @@ static void NOINLINE retrieve_file_data(FILE *dfp)
                                  * to try reading anyway.
                                  */
                         }
+#endif
+ bump:
                         /* Need to do it _every_ second for "stalled" indicator
                          * to be shown properly.
                          */
                         progress_meter(PROGRESS_BUMP);
-#endif
                 } /* while (reading data) */
 
 #if ENABLE_FEATURE_WGET_STATUSBAR || ENABLE_FEATURE_WGET_TIMEOUT