Merge hotfix changes into development #523
Merged
Conversation
This file contains 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
Pi-hole FTL v4.2.2
Signed-off-by: Mcat12 <newtoncat12@yahoo.com> Signed-off-by: DL6ER <dl6er@dl6er.de> Conflicts: shmem.c
…t that at least one of the objects has changed Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
…ory objects into all running processes, even if they are forks Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
…a new virtual address Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
This was causing an issue because each process had a different value for the next string position, and caused corruption in the string shared memory. Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
The version on development is 3, so this version should be 4. Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
dschaper
previously approved these changes
Feb 26, 2019
AzureMarker
previously requested changes
Feb 26, 2019
…ked code snippet that later modified leading to silently doubled code when merging development into this branch. Signed-off-by: DL6ER <dl6er@dl6er.de>
AzureMarker
approved these changes
Feb 28, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
By submitting this pull request, I confirm the following (please check boxes, eg [X]) Failure to fill the template will close your PR:
Please submit all pull requests against the
developmentbranch. Failure to do so will delay or deny your requestHow familiar are you with the codebase?:
10
Code maintenance, merging the latest hotfix into development.
Note that there is one additional change: In 9593233, I moved
close(fd)further up and into theif(resize)code as suggested here: #519 (comment)This template was created based on the work of
udemy-dl.