Commitc3fdf89

Hiroshi Inoue

committed

Fix a bug about the handling of CX parameter of the connection string

reported by Sergey Smirnov.

1 parent40c4416 commitc3fdf89Copy full SHA for c3fdf89

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -112,6 +112,7 @@ PGAPI_Connect(`
`112`	`112`	`make_string(szDSN,cbDSN,ci->dsn);`
`113`	`113`
`114`	`114`	`/* get the values for the DSN from the registry */`
	`115`	`+memcpy(&ci->drivers,&globals,sizeof(globals));`
`115`	`116`	`getDSNinfo(ci,CONN_OVERWRITE);`
`116`	`117`	`logs_on_off(1,ci->drivers.debug,ci->drivers.commlog);`
`117`	`118`	`/* initialize pg_version from connInfo.protocol */`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -421,7 +421,6 @@ getDSNinfo(ConnInfo *ci, char overwrite)`
`421`	`421`	`*If a driver keyword was present, then dont use a DSN and return.`
`422`	`422`	`*If DSN is null and no driver, then use the default datasource.`
`423`	`423`	`*/`
`424`		`-memcpy(&ci->drivers,&globals,sizeof(globals));`
`425`	`424`	`if (DSN[0]=='\0')`
`426`	`425`	`{`
`427`	`426`	`if (ci->driver[0]!='\0')`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -62,8 +62,8 @@ FONT 10, "Terminal"`
`62`	`62`	`BEGIN`
`63`	`63`	`RTEXT "&Data Source",IDC_DSNAMETEXT,5,11,50,12,NOT WS_GROUP`
`64`	`64`	`EDITTEXT IDC_DSNAME,57,10,72,12,ES_AUTOHSCROLL \| WS_GROUP`
`65`		`- RTEXT "Des&cription",IDC_DESCTEXT,134,11,39,12,NOT WS_GROUP`
`66`		`- EDITTEXT IDC_DESC,175,10,108,12,ES_AUTOHSCROLL`
	`65`	`+ RTEXT "Des&cription",IDC_DESCTEXT,129,10,45,12,NOT WS_GROUP`
	`66`	`+ EDITTEXT IDC_DESC,176,10,107,12,ES_AUTOHSCROLL`
`67`	`67`	`RTEXT "Data&base",IDC_STATIC,16,26,38,12,NOT WS_GROUP`
`68`	`68`	`EDITTEXT IDC_DATABASE,57,25,72,12,ES_AUTOHSCROLL`
`69`	`69`	`RTEXT "&Server",IDC_STATIC,26,41,29,12,NOT WS_GROUP`
`@@ -171,7 +171,7 @@ BEGIN`
`171`	`171`	`WS_TABSTOP,227,95,29,10`
`172`	`172`	`GROUPBOX "Protocol",IDC_STATIC,5,115,277,25`
`173`	`173`	`CONTROL "7.X,6.4+",DS_PG64,"Button",BS_AUTORADIOBUTTON \|`
`174`		`- WS_GROUP,44,126,35,10`
	`174`	`+ WS_GROUP,44,126,49,10`
`175`	`175`	`CONTROL "6.3",DS_PG63,"Button",BS_AUTORADIOBUTTON \| WS_TABSTOP,`
`176`	`176`	`117,126,26,10`
`177`	`177`	`CONTROL "6.2",DS_PG62,"Button",BS_AUTORADIOBUTTON \| WS_TABSTOP,`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@`
`27`	`27`	`#defineINTFUNC __stdcall`
`28`	`28`
`29`	`29`	`externHINSTANCENEARs_hModule;/* Saved module handle. */`
	`30`	`+externGLOBAL_VALUESglobals;`
`30`	`31`
`31`	`32`	`/* Constants */`
`32`	`33`	`#defineMIN(x,y) ((x) < (y) ? (x) : (y))`
`@@ -217,6 +218,7 @@ ConfigDlgProc(HWND hdlg,`
`217`	`218`	`*/`
`218`	`219`	`/* override settings in ODBC.INI */`
`219`	`220`
	`221`	`+memcpy(&ci->drivers,&globals,sizeof(globals));`
`220`	`222`	`/* Get the rest of the common attributes */`
`221`	`223`	`getDSNinfo(ci,CONN_DONT_OVERWRITE);`
`222`	`224`

Comments

(0)