NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit920d519

committed

Parse libpq's "keepalives" option more like other integer options.

Use pqParseIntParam (nee parse_int_param) instead of using strtoldirectly. This allows trailing whitespace, which the previous codingdidn't, and makes the spelling of the error message consistent withother similar cases.This seems to be an oversight in commite7a2217, which introducedparse_int_param. That fixed places that were using atoi(), but missedthis place which was randomly using strtol() instead.Ordinarily I'd consider this minor cleanup not worth back-patching.However, it seems that ecpg assumes it can add trailing whitespaceto URL parameters, so that use of the keepalives option fails inthat context. Perhaps that's worth improving as a separate matter.In the meantime, back-patch this to all supported branches.Yuto Sasaki (some further cleanup by me)Discussion:https://postgr.es/m/TY2PR01MB36286A7B97B9A15793335D18C1772@TY2PR01MB3628.jpnprd01.prod.outlook.com

1 parentd94cf5c commit920d519Copy full SHA for 920d519

File tree

1 file changed

-4

lines changed

src/interfaces/libpq
- fe-connect.c

1 file changed

-4

lines changed

`‎src/interfaces/libpq/fe-connect.c`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -2169,14 +2169,14 @@ connectFailureMessage(PGconn *conn, int errorno)`
`2169`	`2169`	`staticint`
`2170`	`2170`	`useKeepalives(PGconn*conn)`
`2171`	`2171`	`{`
`2172`		`-char*ep;`
`2173`	`2172`	`intval;`
`2174`	`2173`
`2175`	`2174`	`if (conn->keepalives==NULL)`
`2176`	`2175`	`return1;`
`2177`		`-val=strtol(conn->keepalives,&ep,10);`
`2178`		`-if (*ep)`
	`2176`	`+`
	`2177`	`+if (!pqParseIntParam(conn->keepalives,&val,conn,"keepalives"))`
`2179`	`2178`	`return-1;`
	`2179`	`+`
`2180`	`2180`	`returnval!=0 ?1 :0;`
`2181`	`2181`	`}`
`2182`	`2182`
`@@ -3084,7 +3084,7 @@ PQconnectPoll(PGconn *conn)`
`3084`	`3084`
`3085`	`3085`	`if (usekeepalives<0)`
`3086`	`3086`	`{`
`3087`		`-libpq_append_conn_error(conn,"keepalives parameter must be an integer");`
	`3087`	`+/* error is already reported */`
`3088`	`3088`	`err=1;`
`3089`	`3089`	`}`
`3090`	`3090`	`elseif (usekeepalives==0)`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit920d519

File tree

1 file changed

1 file changed

`‎src/interfaces/libpq/fe-connect.c`

0 commit comments