[trafficserver] branch master updated: Remove more deadcode (#7098)

2020-08-10 Thread rrm 
This is an automated email from the ASF dual-hosted git repository.

rrm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/master by this push:
 new f75eaf8  Remove more deadcode (#7098)
f75eaf8 is described below

commit f75eaf83607ea1b1c8f48ad0528e303b291b3269
Author: Randall Meyer 
AuthorDate: Mon Aug 10 19:03:34 2020 -0700

Remove more deadcode (#7098)

and removes references to old config files
---
 doc/admin-guide/plugins/access_control.en.rst  |  2 +-
 .../testing/blackbox-testing.en.rst|  2 +-
 iocore/dns/P_SplitDNSProcessor.h   |  7 ---
 iocore/dns/SplitDNS.cc |  1 -
 iocore/net/Socks.cc|  1 -
 mgmt/ProxyConfig.cc| 61 --
 mgmt/ProxyConfig.h |  6 ---
 proxy/ControlMatcher.cc| 30 ++-
 proxy/ControlMatcher.h | 14 +
 proxy/ParentSelection.h|  3 --
 tests/README.md|  4 +-
 11 files changed, 8 insertions(+), 123 deletions(-)

diff --git a/doc/admin-guide/plugins/access_control.en.rst 
b/doc/admin-guide/plugins/access_control.en.rst
index 6a001c6..d06d5ef 100644
--- a/doc/admin-guide/plugins/access_control.en.rst
+++ b/doc/admin-guide/plugins/access_control.en.rst
@@ -446,7 +446,7 @@ Now let us send the same request again and since the object 
is in cache we get `
   x-cache: hit-fresh
 
 
-The previous activity should result in the following log (as defined in 
``logging.config``)
+The previous activity should result in the following log (as defined in 
``logging.yaml``)
 
 .. code-block:: bash
 
diff --git a/doc/developer-guide/testing/blackbox-testing.en.rst 
b/doc/developer-guide/testing/blackbox-testing.en.rst
index f5238ef..b42744f 100644
--- a/doc/developer-guide/testing/blackbox-testing.en.rst
+++ b/doc/developer-guide/testing/blackbox-testing.en.rst
@@ -115,13 +115,13 @@ A number of file objects are also defined to help test 
TrafficServer. Files that
 - diags.log
 - records.config
 - cache.config
-- congestion.config
 - hosting.config
 - ip_allow.yaml
 - logging.yaml
 - parent.config
 - plugin.config
 - remap.config
+- sni.yaml
 - socks.config
 - splitdns.config
 - ssl_multicert.config
diff --git a/iocore/dns/P_SplitDNSProcessor.h b/iocore/dns/P_SplitDNSProcessor.h
index e8ab998..ef20b0e 100644
--- a/iocore/dns/P_SplitDNSProcessor.h
+++ b/iocore/dns/P_SplitDNSProcessor.h
@@ -65,16 +65,9 @@ struct SplitDNSResult {
   */
   DNSResultType r = DNS_SRVR_UNDEFINED;
 
-  DNSServer *get_dns_record();
-  int get_dns_srvr_count();
-
-  /* 
- private
-  */
   int m_line_number = 0;
 
   SplitDNSRecord *m_rec = nullptr;
-  bool m_wrap_around= false;
 };
 
 /* --
diff --git a/iocore/dns/SplitDNS.cc b/iocore/dns/SplitDNS.cc
index 8af72da..cf6a9b9 100644
--- a/iocore/dns/SplitDNS.cc
+++ b/iocore/dns/SplitDNS.cc
@@ -218,7 +218,6 @@ SplitDNS::findServer(RequestData *rdata, SplitDNSResult 
*result)
 
   result->m_rec = nullptr;
   result->m_line_number = 0x;
-  result->m_wrap_around = false;
 
   /* ---
  the 'alleged' fast path ...
diff --git a/iocore/net/Socks.cc b/iocore/net/Socks.cc
index 24964aa..dbc2a02 100644
--- a/iocore/net/Socks.cc
+++ b/iocore/net/Socks.cc
@@ -514,7 +514,6 @@ loadSocksConfiguration(socks_conf_struct *socks_conf_stuff)
   }
 #ifdef SOCKS_WITH_TS
   tmp = Load_IpMap_From_File(_conf_stuff->ip_map, socks_config_fd, 
"no_socks");
-  //  tmp = socks_conf_stuff->ip_range.read_table_from_file(socks_config_fd, 
"no_socks");
 
   if (tmp) {
 Error("SOCKS Config: Error while reading ip_range: %s.", tmp);
diff --git a/mgmt/ProxyConfig.cc b/mgmt/ProxyConfig.cc
index e18fc64..d30d065 100644
--- a/mgmt/ProxyConfig.cc
+++ b/mgmt/ProxyConfig.cc
@@ -29,67 +29,6 @@
 
 ConfigProcessor configProcessor;
 
-void *
-config_int_cb(void *data, void *value)
-{
-  *static_cast(data) = *static_cast(value);
-  return nullptr;
-}
-
-void *
-config_float_cb(void *data, void *value)
-{
-  *static_cast(data) = *static_cast(value);
-  return nullptr;
-}
-
-void *
-config_long_long_cb(void *data, void *value)
-{
-  *static_cast(data) = *static_cast(value);
-  return nullptr;
-}
-
-/
-//
-//  config_string_alloc_cb()
-//
-//  configuration callback function. The function is called
-//  by the manager when a string configuration variable
-//  changed. It allocates new memory for the new data.
-//  the old variable is scheduled to be freed using
-//  ConfigFreerContinuation which will free the memory
-//  used for this variable after long time, assuming that
-//  during all this time

[trafficserver-ingress-controller] branch master updated: Create ingress log directory (#41)

2020-08-10 Thread kichan 
This is an automated email from the ASF dual-hosted git repository.

kichan pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git


The following commit(s) were added to refs/heads/master by this push:
 new 5c1ff59  Create ingress log directory (#41)
5c1ff59 is described below

commit 5c1ff59e641902185adff83fefd5954abe9a4490
Author: Kit Chan 
AuthorDate: Mon Aug 10 17:37:45 2020 -0700

Create ingress log directory (#41)
---
 Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index c3aea7b..4df1a4d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -137,6 +137,8 @@ RUN mkdir -p /var/run/redis/ \
 # symlink for luajit
 RUN ln -sf /usr/lib/libluajit-5.1.so.2.1.0 /usr/lib/libluajit-5.1.so
 
+# set up ingress log location
+RUN mkdir -p /usr/local/var/log/ingress/
 COPY ["./logrotate.ingress", "/etc/logrotate.d/ingress"]
 
 ENTRYPOINT ["/usr/local/bin/entry.sh"]

[trafficserver-ingress-controller] branch master updated: Integrate fluentd (#40)

2020-08-10 Thread kichan 
This is an automated email from the ASF dual-hosted git repository.

kichan pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git


The following commit(s) were added to refs/heads/master by this push:
 new ca13bf0  Integrate fluentd (#40)
ca13bf0 is described below

commit ca13bf07a8fa50c6ad846fa9325147f39121fb32
Author: Rishabh Chhabra 
AuthorDate: Mon Aug 10 16:56:22 2020 -0500

Integrate fluentd (#40)

* Adds support for ingress logs in fluentd

* Modifies helm to add fluentd support
---
 charts/ats-ingress/templates/deployment.yaml| 16 +++-
 charts/ats-ingress/templates/fluentd-configmap.yaml | 17 ++---
 charts/ats-ingress/values.yaml  | 15 +++
 entry.sh|  4 ++--
 k8s/configmaps/fluentd-configmap.yaml   | 15 +--
 k8s/traffic-server/ats-deployment.yaml  | 17 +++--
 logrotate.ingress   |  2 +-
 7 files changed, 63 insertions(+), 23 deletions(-)

diff --git a/charts/ats-ingress/templates/deployment.yaml 
b/charts/ats-ingress/templates/deployment.yaml
index a95d692..a8bd0d2 100644
--- a/charts/ats-ingress/templates/deployment.yaml
+++ b/charts/ats-ingress/templates/deployment.yaml
@@ -43,8 +43,10 @@ spec:
 - mountPath: {{ .Values.ats.ssl.path | quote }} 
   name: {{ .Values.ats.ssl.name }}
   readOnly: true
-- name: varlog
-  mountPath: {{ .Values.ats.log.dir }}
+- name: log-trafficserver
+  mountPath: {{ .Values.ats.log.trafficserver.dir }}
+- name: log-ingress
+  mountPath: {{ .Values.ats.log.ingress.dir }}
   env:
 - name: POD_NAME
   valueFrom:
@@ -68,8 +70,10 @@ spec:
 - name: {{ .Values.collector.name }}
   image: {{ .Values.collector.image.repository }}:{{ 
.Values.collector.image.tag }}
   volumeMounts:
-  - name: varlog
-mountPath: {{ .Values.collector.path | quote }}
+  - name: log-ingress
+mountPath: {{ .Values.collector.path.ingress | quote }}
+  - name: log-trafficserver
+mountPath: {{ .Values.collector.path.trafficserver | quote }}
   - name: config-volume
 mountPath: {{ .Values.collector.fluentdConfigPath | quote }}
 - name: {{ .Values.ats.exporter.name }}
@@ -81,7 +85,9 @@ spec:
 - name: {{ .Values.ats.ssl.name }}
   secret:
 secretName: {{ .Values.ats.ssl.secret }}
-- name: varlog
+- name: log-trafficserver
+  emptyDir: {}
+- name: log-ingress
   emptyDir: {}
 - name: config-volume
   configMap:
diff --git a/charts/ats-ingress/templates/fluentd-configmap.yaml 
b/charts/ats-ingress/templates/fluentd-configmap.yaml
index ff52bca..4f73722 100644
--- a/charts/ats-ingress/templates/fluentd-configmap.yaml
+++ b/charts/ats-ingress/templates/fluentd-configmap.yaml
@@ -26,15 +26,26 @@ data:
   fluent.conf: |
 
   type tail
-  path {{ .Values.collector.path }}/squid.log
-  pos_file {{ .Values.collector.path }}/squid.log.pos
+  path {{ .Values.collector.path.trafficserver }}/squid.log
+  pos_file {{ .Values.collector.path.trafficserver }}/squid.log.pos
   
 @type regexp
-expression {{ .Values.collector.parse.defaultRegex }}
+expression {{ .Values.collector.parse.ats.defaultRegex }}
   
   tag trafficserver.access
 
 
+
+  type tail
+  path {{ .Values.collector.path.ingress }}/ingress_ats.err
+  pos_file {{ .Values.collector.path.ingress }}/ingress_ats.err.pos
+  
+@type regexp
+expression {{ .Values.collector.parse.ingress.defaultRegex }}
+  
+  tag ingress.log
+
+
 
   @type stdout
 
diff --git a/charts/ats-ingress/values.yaml b/charts/ats-ingress/values.yaml
index 703e371..7ec4fff 100644
--- a/charts/ats-ingress/values.yaml
+++ b/charts/ats-ingress/values.yaml
@@ -95,7 +95,10 @@ ats:
 name: ats-ssl
 secret: tls-secret
   log:
-dir: /usr/local/var/log/trafficserver
+trafficserver:
+  dir: /usr/local/var/log/trafficserver
+ingress:
+  dir: /usr/local/var/log/ingress
   exporter:
 name: trafficserver-exporter
 image:
@@ -108,14 +111,18 @@ ats:
 
 collector:
   name: log-collector
-  path: "/var/log"
+  path: 
+trafficserver: "/var/log/trafficserver"
+ingress: "/var/log/ingress"
   fluentdConfigPath: "/fluentd/etc"
   image:
 repository: fluent/fluentd
 tag: v1.6-debian-1
   parse:
-defaultRegex: ^(?[^ ]*)\s(?[^ 
]*)\s(?[^ ]*)\s(?[^ ]*)\s(?[^ 
]*)\s(?[^ ]*)\s(?[^ 
]*)\s(?[^ ]*)\s(?[^ 
]*)\s(?[^ ]*)$
-
+ats:
+  defaultRegex: ^(?[^ ]*)\s(?[^ 
]*)\s(?[^ ]*)\s(?[^ ]*)\s(?[^ 
]*)\s(?[^ ]*)\s(?[^ 
]*)\s(?[^ ]*)\s(?[^

[trafficserver-ingress-controller] branch master updated: Resolves conflicting configmaps (#39)

2020-08-10 Thread kichan 
This is an automated email from the ASF dual-hosted git repository.

kichan pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git


The following commit(s) were added to refs/heads/master by this push:
 new 8ee930f  Resolves conflicting configmaps (#39)
8ee930f is described below

commit 8ee930fbca41ecebb588895d056b58e7d056b04a
Author: Rishabh Chhabra 
AuthorDate: Mon Aug 10 16:31:04 2020 -0500

Resolves conflicting configmaps (#39)

* Resolves conflicting configmaps

* Removes extraneous file

* Modifies readme to add annotation instructions
---
 README.md   |  4 +-
 charts/ats-ingress/templates/ats-configmap.yaml |  1 +
 k8s/configmaps/ats-configmap.yaml   |  2 +
 watcher/handlerConfigmap.go | 10 +
 watcher/handlerConfigmap_test.go| 20 ++
 watcher/watcher_test.go | 49 +
 6 files changed, 84 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index a680c73..e1a8ae7 100644
--- a/README.md
+++ b/README.md
@@ -134,8 +134,8 @@ When both steps _above_ have executed at least once, ATS 
proxying will have star
 
 Below is an example of configuring Apache Traffic Server [_reloadable_ 
configurations](https://docs.trafficserver.apache.org/en/8.0.x/admin-guide/files/records.config.en.html#reloadable)
 using [kubernetes 
configmap](https://kubernetes.io/docs/tasks/configure-pod-container/configure-pod-configmap/)
 resource:
 
-- `$ kubectl apply -f k8s/configmaps/`
-  - create a ConfigMap resource in `trafficserver-test` if not already exist
+- `$ kubectl apply -f k8s/configmaps/ats-configmap.yaml`
+  - create a ConfigMap resource in `trafficserver-test` with the annotation 
`"ats-configmap":"true"` if not already exist
   - configure 3 _reloadable_ ATS configurations:
 1. `proxy.config.output.logfile.rolling_enabled: "1"`
 2. `proxy.config.output.logfile.rolling_interval_sec: "3000"`
diff --git a/charts/ats-ingress/templates/ats-configmap.yaml 
b/charts/ats-ingress/templates/ats-configmap.yaml
index cf825da..425da11 100644
--- a/charts/ats-ingress/templates/ats-configmap.yaml
+++ b/charts/ats-ingress/templates/ats-configmap.yaml
@@ -22,6 +22,7 @@ metadata:
 "helm.sh/hook": post-install
 "helm.sh/hook-weight": "0"
 "helm.sh/hook-delete-policy": before-hook-creation
+"ats-configmap": "true"
 data:
   # reloadable data only
   proxy.config.log.logfile_dir: {{ .Values.ats.log.dir | quote }}
\ No newline at end of file
diff --git a/k8s/configmaps/ats-configmap.yaml 
b/k8s/configmaps/ats-configmap.yaml
index 7d66ddd..79078ff 100644
--- a/k8s/configmaps/ats-configmap.yaml
+++ b/k8s/configmaps/ats-configmap.yaml
@@ -26,6 +26,8 @@ kind: ConfigMap
 metadata:
   namespace: trafficserver-test
   name: ats
+  annotations:
+"ats-configmap" : "true"
 data:
   # reloadable data only
   proxy.config.output.logfile.rolling_enabled: "1"
diff --git a/watcher/handlerConfigmap.go b/watcher/handlerConfigmap.go
index 84bccd1..0283c0d 100644
--- a/watcher/handlerConfigmap.go
+++ b/watcher/handlerConfigmap.go
@@ -41,6 +41,16 @@ func (c *CMHandler) update(newObj interface{}) {
log.Println("In ConfigMapHandler Update; cannot cast to 
*v1.ConfigMap")
return
}
+
+   annotations := cm.GetAnnotations()
+   if val, ok := annotations["ats-configmap"]; ok {
+   if val != "true" {
+   return
+   }
+   } else {
+   return
+   }
+
for currKey, currVal := range cm.Data {
msg, err := c.Ep.ATSManager.ConfigSet(currKey, currVal) // 
update ATS
if err != nil {
diff --git a/watcher/handlerConfigmap_test.go b/watcher/handlerConfigmap_test.go
index f952fc5..37ac248 100644
--- a/watcher/handlerConfigmap_test.go
+++ b/watcher/handlerConfigmap_test.go
@@ -59,6 +59,23 @@ func TestAdd_BasicConfigMap(t *testing.T) {
 
 }
 
+func TestShouldNotAdd_BasicConfigMap(t *testing.T) {
+   cmHandler := createExampleCMHandler()
+   exampleConfigMap := createExampleConfigMap()
+
+   exampleConfigMap.Annotations = map[string]string{
+   "ats-configmap": "false",
+   }
+
+   cmHandler.Add()
+
+   rEnabled, err := 
cmHandler.Ep.ATSManager.ConfigGet("proxy.config.output.logfile.rolling_enabled")
+
+   if err == nil {
+   t.Errorf("Should not have executed. Instead gives %s", rEnabled)
+   }
+}
+
 func TestUpdate_BasicConfigMap(t *testing.T) {
cmHandler := createExampleCMHandler()
exampleConfigMap := createExampleConfigMap()
@@ -97,6 +114,9 @@ func createExampleConfigMap() v1.ConfigMap {
ObjectMeta: meta_v1.ObjectMeta{
Name:  "testsvc",
Namespace: "trafficserver-test-2",
+   Annotations:

[trafficserver-ingress-controller] branch master updated: Watcher changes (#38)

2020-08-10 Thread kichan 
This is an automated email from the ASF dual-hosted git repository.

kichan pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git


The following commit(s) were added to refs/heads/master by this push:
 new 3769bea  Watcher changes (#38)
3769bea is described below

commit 3769bea627103e49797f22cafa885d57d40d073e
Author: Rishabh Chhabra 
AuthorDate: Mon Aug 10 16:04:23 2020 -0500

Watcher changes (#38)

* Modifies clientset to use interface to enable testing

* Uses shared informer factory
---
 watcher/watcher.go  | 58 -
 watcher/watcher_test.go | 21 ++
 2 files changed, 35 insertions(+), 44 deletions(-)

diff --git a/watcher/watcher.go b/watcher/watcher.go
index f09a287..f0c451f 100644
--- a/watcher/watcher.go
+++ b/watcher/watcher.go
@@ -77,8 +77,8 @@ func (w *Watcher) Watch() error {
cmHandler := CMHandler{"configmaps", w.Ep}
targetNs := make([]string, 1, 1)
targetNs[0] = w.Ep.ATSManager.(*proxy.ATSManager).Namespace
-   err = w.inNamespacesWatchForConfigMaps(, 
w.Cs.CoreV1().RESTClient(),
-   targetNs, fields.Everything(), {}, 0, w.Cs)
+   err = w.inNamespacesWatchFor(, w.Cs.CoreV1().RESTClient(),
+   targetNs, fields.Everything(), {}, 0)
if err != nil {
return err
}
@@ -88,7 +88,15 @@ func (w *Watcher) Watch() error {
 func (w *Watcher) allNamespacesWatchFor(h EventHandler, c cache.Getter,
fieldSelector fields.Selector, objType pkgruntime.Object,
resyncPeriod time.Duration, listerWatcher cache.ListerWatcher) error {
-   sharedInformer := cache.NewSharedInformer(listerWatcher, objType, 
resyncPeriod)
+
+   factory := informers.NewSharedInformerFactory(w.Cs, resyncPeriod)
+   var sharedInformer cache.SharedIndexInformer
+   switch objType.(type) {
+   case *v1.Endpoints:
+   sharedInformer = factory.Core().V1().Endpoints().Informer()
+   case *v1beta1.Ingress:
+   sharedInformer = 
factory.Extensions().V1beta1().Ingresses().Informer()
+   }
 
sharedInformer.AddEventHandler(cache.ResourceEventHandlerFuncs{
AddFunc:h.Add,
@@ -108,35 +116,6 @@ func (w *Watcher) allNamespacesWatchFor(h EventHandler, c 
cache.Getter,
 
 // This is meant to make it easier to add resource watchers on resources that
 // span multiple namespaces
-func (w *Watcher) inNamespacesWatchForConfigMaps(h EventHandler, c 
cache.Getter,
-   namespaces []string, fieldSelector fields.Selector, objType 
pkgruntime.Object,
-   resyncPeriod time.Duration, clientset kubernetes.Interface) error {
-   if len(namespaces) == 0 {
-   log.Panic("inNamespacesWatchFor must have at least 1 namespace")
-   }
-   syncFuncs := make([]cache.InformerSynced, len(namespaces))
-   for i, ns := range namespaces {
-   factory := 
informers.NewSharedInformerFactoryWithOptions(clientset, resyncPeriod, 
informers.WithNamespace(ns))
-   cmInfo := factory.Core().V1().ConfigMaps().Informer()
-
-   cmInfo.AddEventHandler(cache.ResourceEventHandlerFuncs{
-   AddFunc:h.Add,
-   UpdateFunc: h.Update,
-   DeleteFunc: h.Delete,
-   })
-
-   go cmInfo.Run(w.StopChan)
-
-   syncFuncs[i] = cmInfo.HasSynced
-   }
-   if !cache.WaitForCacheSync(w.StopChan, syncFuncs...) {
-   s := fmt.Sprintf("Timed out waiting for %s caches to sync", 
h.GetResourceName())
-   utilruntime.HandleError(fmt.Errorf(s))
-   return errors.New(s)
-   }
-   return nil
-}
-
 func (w *Watcher) inNamespacesWatchFor(h EventHandler, c cache.Getter,
namespaces []string, fieldSelector fields.Selector, objType 
pkgruntime.Object,
resyncPeriod time.Duration) error {
@@ -145,8 +124,17 @@ func (w *Watcher) inNamespacesWatchFor(h EventHandler, c 
cache.Getter,
}
syncFuncs := make([]cache.InformerSynced, len(namespaces))
for i, ns := range namespaces {
-   epListWatch := cache.NewListWatchFromClient(c, 
h.GetResourceName(), ns, fieldSelector)
-   sharedInformer := cache.NewSharedInformer(epListWatch, objType, 
resyncPeriod)
+   factory := informers.NewSharedInformerFactoryWithOptions(w.Cs, 
resyncPeriod, informers.WithNamespace(ns))
+
+   var sharedInformer cache.SharedIndexInformer
+   switch objType.(type) {
+   case *v1.Endpoints:
+   sharedInformer = 
factory.Core().V1().Endpoints().Informer()
+   case *v1beta1.Ingress:
+   sharedInformer = 
factory.Extensions().V1beta1().Ingresses().Informer()
+   case *v1.ConfigMap:
+   sharedInformer =

[trafficserver] branch 9.0.x updated: Updated ChangeLog

2020-08-10 Thread zwoop 
This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/9.0.x by this push:
 new c97d5b5  Updated ChangeLog
c97d5b5 is described below

commit c97d5b5bf1fb60a600323001f5fa5459d6e6f316
Author: Leif Hedstrom 
AuthorDate: Mon Aug 10 13:30:40 2020 -0600

Updated ChangeLog
---
 CHANGELOG-9.0.0 | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG-9.0.0 b/CHANGELOG-9.0.0
index 8ee75a2..7d2cc15 100644
--- a/CHANGELOG-9.0.0
+++ b/CHANGELOG-9.0.0
@@ -1031,8 +1031,15 @@ Changes with Apache Traffic Server 9.0.0
   #7059 - Fix a crash on active timeout on QUIC connections
   #7060 - Document proxy.config.http.cache.post_method.
   #7061 - Don't make an error on receiving retransmitted handshake data
+  #7062 - Signal WRITE_COMPLETE regardless of transmission progress
   #7069 - Move the direct self loop check later to HttpSM::do_http_server_open
+  #7074 - Add TS_USE_QUIC to traffic_layout info
+  #7080 - Fix a crash on connection migration to the advertised preferred 
address
   #7081 - Updated release notes for 9.0.0 to have new QUIC 27 version
+  #7083 - Destroy threads after job done
   #7084 - const-ify quic/http3 code
   #7085 - Fixes build warnings in maxmind_acl
+  #7086 - Doc: fix no_content_length status code
   #7087 - Fix eval_ip compile - missing const.
+  #7089 - Converts files to #pragma once
+  #7091 - Adds description for ssl_ticket_number in ssl_multicert docs

[trafficserver] branch 9.0.x updated: Add TS_USE_QUIC to traffic_layout info (#7074)

2020-08-10 Thread zwoop 
This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 08c5ad1  Add TS_USE_QUIC to traffic_layout info (#7074)
08c5ad1 is described below

commit 08c5ad125a89ef4c6759710f7682a846f68ce908
Author: Masakazu Kitajo 
AuthorDate: Tue Aug 4 12:21:25 2020 +0900

Add TS_USE_QUIC to traffic_layout info (#7074)

(cherry picked from commit 2ee141137545a84584d8047eee70b171b5254c40)
---
 doc/developer-guide/testing/blackbox-testing.en.rst | 1 +
 src/traffic_layout/info.cc  | 1 +
 tests/README.md | 1 +
 3 files changed, 3 insertions(+)

diff --git a/doc/developer-guide/testing/blackbox-testing.en.rst 
b/doc/developer-guide/testing/blackbox-testing.en.rst
index 07c8296..0e8b394 100644
--- a/doc/developer-guide/testing/blackbox-testing.en.rst
+++ b/doc/developer-guide/testing/blackbox-testing.en.rst
@@ -252,6 +252,7 @@ Condition Testing
 - TS_HAS_IP_TOS
 - TS_USE_HWLOC
 - TS_USE_SET_RBIO
+- TS_USE_QUIC
 - TS_USE_LINUX_NATIVE_AIO
 - TS_HAS_SO_PEERCRED
 - TS_USE_REMOTE_UNWINDING
diff --git a/src/traffic_layout/info.cc b/src/traffic_layout/info.cc
index 4cb6195..05495c5 100644
--- a/src/traffic_layout/info.cc
+++ b/src/traffic_layout/info.cc
@@ -111,6 +111,7 @@ produce_features(bool json)
   print_feature("TS_USE_HWLOC", TS_USE_HWLOC, json);
   print_feature("TS_USE_SET_RBIO", TS_USE_SET_RBIO, json);
   print_feature("TS_USE_TLS13", TS_USE_TLS13, json);
+  print_feature("TS_USE_QUIC", TS_USE_QUIC, json);
   print_feature("TS_USE_LINUX_NATIVE_AIO", TS_USE_LINUX_NATIVE_AIO, json);
   print_feature("TS_HAS_SO_PEERCRED", TS_HAS_SO_PEERCRED, json);
   print_feature("TS_USE_REMOTE_UNWINDING", TS_USE_REMOTE_UNWINDING, json);
diff --git a/tests/README.md b/tests/README.md
index e6bea58..cdab158 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -311,6 +311,7 @@ ts.Disk.remap_config.AddLine(
  * TS_HAS_IP_TOS
  * TS_USE_HWLOC
  * TS_USE_SET_RBIO
+ * TS_USE_QUIC
  * TS_USE_LINUX_NATIVE_AIO
  * TS_HAS_SO_PEERCRED
  * TS_USE_REMOTE_UNWINDING

[trafficserver] branch 9.0.x updated: Fixes no_content_length status code description in docs (#7086)

2020-08-10 Thread zwoop 
This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/9.0.x by this push:
 new bc41747  Fixes no_content_length status code description in docs 
(#7086)
bc41747 is described below

commit bc417478dd057e0e4d82eae773b6307bd9bffc03
Author: Nozomi Inanami <42267827+nozomi1...@users.noreply.github.com>
AuthorDate: Wed Aug 5 23:42:10 2020 +0900

Fixes no_content_length status code description in docs (#7086)

(cherry picked from commit 674622d146f1bf48d600fed235a1cb25d34fe54b)
---
 doc/admin-guide/monitoring/error-messages.en.rst  | 2 +-
 doc/locale/ja/LC_MESSAGES/admin-guide/monitoring/error-messages.en.po | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/admin-guide/monitoring/error-messages.en.rst 
b/doc/admin-guide/monitoring/error-messages.en.rst
index 5e2400c..9422569 100644
--- a/doc/admin-guide/monitoring/error-messages.en.rst
+++ b/doc/admin-guide/monitoring/error-messages.en.rst
@@ -177,7 +177,7 @@ with corresponding HTTP response codes and customizable 
files.
``timeout#inactivity``
 
 ``Content Length Required``
-   ``400``
+   ``411``
Could not process this request because ``Content-Length`` was not specified.
``request#no_content_length``
 
diff --git 
a/doc/locale/ja/LC_MESSAGES/admin-guide/monitoring/error-messages.en.po 
b/doc/locale/ja/LC_MESSAGES/admin-guide/monitoring/error-messages.en.po
index fb2..7c223fc 100644
--- a/doc/locale/ja/LC_MESSAGES/admin-guide/monitoring/error-messages.en.po
+++ b/doc/locale/ja/LC_MESSAGES/admin-guide/monitoring/error-messages.en.po
@@ -405,10 +405,10 @@ msgstr ""
 
 #: ../../../admin-guide/monitoring/error-messages.en.rst:185
 msgid ""
-"``400`` Could not process this request because ``Content-Length`` was not "
+"``411`` Could not process this request because ``Content-Length`` was not "
 "specified. ``request#no_content_length``"
 msgstr ""
-"``400`` Could not process this request because ``Content-Length`` was not "
+"``411`` Could not process this request because ``Content-Length`` was not "
 "specified. (``Content-Length`` が指定されなかったためリクエストを処理できま"
 "せんでした。) ``request#no_content_length``"

[trafficserver] branch 9.0.x updated: Converts files to #pragma once (#7089)

2020-08-10 Thread zwoop 
This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 890356c  Converts files to #pragma once (#7089)
890356c is described below

commit 890356c5788d784d9cbf100ecfbb30da5b96f10b
Author: Randall Meyer 
AuthorDate: Wed Aug 5 16:16:14 2020 -0700

Converts files to #pragma once (#7089)

(cherry picked from commit 466ffc868bca963c1cb687fdbe2c1ffc6120e707)
---
 iocore/net/ProxyProtocol.h| 5 +
 plugins/experimental/cookie_remap/cookiejar.h | 5 +
 plugins/experimental/cookie_remap/hash.h  | 5 +
 plugins/experimental/cookie_remap/strip.h | 5 +
 plugins/experimental/maxmind_acl/mmdb.h   | 2 +-
 plugins/experimental/memcache/tsmemcache.h| 5 -
 proxy/http3/Http3SessionAccept.h  | 5 +
 7 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/iocore/net/ProxyProtocol.h b/iocore/net/ProxyProtocol.h
index 607dcdf..f5961af 100644
--- a/iocore/net/ProxyProtocol.h
+++ b/iocore/net/ProxyProtocol.h
@@ -23,8 +23,7 @@
   limitations under the License.
  */
 
-#ifndef ProxyProtocol_H_
-#define ProxyProtocol_H_
+#pragma once
 
 #include "tscore/ink_defs.h"
 #include "tscore/ink_memory.h"
@@ -51,5 +50,3 @@ const size_t PROXY_V2_CONNECTION_HEADER_LEN_MIN = 16;
 
 const size_t PROXY_V1_CONNECTION_HEADER_LEN_MAX = 108;
 const size_t PROXY_V2_CONNECTION_HEADER_LEN_MAX = 16;
-
-#endif /* ProxyProtocol_H_ */
diff --git a/plugins/experimental/cookie_remap/cookiejar.h 
b/plugins/experimental/cookie_remap/cookiejar.h
index 34e9907..2547581 100644
--- a/plugins/experimental/cookie_remap/cookiejar.h
+++ b/plugins/experimental/cookie_remap/cookiejar.h
@@ -16,8 +16,7 @@
   limitations under the License.
 */
 
-#ifndef CKREMAP_COOKIEJAR_H_
-#define CKREMAP_COOKIEJAR_H_
+#pragma once
 
 #include 
 #include 
@@ -58,5 +57,3 @@ private:
 
   unordered_map m_jar;
 };
-
-#endif // CKREMAP_COOKIEJAR_H_
diff --git a/plugins/experimental/cookie_remap/hash.h 
b/plugins/experimental/cookie_remap/hash.h
index 6d6c941..18375b3 100644
--- a/plugins/experimental/cookie_remap/hash.h
+++ b/plugins/experimental/cookie_remap/hash.h
@@ -16,8 +16,7 @@
   limitations under the License.
 */
 
-#ifndef _CKREMAP_HASH_H_
-#define _CKREMAP_HASH_H_
+#pragma once
 
 #include  // NOLINT(modernize-deprecated-headers)
 #include 
@@ -50,5 +49,3 @@ uint32_t hash_fnv32_buckets(const char *buf, size_t len, 
uint32_t num_buckets);
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* _CKREMAP_HASH_H_ */
diff --git a/plugins/experimental/cookie_remap/strip.h 
b/plugins/experimental/cookie_remap/strip.h
index 5a6e97c..67af1d0 100644
--- a/plugins/experimental/cookie_remap/strip.h
+++ b/plugins/experimental/cookie_remap/strip.h
@@ -16,8 +16,7 @@
   limitations under the License.
 */
 
-#ifndef CKREMAP_IV_H
-#define CKREMAP_IV_H
+#pragma once
 
 #include 
 
@@ -142,5 +141,3 @@ int get_stripped(const char *in, ssize_t in_len, char *out, 
int *out_len, unsign
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* CKREMAP_IV_H */
diff --git a/plugins/experimental/maxmind_acl/mmdb.h 
b/plugins/experimental/maxmind_acl/mmdb.h
index 561b42f..aa73c3b 100644
--- a/plugins/experimental/maxmind_acl/mmdb.h
+++ b/plugins/experimental/maxmind_acl/mmdb.h
@@ -16,7 +16,7 @@
   limitations under the License.
 */
 
-//#pragma once
+#pragma once
 
 #include 
 #include 
diff --git a/plugins/experimental/memcache/tsmemcache.h 
b/plugins/experimental/memcache/tsmemcache.h
index fc6c811..5c591ca 100644
--- a/plugins/experimental/memcache/tsmemcache.h
+++ b/plugins/experimental/memcache/tsmemcache.h
@@ -21,9 +21,6 @@
   limitations under the License.
  */
 
-#ifndef tsmemcache_h
-#define tsmemcache_h
-
 #include "I_EventSystem.h"
 #include "I_Net.h"
 #include "I_Cache.h"
@@ -241,5 +238,3 @@ xatoull(char *s, char *e)
   }
   return n;
 }
-
-#endif
diff --git a/proxy/http3/Http3SessionAccept.h b/proxy/http3/Http3SessionAccept.h
index 8bb388e..5c87226 100644
--- a/proxy/http3/Http3SessionAccept.h
+++ b/proxy/http3/Http3SessionAccept.h
@@ -21,8 +21,7 @@
   limitations under the License.
  */
 
-#ifndef __HTTP_QUIC_SESSION_ACCEPT_H__
-#define __HTTP_QUIC_SESSION_ACCEPT_H__
+#pragma once
 
 #include "tscore/ink_platform.h"
 #include "I_Net.h"
@@ -53,5 +52,3 @@ private:
 
   HttpSessionAccept::Options options;
 };
-
-#endif // __HTTP_QUIC_SESSION_ACCEPT_H__

[trafficserver] branch 9.0.x updated: destroy threads after job done (#7083)

2020-08-10 Thread zwoop 
This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/9.0.x by this push:
 new d2bbda5  destroy threads after job done (#7083)
d2bbda5 is described below

commit d2bbda54a5584940ef50c9501c96a8a6485223a6
Author: Fei Deng 
AuthorDate: Fri Aug 7 10:53:34 2020 -0500

destroy threads after job done (#7083)

(cherry picked from commit a27e58c26c653546ca33598809f22d89b86db33b)
---
 mgmt/ProcessManager.cc   | 12 +---
 mgmt/ProcessManager.h|  9 +++--
 src/traffic_server/traffic_server.cc |  4 ++--
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/mgmt/ProcessManager.cc b/mgmt/ProcessManager.cc
index 897cef1..e3c9bac 100644
--- a/mgmt/ProcessManager.cc
+++ b/mgmt/ProcessManager.cc
@@ -82,11 +82,12 @@ read_management_message(int sockfd, MgmtMessageHdr **msg)
 }
 
 void
-ProcessManager::start(std::function const )
+ProcessManager::start(std::function const _init, 
std::function const _destroy)
 {
   Debug("pmgmt", "starting process manager");
 
-  init = cb;
+  init= cb_init;
+  destroy = cb_destroy;
 
   ink_release_assert(running == 0);
   ink_atomic_increment(, 1);
@@ -153,7 +154,7 @@ ProcessManager::processManagerThread(void *arg)
   }
 
   if (pmgmt->init) {
-pmgmt->init();
+pmgmt->managerThread = pmgmt->init();
   }
 
   // Start pumping messages between the local process and the process
@@ -178,6 +179,11 @@ ProcessManager::processManagerThread(void *arg)
 }
   }
 
+  if (pmgmt->destroy && pmgmt->managerThread != nullptr) {
+pmgmt->destroy(pmgmt->managerThread);
+pmgmt->managerThread = nullptr;
+  }
+
   return ret;
 }
 
diff --git a/mgmt/ProcessManager.h b/mgmt/ProcessManager.h
index fdf555d..c19b14c 100644
--- a/mgmt/ProcessManager.h
+++ b/mgmt/ProcessManager.h
@@ -28,6 +28,8 @@
 #include 
 #include 
 
+#include 
+
 #include "MgmtUtils.h"
 #include "BaseManager.h"
 #include "tscore/ink_sock.h"
@@ -49,7 +51,8 @@ public:
   // Start a thread for the process manager. If @a cb is set then it
   // is called after the thread is started and before any messages are
   // processed.
-  void start(std::function const  = std::function());
+  void start(std::function const _init= 
std::function(),
+ std::function const _destroy = 
std::function());
 
   // Stop the process manager, dropping any unprocessed messages.
   void stop();
@@ -94,7 +97,9 @@ private:
 
   /// Thread initialization callback.
   /// This allows @c traffic_server and @c traffic_manager to perform 
different initialization in the thread.
-  std::function init;
+  std::function init;
+  std::function destroy;
+  TSThread managerThread = nullptr;
 
   int local_manager_sockfd;
 #if HAVE_EVENTFD
diff --git a/src/traffic_server/traffic_server.cc 
b/src/traffic_server/traffic_server.cc
index f57635c..15fe8ff 100644
--- a/src/traffic_server/traffic_server.cc
+++ b/src/traffic_server/traffic_server.cc
@@ -625,8 +625,8 @@ initialize_process_manager()
   pmgmt = new ProcessManager(remote_management_flag);
 
   // Lifecycle callbacks can potentially be invoked from this thread, so force 
thread initialization
-  // to make the TS API work. Use a lambda to avoid dealing with compiler 
dependent casting issues.
-  pmgmt->start([]() -> void { TSThreadInit(); });
+  // to make the TS API work.
+  pmgmt->start(TSThreadInit, TSThreadDestroy);
 
   RecProcessInitMessage(remote_management_flag ? RECM_CLIENT : 
RECM_STAND_ALONE);
   pmgmt->reconfigure();

[trafficserver] branch 9.0.x updated: Converts files to #pragma once (#7089)

2020-08-10 Thread zwoop 
This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 890356c  Converts files to #pragma once (#7089)
890356c is described below

commit 890356c5788d784d9cbf100ecfbb30da5b96f10b
Author: Randall Meyer 
AuthorDate: Wed Aug 5 16:16:14 2020 -0700

Converts files to #pragma once (#7089)

(cherry picked from commit 466ffc868bca963c1cb687fdbe2c1ffc6120e707)
---
 iocore/net/ProxyProtocol.h| 5 +
 plugins/experimental/cookie_remap/cookiejar.h | 5 +
 plugins/experimental/cookie_remap/hash.h  | 5 +
 plugins/experimental/cookie_remap/strip.h | 5 +
 plugins/experimental/maxmind_acl/mmdb.h   | 2 +-
 plugins/experimental/memcache/tsmemcache.h| 5 -
 proxy/http3/Http3SessionAccept.h  | 5 +
 7 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/iocore/net/ProxyProtocol.h b/iocore/net/ProxyProtocol.h
index 607dcdf..f5961af 100644
--- a/iocore/net/ProxyProtocol.h
+++ b/iocore/net/ProxyProtocol.h
@@ -23,8 +23,7 @@
   limitations under the License.
  */
 
-#ifndef ProxyProtocol_H_
-#define ProxyProtocol_H_
+#pragma once
 
 #include "tscore/ink_defs.h"
 #include "tscore/ink_memory.h"
@@ -51,5 +50,3 @@ const size_t PROXY_V2_CONNECTION_HEADER_LEN_MIN = 16;
 
 const size_t PROXY_V1_CONNECTION_HEADER_LEN_MAX = 108;
 const size_t PROXY_V2_CONNECTION_HEADER_LEN_MAX = 16;
-
-#endif /* ProxyProtocol_H_ */
diff --git a/plugins/experimental/cookie_remap/cookiejar.h 
b/plugins/experimental/cookie_remap/cookiejar.h
index 34e9907..2547581 100644
--- a/plugins/experimental/cookie_remap/cookiejar.h
+++ b/plugins/experimental/cookie_remap/cookiejar.h
@@ -16,8 +16,7 @@
   limitations under the License.
 */
 
-#ifndef CKREMAP_COOKIEJAR_H_
-#define CKREMAP_COOKIEJAR_H_
+#pragma once
 
 #include 
 #include 
@@ -58,5 +57,3 @@ private:
 
   unordered_map m_jar;
 };
-
-#endif // CKREMAP_COOKIEJAR_H_
diff --git a/plugins/experimental/cookie_remap/hash.h 
b/plugins/experimental/cookie_remap/hash.h
index 6d6c941..18375b3 100644
--- a/plugins/experimental/cookie_remap/hash.h
+++ b/plugins/experimental/cookie_remap/hash.h
@@ -16,8 +16,7 @@
   limitations under the License.
 */
 
-#ifndef _CKREMAP_HASH_H_
-#define _CKREMAP_HASH_H_
+#pragma once
 
 #include  // NOLINT(modernize-deprecated-headers)
 #include 
@@ -50,5 +49,3 @@ uint32_t hash_fnv32_buckets(const char *buf, size_t len, 
uint32_t num_buckets);
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* _CKREMAP_HASH_H_ */
diff --git a/plugins/experimental/cookie_remap/strip.h 
b/plugins/experimental/cookie_remap/strip.h
index 5a6e97c..67af1d0 100644
--- a/plugins/experimental/cookie_remap/strip.h
+++ b/plugins/experimental/cookie_remap/strip.h
@@ -16,8 +16,7 @@
   limitations under the License.
 */
 
-#ifndef CKREMAP_IV_H
-#define CKREMAP_IV_H
+#pragma once
 
 #include 
 
@@ -142,5 +141,3 @@ int get_stripped(const char *in, ssize_t in_len, char *out, 
int *out_len, unsign
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* CKREMAP_IV_H */
diff --git a/plugins/experimental/maxmind_acl/mmdb.h 
b/plugins/experimental/maxmind_acl/mmdb.h
index 561b42f..aa73c3b 100644
--- a/plugins/experimental/maxmind_acl/mmdb.h
+++ b/plugins/experimental/maxmind_acl/mmdb.h
@@ -16,7 +16,7 @@
   limitations under the License.
 */
 
-//#pragma once
+#pragma once
 
 #include 
 #include 
diff --git a/plugins/experimental/memcache/tsmemcache.h 
b/plugins/experimental/memcache/tsmemcache.h
index fc6c811..5c591ca 100644
--- a/plugins/experimental/memcache/tsmemcache.h
+++ b/plugins/experimental/memcache/tsmemcache.h
@@ -21,9 +21,6 @@
   limitations under the License.
  */
 
-#ifndef tsmemcache_h
-#define tsmemcache_h
-
 #include "I_EventSystem.h"
 #include "I_Net.h"
 #include "I_Cache.h"
@@ -241,5 +238,3 @@ xatoull(char *s, char *e)
   }
   return n;
 }
-
-#endif
diff --git a/proxy/http3/Http3SessionAccept.h b/proxy/http3/Http3SessionAccept.h
index 8bb388e..5c87226 100644
--- a/proxy/http3/Http3SessionAccept.h
+++ b/proxy/http3/Http3SessionAccept.h
@@ -21,8 +21,7 @@
   limitations under the License.
  */
 
-#ifndef __HTTP_QUIC_SESSION_ACCEPT_H__
-#define __HTTP_QUIC_SESSION_ACCEPT_H__
+#pragma once
 
 #include "tscore/ink_platform.h"
 #include "I_Net.h"
@@ -53,5 +52,3 @@ private:
 
   HttpSessionAccept::Options options;
 };
-
-#endif // __HTTP_QUIC_SESSION_ACCEPT_H__

[trafficserver] branch 9.0.x updated: Fix a crash on connection migration to the advertised preferred address (#7080)

2020-08-10 Thread zwoop 
This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 77ddfd5  Fix a crash on connection migration to the advertised 
preferred address (#7080)
77ddfd5 is described below

commit 77ddfd5a815be18e2ae6cbd0e2245fd914ba7707
Author: Masakazu Kitajo 
AuthorDate: Thu Aug 6 00:44:09 2020 +0900

Fix a crash on connection migration to the advertised preferred address 
(#7080)

This closes #7045

(cherry picked from commit 6223d6443aa9b36f357157b728f4f830a4777053)
---
 iocore/net/QUICNetVConnection.cc | 10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/iocore/net/QUICNetVConnection.cc b/iocore/net/QUICNetVConnection.cc
index 9d7b643..635b558 100644
--- a/iocore/net/QUICNetVConnection.cc
+++ b/iocore/net/QUICNetVConnection.cc
@@ -2288,7 +2288,9 @@ 
QUICNetVConnection::_state_connection_established_migrate_connection(const QUICP
   con.setRemote(&(p.from().sa));
   this->con.move(con);
   this->set_remote_addr();
-  this->_udp_con = p.udp_con();
+  this->_udp_con= p.udp_con();
+  this->_packet_handler = static_cast(
+static_cast(static_cast(this->_udp_con)->continuation));
 
   QUICPath new_path = {p.to(), p.from()};
   this->_validate_new_path(new_path);
@@ -2305,11 +2307,13 @@ 
QUICNetVConnection::_state_connection_established_migrate_connection(const QUICP
 con.setRemote(&(p.from().sa));
 this->con.move(con);
 this->set_remote_addr();
-this->_udp_con = p.udp_con();
+this->_udp_con= p.udp_con();
+this->_packet_handler = static_cast(
+  static_cast(static_cast(this->_udp_con)->continuation));
 
 this->_update_peer_cid(this->_alt_con_manager->migrate_to_alt_cid());
 
-QUICPath new_path = {this->local_addr, con.addr};
+QUICPath new_path = {p.to(), p.from()};
 this->_validate_new_path(new_path);
   }
 } else {

[trafficserver] branch 9.0.x updated: Fix a crash on connection migration to the advertised preferred address (#7080)

2020-08-10 Thread zwoop 
This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 77ddfd5  Fix a crash on connection migration to the advertised 
preferred address (#7080)
77ddfd5 is described below

commit 77ddfd5a815be18e2ae6cbd0e2245fd914ba7707
Author: Masakazu Kitajo 
AuthorDate: Thu Aug 6 00:44:09 2020 +0900

Fix a crash on connection migration to the advertised preferred address 
(#7080)

This closes #7045

(cherry picked from commit 6223d6443aa9b36f357157b728f4f830a4777053)
---
 iocore/net/QUICNetVConnection.cc | 10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/iocore/net/QUICNetVConnection.cc b/iocore/net/QUICNetVConnection.cc
index 9d7b643..635b558 100644
--- a/iocore/net/QUICNetVConnection.cc
+++ b/iocore/net/QUICNetVConnection.cc
@@ -2288,7 +2288,9 @@ 
QUICNetVConnection::_state_connection_established_migrate_connection(const QUICP
   con.setRemote(&(p.from().sa));
   this->con.move(con);
   this->set_remote_addr();
-  this->_udp_con = p.udp_con();
+  this->_udp_con= p.udp_con();
+  this->_packet_handler = static_cast(
+static_cast(static_cast(this->_udp_con)->continuation));
 
   QUICPath new_path = {p.to(), p.from()};
   this->_validate_new_path(new_path);
@@ -2305,11 +2307,13 @@ 
QUICNetVConnection::_state_connection_established_migrate_connection(const QUICP
 con.setRemote(&(p.from().sa));
 this->con.move(con);
 this->set_remote_addr();
-this->_udp_con = p.udp_con();
+this->_udp_con= p.udp_con();
+this->_packet_handler = static_cast(
+  static_cast(static_cast(this->_udp_con)->continuation));
 
 this->_update_peer_cid(this->_alt_con_manager->migrate_to_alt_cid());
 
-QUICPath new_path = {this->local_addr, con.addr};
+QUICPath new_path = {p.to(), p.from()};
 this->_validate_new_path(new_path);
   }
 } else {

[trafficserver] branch 9.0.x updated: Signal WRITE_COMPLETE regardless of transmission progress (#7062)

2020-08-10 Thread zwoop 
This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 64d6a54  Signal WRITE_COMPLETE regardless of transmission progress 
(#7062)
64d6a54 is described below

commit 64d6a54e3f7f543c61f1c2cf140b99072c4c1a44
Author: Masakazu Kitajo 
AuthorDate: Thu Aug 6 08:17:25 2020 +0900

Signal WRITE_COMPLETE regardless of transmission progress (#7062)

(cherry picked from commit 2219cee51ee943b13ffb572b00fb98d38b116feb)
---
 proxy/http3/Http3Transaction.cc | 14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/proxy/http3/Http3Transaction.cc b/proxy/http3/Http3Transaction.cc
index fc9d066..6ffb895 100644
--- a/proxy/http3/Http3Transaction.cc
+++ b/proxy/http3/Http3Transaction.cc
@@ -379,21 +379,25 @@ Http3Transaction::state_stream_open(int event, void 
*edata)
 Http3TransVDebug("%s (%d)", get_vc_event_name(event), event);
 this->_process_read_vio();
 this->_data_handler->finalize();
+// always signal regardless of progress
 this->_signal_read_event();
 this->_stream_io->read_reenable();
 break;
   case VC_EVENT_WRITE_READY:
-  case VC_EVENT_WRITE_COMPLETE: {
 Http3TransVDebug("%s (%d)", get_vc_event_name(event), event);
-int64_t len = this->_process_write_vio();
 // if no progress, don't need to signal
-if (len > 0) {
+if (this->_process_write_vio() > 0) {
   this->_signal_write_event();
 }
 this->_stream_io->write_reenable();
-
 break;
-  }
+  case VC_EVENT_WRITE_COMPLETE:
+Http3TransVDebug("%s (%d)", get_vc_event_name(event), event);
+this->_process_write_vio();
+// always signal regardless of progress
+this->_signal_write_event();
+this->_stream_io->write_reenable();
+break;
   case VC_EVENT_EOS:
   case VC_EVENT_ERROR:
   case VC_EVENT_INACTIVITY_TIMEOUT:

[trafficserver] branch 9.0.x updated: Adds description for ssl_ticket_number in ssl_multicert docs (#7091)

2020-08-10 Thread zwoop 
This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 072267f  Adds description for ssl_ticket_number in ssl_multicert docs 
(#7091)
072267f is described below

commit 072267fe567dc09113b1212858d24d41a1edc284
Author: Randall Meyer 
AuthorDate: Thu Aug 6 17:18:32 2020 -0700

Adds description for ssl_ticket_number in ssl_multicert docs (#7091)

This option was added in e78ecef3fa7101ac3d6ea80a3c065e14ac56c38b

Also removes deprecation notice for ticket_key_name (which was removed in 
ATS 8)

(cherry picked from commit 7ee7519f2cc404830e8709397f0d192fe72a7a8e)
---
 doc/admin-guide/files/ssl_multicert.config.en.rst | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/admin-guide/files/ssl_multicert.config.en.rst 
b/doc/admin-guide/files/ssl_multicert.config.en.rst
index 54a391d..d78bc75 100644
--- a/doc/admin-guide/files/ssl_multicert.config.en.rst
+++ b/doc/admin-guide/files/ssl_multicert.config.en.rst
@@ -106,8 +106,9 @@ ssl_ticket_enabled=1|0 (optional)
   OpenSSL should be upgraded to version 0.9.8f or higher. This
   option must be set to `0` to disable session ticket support.
 
-ticket_key_name=FILENAME (optional) [**REMOVED in 7.1.x and 8.0**]
-   Ticket key should be set in records.config via 
:ts:cv:`proxy.config.ssl.server.ticket_key.filename`
+ssl_ticket_number=INTEGER (optional)
+  Specifies the number of TLSv1.3 session tickets that are issued.
+  This defaults to 2 (the OpenSSL default)
 
 ssl_key_dialog=builtin|"exec:/path/to/program [args]" (optional)
   Method used to provide a pass phrase for encrypted private keys.  If the