Merge branch 'PGPROEE10_libpq' of gitlab.postgrespro.ru:pgpro-dev/postgrespro into PGPROEE10_libpq

Author: zilder

src/interfaces/libpq/fe-connect.c

@@ -2347,7 +2347,13 @@ PQconnectPoll(PGconn *conn)
 					}
 
 					/* Remember current address for possible error msg */
+#ifdef WITH_RSOCKET
+					addr_cur = !conn->isRsocket ?
+						conn->connaddr[conn->whichaddr].info :
+						conn->connaddr[conn->whichaddr].rinfo;
+#else
 					addr_cur = conn->connaddr[conn->whichaddr].info;
+#endif
 					memcpy(&conn->raddr.addr, addr_cur->ai_addr,
 						   addr_cur->ai_addrlen);
 					conn->raddr.salen = addr_cur->ai_addrlen;
@@ -2538,14 +2544,13 @@ PQconnectPoll(PGconn *conn)
 												  libpq_gettext("could not set socket to nonblocking mode: %s\n"),
 									SOCK_STRERROR(SOCK_ERRNO, sebuf, sizeof(sebuf)));
 								pqDropConnection(conn, true);
-								conn->addr_cur = addr_cur->ai_next;
+								conn->whichaddr++;
 								conn->isRsocket = false;
 								continue;
 							}
 
-							pg_freeaddrinfo_all(AF_UNSPEC, conn->addr_cur);
-							conn->addr_cur = NULL;
-
+							pg_freeaddrinfo_all(AF_UNSPEC, conn->connaddr[conn->whichaddr].rinfo);
+							conn->connaddr[conn->whichaddr].rinfo = NULL;
 							conn->status = CONNECTION_OK;
 							return PGRES_POLLING_OK;
 						}
@@ -3632,14 +3637,12 @@ PQconnectPoll(PGconn *conn)
 				 * Make rsocket connection.
 				 * We go CONNECTION_NEEDED step to not copy a lot of code.
 				 *
-				 * conn->addr_cur stores rsocket addrinfo. It is necessary to
-				 * free it after connection.
+				 * pg_conn_addr.rinfo stores rsocket addrinfo. It is necessary
+				 * to free it after connection.
 				 *
 				 * conn->addrlist should be freed in previous step.
 				 */
-				Assert(!conn->addr_cur);
-
-				conn->addr_cur = raddrs;
+				conn->connaddr[conn->whichaddr].rinfo = raddrs;
 				conn->isRsocket = true;
 				conn->status = CONNECTION_NEEDED;
 				goto keep_going;

src/interfaces/libpq/libpq-int.h

@@ -319,6 +319,9 @@ typedef struct pg_conn_host
 typedef struct pg_conn_address
 {
 	struct addrinfo *info;
+#ifdef WITH_RSOCKET
+	struct addrinfo *rinfo;		/* rsocket addrinfo */
+#endif
 	int			hostidx;		/* host index in connhost array */
 } pg_conn_address;