diff --git a/dom/webbrowserpersist/nsWebBrowserPersist.cpp b/dom/webbrowserpersist/nsWebBrowserPersist.cpp index 55fcd021905a..7a1ae116135a 100644 --- a/dom/webbrowserpersist/nsWebBrowserPersist.cpp +++ b/dom/webbrowserpersist/nsWebBrowserPersist.cpp @@ -1149,8 +1149,6 @@ NS_IMETHODIMP nsWebBrowserPersist::OnStatus(nsIRequest* request, switch (status) { case NS_NET_STATUS_RESOLVING_HOST: case NS_NET_STATUS_RESOLVED_HOST: - case NS_NET_STATUS_BEGIN_FTP_TRANSACTION: - case NS_NET_STATUS_END_FTP_TRANSACTION: case NS_NET_STATUS_CONNECTING_TO: case NS_NET_STATUS_CONNECTED_TO: case NS_NET_STATUS_TLS_HANDSHAKE_STARTING: diff --git a/js/xpconnect/src/xpc.msg b/js/xpconnect/src/xpc.msg index 3d704d93d5a6..4b698af168e9 100644 --- a/js/xpconnect/src/xpc.msg +++ b/js/xpconnect/src/xpc.msg @@ -170,11 +170,6 @@ XPC_MSG_DEF(NS_ERROR_REMOTE_XUL , "Attempt to access remote XPC_MSG_DEF(NS_ERROR_LOAD_SHOWED_ERRORPAGE , "The load caused an error page to be displayed.") XPC_MSG_DEF(NS_ERROR_BLOCKED_BY_POLICY , "The request was blocked by a policy set by the system administrator.") -XPC_MSG_DEF(NS_ERROR_FTP_LOGIN , "FTP error while logging in") -XPC_MSG_DEF(NS_ERROR_FTP_CWD , "FTP error while changing directory") -XPC_MSG_DEF(NS_ERROR_FTP_PASV , "FTP error while changing to passive mode") -XPC_MSG_DEF(NS_ERROR_FTP_PWD , "FTP error while retrieving current directory") -XPC_MSG_DEF(NS_ERROR_FTP_LIST , "FTP error while retrieving a directory listing") XPC_MSG_DEF(NS_ERROR_UNKNOWN_HOST , "The lookup of the hostname failed") XPC_MSG_DEF(NS_ERROR_DNS_LOOKUP_QUEUE_FULL , "The DNS lookup queue is full") XPC_MSG_DEF(NS_ERROR_UNKNOWN_PROXY_HOST , "The lookup of the proxy hostname failed") diff --git a/xpcom/base/ErrorList.py b/xpcom/base/ErrorList.py index a8f5fa0c26fd..327c34556c56 100755 --- a/xpcom/base/ErrorList.py +++ b/xpcom/base/ErrorList.py @@ -362,14 +362,6 @@ with modules["NETWORK"]: # probably in the process of being torn down. errors["NS_ERROR_DOCSHELL_DYING"] = FAILURE(78) - # FTP specific error codes: - - errors["NS_ERROR_FTP_LOGIN"] = FAILURE(21) - errors["NS_ERROR_FTP_CWD"] = FAILURE(22) - errors["NS_ERROR_FTP_PASV"] = FAILURE(23) - errors["NS_ERROR_FTP_PWD"] = FAILURE(24) - errors["NS_ERROR_FTP_LIST"] = FAILURE(28) - # DNS specific error codes: # The lookup of a hostname failed. This generally refers to the hostname @@ -426,10 +418,6 @@ with modules["NETWORK"]: # should NOT free it. errors["NS_SUCCESS_ADOPTED_DATA"] = SUCCESS(90) - # FTP - errors["NS_NET_STATUS_BEGIN_FTP_TRANSACTION"] = SUCCESS(27) - errors["NS_NET_STATUS_END_FTP_TRANSACTION"] = SUCCESS(28) - # This success code may be returned by nsIAuthModule::getNextToken to # indicate that the authentication is finished and thus there's no need # to call getNextToken again.