danielgustafsson

diff --git a/lib/curl_ntlm_wb.c b/lib/curl_ntlm_wb.c
index 949c7fa17..e3f4d5805 100644
--- a/lib/curl_ntlm_wb.c
+++ b/lib/curl_ntlm_wb.c
@@ -324,6 +324,8 @@ static CURLcode ntlm_wb_response(struct connectdata *conn,

   conn->response_header = aprintf("NTLM %.*s", len_out - 4, buf + 3);
   free(buf);
+  if (!conn->response_header)
+    return CURLE_OUT_OF_MEMORY;

danielgustafsson

diff --git a/lib/cookie.c b/lib/cookie.c
index fd7341f0b..fed4af3d3 100644
--- a/lib/cookie.c
+++ b/lib/cookie.c
@@ -787,6 +787,8 @@ Curl_cookie_add(struct Curl_easy *data,
         co->domain = strdup(ptr);
         if(!co->domain)
           badcookie = TRUE;
+        if(bad_domain(co->domain))
+          badcookie = TRUE;

danielgustafsson

diff --git a/doc/src/sgml/runtime.sgml b/doc/src/sgml/runtime.sgml
index 1c92e7df75..bf3c79b9ac 100644
--- a/doc/src/sgml/runtime.sgml
+++ b/doc/src/sgml/runtime.sgml
@@ -371,20 +371,22 @@ su postgres -c 'pg_ctl start -D /usr/local/pgsql/data -l serverlog'
      <para>
       On <productname>OpenBSD</productname>, add the following lines
       to the file <filename>/etc/rc.local</filename>:
       <indexterm><primary>OpenBSD</primary><secondary>start script</secondary></indexterm>
 <programlisting>

danielgustafsson

From 9a98b85ad4bacf38398fd8b2795cd483b994300e Mon Sep 17 00:00:00 2001
From: Daniel Gustafsson <daniel@yesql.se>
Date: Wed, 16 May 2018 17:14:32 +0200
Subject: [PATCH] doc: Remove incorrect statement about IPC on OpenBSD

kern.ipc.shm_use_phys is not a sysctl on OpenBSD, and SEMMAP is not
a kernel configuration option. These were probably copy pasteos from
when the documentation had a single paragraph for *BSD.
---
 doc/src/sgml/runtime.sgml | 7 -------

danielgustafsson

diff --git a/src/backend/executor/test/nodeSubplan_test.c b/src/backend/executor/test/nodeSubplan_test.c
index 36a581f587..462db0d8ef 100644
--- a/src/backend/executor/test/nodeSubplan_test.c
+++ b/src/backend/executor/test/nodeSubplan_test.c
@@ -5,6 +5,38 @@
 
 #include "../nodeSubplan.c"
 
+/*
+ * These functions are defined in explain_gp.c, which in turn is included

danielgustafsson

diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index def27e7dd6..d086ec90e0 100644
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -5186,11 +5186,17 @@ getTableAttrs(TableInfo *tblinfo, int numTables)
                                                          "a.attnotnull, a.atthasdef, a.attisdropped, "
                                                          "a.attlen, a.attalign, a.attislocal, "
                                   "pg_catalog.format_type(t.oid,a.atttypmod) AS atttypname "
+                                  " %s "
                         "FROM pg_catalog.pg_attribute a LEFT JOIN pg_catalog.pg_type t "

danielgustafsson

/Users/danielgustafsson/dev/greenplum/hacks/gpAux/gpdemo/datadirs/standby/pg_xlog/000000010000000000000003:

[page:0, xlp_info:2, xlp_tli:1, xlp_pageaddr:0/C000000] XLP_LONG_HEADER 
[cur:0/C000020, xid:0, rmid:0(XLOG), len/tot_len:4/36, info:48, prev:0/80000A0] nextOid: 24576
[cur:0/C000048, xid:690, rmid:10(Heap), len/tot_len:21/1253, info:9, prev:0/C000020] insert: s/d/r:1664/0/1262 blk/off:0/4 header: none
[cur:0/C000048, xid:690, rmid:10(Heap), len/tot_len:21/1253, info:9, prev:0/C000020] bkpblock[1]: s/d/r:1664/0/1262 blk:0 hole_off/len:52/31596 apply:1
[cur:0/C000530, xid:690, rmid:11(Btree), len/tot_len:18/230, info:9, prev:0/C000048] insert_leaf: s/d/r:1664/0/2671 tid 1/2
[cur:0/C000530, xid:690, rmid:11(Btree), len/tot_len:18/230, info:9, prev:0/C000048] bkpblock[1]: s/d/r:1664/0/2671 blk:1 hole_off/len:40/32616 apply:1
[cur:0/C000618, xid:690, rmid:11(Btree), len/tot_len:18/198, info:9, prev:0/C000530] insert_leaf: s/d/r:1664/0/2672 tid 1/4

danielgustafsson

/Users/danielgustafsson/dev/greenplum/hacks/gpAux/gpdemo/datadirs/standby/pg_xlog/000000010000000000000003:

[page:0, xlp_info:2, xlp_tli:1, xlp_pageaddr:0/C000000] XLP_LONG_HEADER 
[cur:0/C000020, xid:0, rmid:0(XLOG), len/tot_len:4/36, info:48, prev:0/80000A0] nextOid: 24576
[cur:0/C000048, xid:690, rmid:10(Heap), len/tot_len:21/1253, info:9, prev:0/C000020] insert: s/d/r:1664/0/1262 blk/off:0/4 header: none
[cur:0/C000048, xid:690, rmid:10(Heap), len/tot_len:21/1253, info:9, prev:0/C000020] bkpblock[1]: s/d/r:1664/0/1262 blk:0 hole_off/len:52/31596 apply:1
[cur:0/C000530, xid:690, rmid:11(Btree), len/tot_len:18/230, info:9, prev:0/C000048] insert_leaf: s/d/r:1664/0/2671 tid 1/2
[cur:0/C000530, xid:690, rmid:11(Btree), len/tot_len:18/230, info:9, prev:0/C000048] bkpblock[1]: s/d/r:1664/0/2671 blk:1 hole_off/len:40/32616 apply:1
[cur:0/C000618, xid:690, rmid:11(Btree), len/tot_len:18/198, info:9, prev:0/C000530] insert_leaf: s/d/r:1664/0/2672 tid 1/4

danielgustafsson

diff --git a/template/confreg/admin_waitlist.html b/template/confreg/admin_waitlist.html
index 098cccf..7628f37 100644
--- a/template/confreg/admin_waitlist.html
+++ b/template/confreg/admin_waitlist.html
@@ -38,6 +38,10 @@ function showDialog(id) {
       <td>Confirmed registrations</td>
       <td>{{num_confirmedregs}}</td>
     </tr>
+    <tr>
+      <td>Attendees on the waitlist</td>

danielgustafsson

From 7e0973e51969c110f753e77395f5fa538a20e493 Mon Sep 17 00:00:00 2001
From: Daniel Gustafsson <daniel@yesql.se>
Date: Wed, 30 Aug 2017 13:13:21 +0200
Subject: [PATCH] Defualt to post-8.1 coding convention for PG_MODULE_MAGIC

PG_MODULE_MAGIC has been around since 8.2, with 8.1 long since in
EOL. Default to avoiding the #ifdef test for the macro and instead
turn the documentation around that it may be needed, instead of
saying it can be omitted. Also remove the last remaining #ifdef
tests in the code.