--- a/components/apache2/patches/CVE-2014-0226.patch Mon Dec 01 04:57:29 2014 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +0,0 @@
-Patch origin: upstream
-Patch status: will be part of next version
-
-http://svn.apache.org/viewvc?view=revision&revision=1610515
-
---- include/ap_mmn.h 2014/07/14 20:23:27 1610514
-+++ include/ap_mmn.h 2014/07/14 20:34:32 1610515
-@@ -151,6 +151,7 @@
- * 20051115.31 (2.2.23) Add forcerecovery to proxy_balancer_shared struct
- * 20051115.32 (2.2.24) Add ap_get_exec_line
- * 20051115.33 (2.2.24) Add ap_pregsub_ex()
-+ * 20051115.34 (2.2.28) Add ap_copy_scoreboard_worker()
- */
-
- #define MODULE_MAGIC_COOKIE 0x41503232UL /* "AP22" */
-@@ -158,7 +159,7 @@
- #ifndef MODULE_MAGIC_NUMBER_MAJOR
- #define MODULE_MAGIC_NUMBER_MAJOR 20051115
- #endif
--#define MODULE_MAGIC_NUMBER_MINOR 33 /* 0...n */
-+#define MODULE_MAGIC_NUMBER_MINOR 34 /* 0...n */
-
- /**
- * Determine if the server's current MODULE_MAGIC_NUMBER is at least a
---- include/scoreboard.h 2014/07/14 20:23:27 1610514
-+++ include/scoreboard.h 2014/07/14 20:34:32 1610515
-@@ -189,7 +189,24 @@
- int status, request_rec *r);
- void ap_time_process_request(ap_sb_handle_t *sbh, int status);
-
-+/** Return a pointer to the worker_score for a given child, thread pair.
-+ * @param child_num The child number.
-+ * @param thread_num The thread number.
-+ * @return A pointer to the worker_score structure.
-+ * @deprecated This function is deprecated, use ap_copy_scoreboard_worker instead.
-+ */
- AP_DECLARE(worker_score *) ap_get_scoreboard_worker(int x, int y);
-+
-+/** Copy the contents of a worker's scoreboard entry. The contents of
-+ * the worker_score structure are copied verbatim into the dest
-+ * structure.
-+ * @param dest Output parameter.
-+ * @param child_num The child number.
-+ * @param thread_num The thread number.
-+ */
-+AP_DECLARE(void) ap_copy_scoreboard_worker(worker_score *dest,
-+ int child_num, int thread_num);
-+
- AP_DECLARE(process_score *) ap_get_scoreboard_process(int x);
- AP_DECLARE(global_score *) ap_get_scoreboard_global(void);
- AP_DECLARE(lb_score *) ap_get_scoreboard_lb(int lb_num);
---- modules/generators/mod_status.c 2014/07/14 20:23:27 1610514
-+++ modules/generators/mod_status.c 2014/07/14 20:34:32 1610515
-@@ -241,7 +241,7 @@
- #endif
- int short_report;
- int no_table_report;
-- worker_score *ws_record;
-+ worker_score *ws_record = apr_palloc(r->pool, sizeof *ws_record);
- process_score *ps_record;
- char *stat_buffer;
- pid_t *pid_buffer, worker_pid;
-@@ -333,7 +333,7 @@
- for (j = 0; j < thread_limit; ++j) {
- int indx = (i * thread_limit) + j;
-
-- ws_record = ap_get_scoreboard_worker(i, j);
-+ ap_copy_scoreboard_worker(ws_record, i, j);
- res = ws_record->status;
- stat_buffer[indx] = status_flags[res];
-
---- server/scoreboard.c 2014/07/14 20:23:27 1610514
-+++ server/scoreboard.c 2014/07/14 20:34:32 1610515
-@@ -510,6 +510,21 @@
- return &ap_scoreboard_image->servers[x][y];
- }
-
-+AP_DECLARE(void) ap_copy_scoreboard_worker(worker_score *dest,
-+ int child_num,
-+ int thread_num)
-+{
-+ worker_score *ws = ap_get_scoreboard_worker(child_num, thread_num);
-+
-+ memcpy(dest, ws, sizeof *ws);
-+
-+ /* For extra safety, NUL-terminate the strings returned, though it
-+ * should be true those last bytes are always zero anyway. */
-+ dest->client[sizeof(dest->client) - 1] = '\0';
-+ dest->request[sizeof(dest->request) - 1] = '\0';
-+ dest->vhost[sizeof(dest->vhost) - 1] = '\0';
-+}
-+
- AP_DECLARE(process_score *) ap_get_scoreboard_process(int x)
- {
- if ((x < 0) || (server_limit < x)) {