aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/auth/auth_apache.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2011-06-10 00:47:40 +0200
committerNils Adermann <naderman@naderman.de>2011-06-10 00:47:40 +0200
commitcdfbd82504c5433241f83de28e1c9567b2f98b4a (patch)
treecb1233a2acf0e23315405c410ec0dacb7a399564 /phpBB/includes/auth/auth_apache.php
parent5b701dc3ed83345c70eabc1d88a721a7df8e43e5 (diff)
parentd1f1d8ade7ab98bde70451874c94bb35584f9192 (diff)
downloadforums-cdfbd82504c5433241f83de28e1c9567b2f98b4a.tar
forums-cdfbd82504c5433241f83de28e1c9567b2f98b4a.tar.gz
forums-cdfbd82504c5433241f83de28e1c9567b2f98b4a.tar.bz2
forums-cdfbd82504c5433241f83de28e1c9567b2f98b4a.tar.xz
forums-cdfbd82504c5433241f83de28e1c9567b2f98b4a.zip
Merge branch 'ticket/bantu/9802' into develop-olympus
* ticket/bantu/9802: [ticket/9802] Remove unnecessary htmlspecialchars() call on REMOTE_ADDR. [ticket/9802] Only check for IPv4-mapped address when address is IPv6. [ticket/9802] Fix tiny logic bug in loop determining REMOTE_ADDR. [ticket/9802] Remove redundant character class definition from preg_replace. [ticket/9802] Fix redundant str_replace call. No need to replace ' ' with ' '.
Diffstat (limited to 'phpBB/includes/auth/auth_apache.php')
0 files changed, 0 insertions, 0 deletions
e95f40c6c9fb86118006360c33f920f9a959ba9cf /mdk-stage1 parent406f9a546c77e4d52a27f96943715c003a4af2a9 (diff)downloaddrakx-4b8bcc895c61a7c39d1fdbf03b3537c569e01e73.tar
drakx-4b8bcc895c61a7c39d1fdbf03b3537c569e01e73.tar.gz
drakx-4b8bcc895c61a7c39d1fdbf03b3537c569e01e73.tar.bz2
drakx-4b8bcc895c61a7c39d1fdbf03b3537c569e01e73.tar.xz
drakx-4b8bcc895c61a7c39d1fdbf03b3537c569e01e73.zip
use a do while loop to wait for forked process
Diffstat (limited to 'mdk-stage1')
-rw-r--r--mdk-stage1/init.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/mdk-stage1/init.c b/mdk-stage1/init.c
index 893bb9697..3a8d8e3b8 100644
--- a/mdk-stage1/init.c
+++ b/mdk-stage1/init.c
@@ -437,7 +437,6 @@ int main(int argc, char **argv)
int wait_status;
int fd;
int abnormal_termination = 0;
- int end_stage2 = 0;
if (argc > 1 && argv[1][0] >= '0' && argv[1][0] <= '9') {
printf("This is no normal init, sorry.\n"
@@ -516,11 +515,9 @@ int main(int argc, char **argv)
return 0;
}
- while (!end_stage2) {
+ do {
childpid = wait4(-1, &wait_status, 0, NULL);
- if (childpid == installpid)
- end_stage2 = 1;
- }
+ } while (childpid != installpid);
/* allow Ctrl Alt Del to reboot */
reboot(0xfee1dead, 672274793, BMAGIC_HARD);