Merged
Conversation
Delete all src/ftp*.c files (32 files) and include/ftpd.h. Extract UCHAR/USHRT/UINT/ULONG/U64 typedefs into include/types.h. Update include/httpcgi.h to use types.h instead of inline typedefs. In include/httpd.h: - Remove #include "ftpd.h", add #include "types.h" - Replace FTPD *ftpd field with void *unused_50 (offset-stable) In src/httpd.c: - Remove FTP listener creation and accept() from socket_thread - Remove FTPC eye-catcher branch from worker_thread - Remove ftpdterm() call from terminate() In src/httpdsrv.c: - Remove display_ftpd() and FTPD table row - Remove FTPC branch from display_queue_data() In src/httpcons.c: - Remove FTPD port display and FTPC branch from d_queue() Fixes #42
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
src/ftp*.cfiles (32 files, ~3,290 LOC) andinclude/ftpd.hUCHAR/USHRT/UINT/ULONG/U64typedefs into newinclude/types.hinclude/httpcgi.hwith#include "types.h"FTPD *ftpdfield inhttpdstruct withvoid *unused_50(offset-stable at 0x50)socket_threadinhttpd.cworker_threadinhttpd.cdisplay_ftpd()and all FTPC display branches fromhttpdsrv.candhttpcons.cTest plan
make buildRC=0 (all modules compile without error)make linkRC=0 (all 13 load modules link cleanly)curlagainst HTTPD)/.dsrvserver display page loads without FTP entriesFixes #42