Details
-
Suggestion
-
Resolution: Done
-
Not Evaluated
-
6.2
-
None
-
5
-
16b614f2e1 (qt/qtbase/dev) 16b614f2e1 (qt/tqtc-qtbase/dev)
-
Team Two Foundation Sprint 52, Team B Foundation Sprint 53
Description
qurltlds_p.h is a generated file that contains a copy of https://publicsuffix.org/list/public_suffix_list.dat.
text data bss dec hex filename 152695 16 0 152711 25487 src/network/CMakeFiles/Network.dir/Debug/kernel/qtldurl.cpp.o 146811 16 0 146827 23d8b src/network/CMakeFiles/Network.dir/Release/kernel/qtldurl.cpp.o
But a copy of that content is available on Linux systems:
$ file /usr/share/publicsuffix/public_suffix_list.da* /usr/share/publicsuffix/public_suffix_list.dafsa: Public Suffix List data (optimized) (Version 0) /usr/share/publicsuffix/public_suffix_list.dat: Public Suffix List data, Unicode text, UTF-8 text $ ls -l /usr/share/publicsuffix/public_suffix_list.da* -rw-r--r-- 1 root root 52446 Aug 6 13:47 /usr/share/publicsuffix/public_suffix_list.dafsa -rw-r--r-- 1 root root 235425 Aug 4 07:44 /usr/share/publicsuffix/public_suffix_list.dat
It would be good for us to use the pre-generated files instead of our copy, in case it's newer. I suggest a tri-state mode:
- macOS and Windows, optional on others via CMake switch: use the internal copy of the public suffix list
- default on other Unix: load and use /usr/share/publicsuffix/public_suffix_list.dafsa, if it's present, fall back to the internal copy if not
- optional for all systems: load and use /usr/share/publicsuffix/public_suffix_list.dafsa and fail if it's not present, no copy carried into QtNetwork
This is how we did the XDG MIME database.
The actual file path should also be configurable.
Attachments
| For Gerrit Dashboard: QTBUG-95889 | ||||||
|---|---|---|---|---|---|---|
| # | Subject | Branch | Project | Status | CR | V |
| 397178,4 | tst_qnetworkcookiejar: Remove tests that rely on public suffix database format | dev | qt/qtbase | Status: MERGED | +2 | 0 |
| 397179,7 | Network: Use public suffix database in DAFSA format | dev | qt/qtbase | Status: MERGED | +2 | 0 |
| 397180,12 | Network: Use system publicsuffix database copy when available | dev | qt/qtbase | Status: MERGED | +2 | 0 |
| 397353,1 | Add copy of public_suffix_list.dat | dev | qt/qtbase | Status: ABANDONED | 0 | 0 |
| 397354,5 | Remove util/publicSuffix | dev | qt/qtbase | Status: MERGED | +2 | 0 |