vppinfra: fix format_clib_timebase_time

- make the format RFC9110 compliant

Type: fix

Change-Id: I4272562ca1082285a596ef866ab6c4f405c64bc5
Signed-off-by: Adrian Villin <[email protected]>

diff --git a/extras/hs-test/http_test.go b/extras/hs-test/http_test.go
index f8b0fb7..5e7494a 100644 (file)
--- a/extras/hs-test/http_test.go
+++ b/extras/hs-test/http_test.go
@@ -829,6 +829,7 @@ func HttpStaticBuildInUrlPostIfStatsTest(s *NoTopoSuite) {
 }
 
 func HttpStaticMacTimeTest(s *NoTopoSuite) {
+       currentDate := time.Now().In(time.FixedZone("GMT", 0)).Format(http.TimeFormat)
        vpp := s.GetContainerByName("vpp").VppInstance
        serverAddress := s.GetInterfaceByName(TapInterfaceName).Peer.Ip4AddressString()
        s.Log(vpp.Vppctl("http static server uri tcp://" + serverAddress + "/80 url-handlers debug"))
@@ -848,6 +849,7 @@ func HttpStaticMacTimeTest(s *NoTopoSuite) {
        s.AssertContains(string(data), s.GetInterfaceByName(TapInterfaceName).Ip4AddressString())
        s.AssertContains(string(data), s.GetInterfaceByName(TapInterfaceName).HwAddress.String())
        s.AssertContains(resp.Header.Get("Content-Type"), "json")
+       s.AssertContains(resp.Header.Get("Date"), currentDate)
 }
 
 func HttpInvalidRequestLineTest(s *NoTopoSuite) {

diff --git a/src/vppinfra/time_range.c b/src/vppinfra/time_range.c
index 4b5e130..54f5629 100644 (file)
--- a/src/vppinfra/time_range.c
+++ b/src/vppinfra/time_range.c
@@ -264,11 +264,10 @@ format_clib_timebase_time (u8 * s, va_list * args)
 
   clib_timebase_time_to_components (now, cp);
 
-  s = format (s, "%s, %u %s %u %u:%02u:%02u",
-             day_names_epoch_order[cp->day_name_index],
-             cp->day,
-             month_short_names[cp->month],
-             cp->year, cp->hour, cp->minute, cp->second);
+  s = format (s, "%s, %02u %s %u %02u:%02u:%02u",
+             day_names_epoch_order[cp->day_name_index], cp->day,
+             month_short_names[cp->month], cp->year, cp->hour, cp->minute,
+             cp->second);
   return (s);
 }