diff options
Diffstat (limited to 'tdeioslave/http')
-rw-r--r-- | tdeioslave/http/CMakeLists.txt | 8 | ||||
-rw-r--r-- | tdeioslave/http/Makefile.am | 18 | ||||
-rw-r--r-- | tdeioslave/http/README.http_cache_cleaner | 4 | ||||
-rw-r--r-- | tdeioslave/http/README.webdav | 2 | ||||
-rw-r--r-- | tdeioslave/http/TODO | 4 | ||||
-rw-r--r-- | tdeioslave/http/http.cc | 12 | ||||
-rw-r--r-- | tdeioslave/http/http.protocol | 2 | ||||
-rw-r--r-- | tdeioslave/http/http_cache_cleaner.cpp | 2 | ||||
-rw-r--r-- | tdeioslave/http/http_cache_cleaner.desktop | 2 | ||||
-rw-r--r-- | tdeioslave/http/https.protocol | 2 | ||||
-rw-r--r-- | tdeioslave/http/kcookiejar/kcookiejar.cpp | 2 | ||||
-rw-r--r-- | tdeioslave/http/webdav.protocol | 2 | ||||
-rw-r--r-- | tdeioslave/http/webdavs.protocol | 2 |
13 files changed, 31 insertions, 31 deletions
diff --git a/tdeioslave/http/CMakeLists.txt b/tdeioslave/http/CMakeLists.txt index 64abe1adb..aff6d0a4e 100644 --- a/tdeioslave/http/CMakeLists.txt +++ b/tdeioslave/http/CMakeLists.txt @@ -38,9 +38,9 @@ install( FILES DESTINATION ${SERVICES_INSTALL_DIR} ) -##### kio_http_cache_cleaner #################### +##### tdeio_http_cache_cleaner #################### -set( target kio_http_cache_cleaner ) +set( target tdeio_http_cache_cleaner ) set( ${target}_SRCS http_cache_cleaner.cpp @@ -52,11 +52,11 @@ tde_add_tdeinit_executable( ${target} AUTOMOC ) -##### kio_http ################################## +##### tdeio_http ################################## # FIXME GSSAPI support is not handled yet -set( target kio_http ) +set( target tdeio_http ) set( ${target}_SRCS http.cc diff --git a/tdeioslave/http/Makefile.am b/tdeioslave/http/Makefile.am index 184381b0f..71b6d0c60 100644 --- a/tdeioslave/http/Makefile.am +++ b/tdeioslave/http/Makefile.am @@ -10,17 +10,17 @@ AM_LDFLAGS = $(all_libraries) $(GSSAPI_RPATH) bin_PROGRAMS= lib_LTLIBRARIES= -tdeinit_LTLIBRARIES = kio_http_cache_cleaner.la -kde_module_LTLIBRARIES = kio_http.la +tdeinit_LTLIBRARIES = tdeio_http_cache_cleaner.la +kde_module_LTLIBRARIES = tdeio_http.la -kio_http_la_SOURCES = http.cc -kio_http_la_METASOURCES = AUTO -kio_http_la_LIBADD = $(LIB_KIO) $(top_builddir)/tdeio/httpfilter/libhttpfilter.la $(LIB_QT) $(LIB_TDECORE) $(LIBZ) $(top_builddir)/dcop/libDCOP.la $(top_builddir)/tdeio/misc/tdentlm/libtdentlm.la -kio_http_la_LDFLAGS = $(all_libraries) $(GSSAPI_RPATH) -module $(KDE_PLUGIN) $(GSSAPI_LIBS) +tdeio_http_la_SOURCES = http.cc +tdeio_http_la_METASOURCES = AUTO +tdeio_http_la_LIBADD = $(LIB_KIO) $(top_builddir)/tdeio/httpfilter/libhttpfilter.la $(LIB_QT) $(LIB_TDECORE) $(LIBZ) $(top_builddir)/dcop/libDCOP.la $(top_builddir)/tdeio/misc/tdentlm/libtdentlm.la +tdeio_http_la_LDFLAGS = $(all_libraries) $(GSSAPI_RPATH) -module $(KDE_PLUGIN) $(GSSAPI_LIBS) -kio_http_cache_cleaner_la_SOURCES = http_cache_cleaner.cpp -kio_http_cache_cleaner_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la -kio_http_cache_cleaner_la_LDFLAGS = -module -avoid-version +tdeio_http_cache_cleaner_la_SOURCES = http_cache_cleaner.cpp +tdeio_http_cache_cleaner_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la +tdeio_http_cache_cleaner_la_LDFLAGS = -module -avoid-version noinst_HEADERS = http.h diff --git a/tdeioslave/http/README.http_cache_cleaner b/tdeioslave/http/README.http_cache_cleaner index 7714bfba6..839394aa4 100644 --- a/tdeioslave/http/README.http_cache_cleaner +++ b/tdeioslave/http/README.http_cache_cleaner @@ -10,11 +10,11 @@ TODO: 30 minutes / delte entries which end in .new and are older than 30 minutes. -* Let kio_http fill in expire dates other than 0. +* Let tdeio_http fill in expire dates other than 0. DONE: -* Start khttpcache from kio_http if the file "cleaned" +* Start khttpcache from tdeio_http if the file "cleaned" is older than 30(?) minutes. * Accept command line parameteres diff --git a/tdeioslave/http/README.webdav b/tdeioslave/http/README.webdav index c7ee900bb..d7f6cca26 100644 --- a/tdeioslave/http/README.webdav +++ b/tdeioslave/http/README.webdav @@ -15,7 +15,7 @@ Applications supporting extended webdav features Much of the info here is elaborated by rfc #2518; the rest can be understood by reading davPropStat() in http.cc, specifically the setMetaData() calls. -Extended information is transferred via kio's metadata system... +Extended information is transferred via tdeio's metadata system... === MISCELLANEOUS === Display Names (names suitable for presentation to the user) are passed as the metadata diff --git a/tdeioslave/http/TODO b/tdeioslave/http/TODO index 9dbf60a3e..adf81a978 100644 --- a/tdeioslave/http/TODO +++ b/tdeioslave/http/TODO @@ -1,5 +1,5 @@ The following is a list of items that are currently missing or partially implemented -in kio_http: +in tdeio_http: - HTTP/1.1 Persistant Connections: The header often specifies the timeout value used for connections. @@ -19,7 +19,7 @@ features such as locking. - Rating(s) support. http://www.w3.org/PICS: This might involve an external program to parse the labels, and something to configure access accordingly. There is only some basic things that need to be -added to kio_http to support this. The majority of the work has to be done at the +added to tdeio_http to support this. The majority of the work has to be done at the application level. A tdehtml plugin in tdeaddons to do this might be a nice idea. - P3P support: diff --git a/tdeioslave/http/http.cc b/tdeioslave/http/http.cc index d944364cc..32ee24ad3 100644 --- a/tdeioslave/http/http.cc +++ b/tdeioslave/http/http.cc @@ -99,12 +99,12 @@ extern "C" { int kdemain( int argc, char **argv ) { KLocale::setMainCatalogue("tdelibs"); - TDEInstance instance( "kio_http" ); + TDEInstance instance( "tdeio_http" ); ( void ) TDEGlobal::locale(); if (argc != 4) { - fprintf(stderr, "Usage: kio_http protocol domain-socket1 domain-socket2\n"); + fprintf(stderr, "Usage: tdeio_http protocol domain-socket1 domain-socket2\n"); exit(-1); } @@ -2056,7 +2056,7 @@ bool HTTPProtocol::httpOpenConnection() kdDebug(7113) << "(" << m_pid << ") HTTPProtocol::httpOpenConnection" << endl; setBlockConnection( true ); - // kio_http uses its own proxying: + // tdeio_http uses its own proxying: KSocks::self()->disableSocks(); if ( m_state.doProxy ) @@ -2430,7 +2430,7 @@ bool HTTPProtocol::httpOpen() if ( m_request.offset > 0 ) { header += TQString("Range: bytes=%1-\r\n").arg(TDEIO::number(m_request.offset)); - kdDebug(7103) << "kio_http : Range = " << TDEIO::number(m_request.offset) << endl; + kdDebug(7103) << "tdeio_http : Range = " << TDEIO::number(m_request.offset) << endl; } if ( m_request.cache == CC_Reload ) @@ -2842,7 +2842,7 @@ try_again: { // We get XML / HTTP without a proper header // put string back - kdDebug(7103) << "kio_http: No valid HTTP header found! Document starts with XML/HTML tag" << endl; + kdDebug(7103) << "tdeio_http: No valid HTTP header found! Document starts with XML/HTML tag" << endl; // Document starts with a tag, assume html instead of text/plain m_strMimeType = "text/html"; @@ -3217,7 +3217,7 @@ try_again: // content? else if (strncasecmp(buf, "Content-Encoding:", 17) == 0) { - // This is so wrong !! No wonder kio_http is stripping the + // This is so wrong !! No wonder tdeio_http is stripping the // gzip encoding from downloaded files. This solves multiple // bug reports and caitoo's problem with downloads when such a // header is encountered... diff --git a/tdeioslave/http/http.protocol b/tdeioslave/http/http.protocol index 60f85c451..d5ad11f28 100644 --- a/tdeioslave/http/http.protocol +++ b/tdeioslave/http/http.protocol @@ -1,5 +1,5 @@ [Protocol] -exec=kio_http +exec=tdeio_http protocol=http input=none output=filesystem diff --git a/tdeioslave/http/http_cache_cleaner.cpp b/tdeioslave/http/http_cache_cleaner.cpp index 554d221d5..b4d235c1c 100644 --- a/tdeioslave/http/http_cache_cleaner.cpp +++ b/tdeioslave/http/http_cache_cleaner.cpp @@ -48,7 +48,7 @@ time_t currentDate; int m_maxCacheAge; int m_maxCacheSize; -static const char appName[] = "kio_http_cache_cleaner"; +static const char appName[] = "tdeio_http_cache_cleaner"; static const char description[] = I18N_NOOP("TDE HTTP cache maintenance tool"); diff --git a/tdeioslave/http/http_cache_cleaner.desktop b/tdeioslave/http/http_cache_cleaner.desktop index 33cebb731..63410bdd5 100644 --- a/tdeioslave/http/http_cache_cleaner.desktop +++ b/tdeioslave/http/http_cache_cleaner.desktop @@ -82,7 +82,7 @@ Name[zh_CN]=HTTP 缓存清除程序 Name[zh_HK]=HTTP 快取清除程式 Name[zh_TW]=HTTP 快取清除程式 Name[zu]=Umhlanzi we-Cache ye-HTTP -Exec=kio_http_cache_cleaner +Exec=tdeio_http_cache_cleaner Comment=Cleans up old entries from the HTTP cache Comment[af]=Skoonmaak begin ou inskrywings van die Http kas Comment[ar]=يزيل المداخل القديمة من كاش HTTP diff --git a/tdeioslave/http/https.protocol b/tdeioslave/http/https.protocol index 5d456599c..75ea1ad0f 100644 --- a/tdeioslave/http/https.protocol +++ b/tdeioslave/http/https.protocol @@ -1,5 +1,5 @@ [Protocol] -exec=kio_http +exec=tdeio_http protocol=https input=none output=filesystem diff --git a/tdeioslave/http/kcookiejar/kcookiejar.cpp b/tdeioslave/http/kcookiejar/kcookiejar.cpp index 5cb8d9053..731dbd996 100644 --- a/tdeioslave/http/kcookiejar/kcookiejar.cpp +++ b/tdeioslave/http/kcookiejar/kcookiejar.cpp @@ -85,7 +85,7 @@ #define IP_ADDRESS_EXPRESSION "(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)" // Note with respect to TQString::fromLatin1( ) -// Cookies are stored as 8 bit data and passed to kio_http as +// Cookies are stored as 8 bit data and passed to tdeio_http as // latin1 regardless of their actual encoding. // L1 is used to indicate latin1 constants diff --git a/tdeioslave/http/webdav.protocol b/tdeioslave/http/webdav.protocol index 3fd6287f9..0c696e5e6 100644 --- a/tdeioslave/http/webdav.protocol +++ b/tdeioslave/http/webdav.protocol @@ -1,5 +1,5 @@ [Protocol] -exec=kio_http +exec=tdeio_http protocol=webdav input=none output=filesystem diff --git a/tdeioslave/http/webdavs.protocol b/tdeioslave/http/webdavs.protocol index 12d97499a..eb88675b1 100644 --- a/tdeioslave/http/webdavs.protocol +++ b/tdeioslave/http/webdavs.protocol @@ -1,5 +1,5 @@ [Protocol] -exec=kio_http +exec=tdeio_http protocol=webdavs input=none output=filesystem |