Date: Mon, 4 Mar 2013 00:10:01 GMT From: SASAKI Katuhiro <crest@sahiro.org> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/176626: www/apache22-peruser-mpm fails to build Message-ID: <201303040010.r240A1aI071705@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/176626; it has been noted by GNATS.
From: SASAKI Katuhiro <crest@sahiro.org>
To: bug-followup@FreeBSD.org, crest@sahiro.org
Cc:
Subject: Re: ports/176626: www/apache22-peruser-mpm fails to build
Date: Mon, 4 Mar 2013 08:56:20 +0900
--Signature=_Mon__4_Mar_2013_08_56_20_+0900_oTo8RCdCaH1KST7C
Content-Type: multipart/mixed;
boundary="Multipart=_Mon__4_Mar_2013_08_56_20_+0900_YosOZNMZU.l4TfvB"
--Multipart=_Mon__4_Mar_2013_08_56_20_+0900_YosOZNMZU.l4TfvB
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
Attach patch.
--Multipart=_Mon__4_Mar_2013_08_56_20_+0900_YosOZNMZU.l4TfvB
Content-Type: text/plain;
name="apache22-peruser-mpm.diff"
Content-Disposition: attachment;
filename="apache22-peruser-mpm.diff"
Content-Transfer-Encoding: quoted-printable
diff -urN /usr/ports/www/apache22-peruser-mpm/files/httpd-2.2.3-peruser-0.3=
.0-dc3.patch apache22-peruser-mpm/files/httpd-2.2.3-peruser-0.3.0-dc3.patch
--- /usr/ports/www/apache22-peruser-mpm/files/httpd-2.2.3-peruser-0.3.0-dc3=
.patch 2009-06-02 20:25:22.000000000 +0900
+++ apache22-peruser-mpm/files/httpd-2.2.3-peruser-0.3.0-dc3.patch 2013-03-=
04 07:24:27.000000000 +0900
@@ -1,5 +1,15 @@
---- server/mpm/experimental/peruser/mpm_default.h 2009-05-27 15:09:19.0000=
00000 +0300
-+++ server/mpm/experimental/peruser/mpm_default.h 2009-05-28 10:10:42.0000=
00000 +0300
+--- server/mpm/experimental/peruser/mpm.h 2013-03-04 06:50:28.000000000 +0=
900
++++ server/mpm/experimental/peruser/mpm.h 2013-03-04 06:51:13.000000000 +0=
900
+@@ -84,6 +84,7 @@
+ #define AP_MPM_USES_POD 1
+ #define MPM_CHILD_PID(i) (ap_scoreboard_image->parent[i].pid)
+ #define MPM_NOTE_CHILD_KILLED(i) (MPM_CHILD_PID(i) =3D 0)
++#define MPM_VALID_PID(p) (getpgid(p) =3D=3D getpgrp())
+ #define MPM_ACCEPT_FUNC unixd_accept
+=20
+ extern int ap_threads_per_child;
+--- server/mpm/experimental/peruser/mpm_default.h 2013-03-04 06:50:28.0000=
00000 +0900
++++ server/mpm/experimental/peruser/mpm_default.h 2013-03-04 06:51:13.0000=
00000 +0900
@@ -77,6 +77,12 @@
#define DEFAULT_MIN_FREE_PROCESSORS 2
#endif
@@ -64,18 +74,8 @@
+#endif
+
#endif /* AP_MPM_DEFAULT_H */
---- server/mpm/experimental/peruser/mpm.h 2009-03-22 22:46:45.000000000 +0=
200
-+++ server/mpm/experimental/peruser/mpm.h 2009-03-22 22:39:10.000000000 +0=
200
-@@ -84,6 +84,7 @@
- #define AP_MPM_USES_POD 1
- #define MPM_CHILD_PID(i) (ap_scoreboard_image->parent[i].pid)
- #define MPM_NOTE_CHILD_KILLED(i) (MPM_CHILD_PID(i) =3D 0)
-+#define MPM_VALID_PID(p) (getpgid(p) =3D=3D getpgrp())
- #define MPM_ACCEPT_FUNC unixd_accept
-=20
- extern int ap_threads_per_child;
---- server/mpm/experimental/peruser/peruser.c 2009-05-27 15:09:19.00000000=
0 +0300
-+++ server/mpm/experimental/peruser/peruser.c 2009-05-28 13:54:27.00000000=
0 +0300
+--- server/mpm/experimental/peruser/peruser.c 2013-03-04 06:50:28.00000000=
0 +0900
++++ server/mpm/experimental/peruser/peruser.c 2013-03-04 06:55:05.00000000=
0 +0900
@@ -195,20 +195,30 @@
=20
#define CHILD_STATUS_STANDBY 0 /* wait for a request before starting */
@@ -457,7 +457,7 @@
+ }
=20
if (status =3D=3D APR_EGENERAL) {
- /* resource shortage or should-not-occur occured */
+ /* resource shortage or should-not-occur occurred */
clean_child_exit(1);
}
- else if (status !=3D APR_SUCCESS || die_now) {
--Multipart=_Mon__4_Mar_2013_08_56_20_+0900_YosOZNMZU.l4TfvB--
--Signature=_Mon__4_Mar_2013_08_56_20_+0900_oTo8RCdCaH1KST7C
Content-Type: application/pgp-signature
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (MingW32)
iEYEARECAAYFAlEz4yUACgkQcuQxAcyHbC1LaQCgwPnmWZXCdh3dBzmBvmfYAGYj
83MAnAkgKZAgiHDXK02qXxZGRlraai4L
=Kq3H
-----END PGP SIGNATURE-----
--Signature=_Mon__4_Mar_2013_08_56_20_+0900_oTo8RCdCaH1KST7C--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303040010.r240A1aI071705>