Repository navigation
Commit b425175
committed
ext/dba: Fix dba_close() not closing a dba_popen() connection
dba_close() looked up the persistent entry with connection->info after
dba_close_connection() had cleared it, so the entry was never removed and
the database file and its lock stayed held. Count the connections on the
entry's refcount again, as PHP 8.3 did, and close the handle when
dba_close() releases the last one, unless another persistent handle to the
same file shares its stream. Lock conflict checks now also see persistent
handles still in use, since closing one of two connections with the same
key removed the other's DBA_G(connections) entry.1 parent 62a96e1 commit b425175
3 files changed
Lines changed: 115 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
25 | 29 | | |
26 | 30 | | |
27 | 31 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
271 | 271 | | |
272 | 272 | | |
273 | 273 | | |
| 274 | + | |
| 275 | + | |
| 276 | + | |
| 277 | + | |
| 278 | + | |
| 279 | + | |
| 280 | + | |
| 281 | + | |
| 282 | + | |
| 283 | + | |
| 284 | + | |
| 285 | + | |
| 286 | + | |
| 287 | + | |
| 288 | + | |
| 289 | + | |
274 | 290 | | |
275 | 291 | | |
276 | 292 | | |
| |||
297 | 313 | | |
298 | 314 | | |
299 | 315 | | |
| 316 | + | |
| 317 | + | |
| 318 | + | |
| 319 | + | |
| 320 | + | |
300 | 321 | | |
301 | 322 | | |
302 | 323 | | |
| |||
501 | 522 | | |
502 | 523 | | |
503 | 524 | | |
| 525 | + | |
| 526 | + | |
| 527 | + | |
| 528 | + | |
| 529 | + | |
| 530 | + | |
| 531 | + | |
| 532 | + | |
| 533 | + | |
504 | 534 | | |
505 | 535 | | |
506 | 536 | | |
| |||
596 | 626 | | |
597 | 627 | | |
598 | 628 | | |
| 629 | + | |
599 | 630 | | |
600 | 631 | | |
601 | 632 | | |
| |||
951 | 982 | | |
952 | 983 | | |
953 | 984 | | |
954 | | - | |
| 985 | + | |
| 986 | + | |
955 | 987 | | |
956 | 988 | | |
957 | 989 | | |
958 | 990 | | |
959 | 991 | | |
960 | 992 | | |
| 993 | + | |
961 | 994 | | |
962 | 995 | | |
963 | 996 | | |
| |||
1000 | 1033 | | |
1001 | 1034 | | |
1002 | 1035 | | |
1003 | | - | |
| 1036 | + | |
| 1037 | + | |
| 1038 | + | |
| 1039 | + | |
| 1040 | + | |
1004 | 1041 | | |
1005 | 1042 | | |
1006 | 1043 | | |
1007 | | - | |
1008 | | - | |
| 1044 | + | |
| 1045 | + | |
1009 | 1046 | | |
1010 | 1047 | | |
1011 | 1048 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
0 commit comments