From b21dfd24d565a4c5afaab719dc7ed55ec6aa9984 Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Mon, 8 Oct 2012 10:56:17 -0400 Subject: [PATCH 1/6] Bug 799069: Unresolved vpx_codec_vp8_cx export in --disable-webrtc build r=jesup,derf --- layout/media/symbols.def.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/layout/media/symbols.def.in b/layout/media/symbols.def.in index 6c43dcdad5bc..99e79ee35454 100644 --- a/layout/media/symbols.def.in +++ b/layout/media/symbols.def.in @@ -37,7 +37,9 @@ vpx_codec_vp8_dx vpx_img_free vpx_codec_enc_config_set vpx_codec_enc_init_ver +#ifdef MOZ_VP8_ENCODER vpx_codec_vp8_cx +#endif vpx_img_set_rect vpx_codec_get_cx_data vpx_codec_enc_config_default From 5a3edf0816c64feb83b4a22e651e5569d37be636 Mon Sep 17 00:00:00 2001 From: Randell Jesup Date: Mon, 8 Oct 2012 11:08:52 -0400 Subject: [PATCH 2/6] BUg 799076: Add temporary error definitions to media/webrtc/signaling for VC9 and below r=derf --- .../signaling/src/sipcc/cpr/win32/cpr_win_errno.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/media/webrtc/signaling/src/sipcc/cpr/win32/cpr_win_errno.h b/media/webrtc/signaling/src/sipcc/cpr/win32/cpr_win_errno.h index 2d540f3befed..481986b4efff 100755 --- a/media/webrtc/signaling/src/sipcc/cpr/win32/cpr_win_errno.h +++ b/media/webrtc/signaling/src/sipcc/cpr/win32/cpr_win_errno.h @@ -42,6 +42,17 @@ #include +/* VC10 and above define these */ +#ifndef EWOULDBLOCK +#define EWOULDBLOCK WSAEWOULDBLOCK +#endif +#ifndef EINPROGRESS +#define EINPROGRESS WSAEINPROGRESS +#endif +#ifndef ENOTCONN +#define ENOTCONN WSAENOTCONN +#endif + /* * Maintain re-entrant nature by wrapping 'errno' */ From 9236c6f2f9eba2ccac06edc6db09f940da4ce74b Mon Sep 17 00:00:00 2001 From: Ethan Hugg Date: Sun, 7 Oct 2012 22:28:52 -0700 Subject: [PATCH 3/6] Bug 798873 - Signaling - increase max SDP size (temporary until better fix). r=jesup,ekr --- media/webrtc/signaling/src/sipcc/core/sdp/sdp.h | 2 +- media/webrtc/signaling/src/sipcc/core/sdp/sdp_attr.c | 6 ++++-- .../signaling/src/sipcc/core/sipstack/ccsip_sdp.c | 10 +++++----- .../signaling/src/sipcc/core/sipstack/h/ccsip_sdp.h | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/media/webrtc/signaling/src/sipcc/core/sdp/sdp.h b/media/webrtc/signaling/src/sipcc/core/sdp/sdp.h index 299b981a5931..91c3b62dffb2 100644 --- a/media/webrtc/signaling/src/sipcc/core/sdp/sdp.h +++ b/media/webrtc/signaling/src/sipcc/core/sdp/sdp.h @@ -53,7 +53,7 @@ #define SDP_CHOOSE_PARAM (-1) #define SDP_SESSION_LEVEL 0xFFFF -#define SDP_MAX_LEN 2048 +#define SDP_MAX_LEN 4096 #define UNKNOWN_CRYPTO_SUITE "UNKNOWN_CRYPTO_SUITE" #define AES_CM_128_HMAC_SHA1_32 "AES_CM_128_HMAC_SHA1_32" diff --git a/media/webrtc/signaling/src/sipcc/core/sdp/sdp_attr.c b/media/webrtc/signaling/src/sipcc/core/sdp/sdp_attr.c index dbdccace68f7..41309826d5dc 100644 --- a/media/webrtc/signaling/src/sipcc/core/sdp/sdp_attr.c +++ b/media/webrtc/signaling/src/sipcc/core/sdp/sdp_attr.c @@ -208,7 +208,8 @@ sdp_result_e sdp_build_attribute (sdp_t *sdp_p, u16 level, char **ptr, u16 len) result = sdp_attr[attr_p->type].build_func(sdp_p, attr_p, ptr, (u16)(endbuf_p - *ptr)); /* If we ran out of buffer space, though, we must error out */ - MOZ_ASSERT(endbuf_p - *ptr > 0); + /* FIX - re-enable this assert after we check the results from snprintfs in the build_funcs */ + /* MOZ_ASSERT(endbuf_p - *ptr > 0); */ if (endbuf_p - *ptr <= 0) return (SDP_POTENTIAL_SDP_OVERFLOW); @@ -3875,7 +3876,8 @@ sdp_result_e sdp_build_attr_cpar (sdp_t *sdp_p, sdp_attr_t *attr_p, result = sdp_attr[attr_p->type].build_func(sdp_p, attr_p, ptr, (u16)(endbuf_p - *ptr)); /* If we ran out of buffer space, though, we must error out */ - MOZ_ASSERT(endbuf_p - *ptr > 0); + /* FIX - re-enable this assert after we check the result from snprintf above */ + /* MOZ_ASSERT(endbuf_p - *ptr > 0); */ if (endbuf_p - *ptr <= 0) return (SDP_POTENTIAL_SDP_OVERFLOW); diff --git a/media/webrtc/signaling/src/sipcc/core/sipstack/ccsip_sdp.c b/media/webrtc/signaling/src/sipcc/core/sipstack/ccsip_sdp.c index 46522a73d7dd..81160a5b64a2 100644 --- a/media/webrtc/signaling/src/sipcc/core/sipstack/ccsip_sdp.c +++ b/media/webrtc/signaling/src/sipcc/core/sipstack/ccsip_sdp.c @@ -432,13 +432,13 @@ sipsdp_write_to_buf (cc_sdp_t *sdp_info, uint32_t *retbytes) sdp_get_result_name(rc)); if (rc == SDP_POTENTIAL_SDP_OVERFLOW) { - /* SDP may have been truncated. Issue a warning and continue. */ + /* SDP may have been truncated. Issue an extra warning and abort */ CCSIP_DEBUG_ERROR(SIP_F_PREFIX"Build SDP buffer overflow\n", fname); - } else { - cpr_free(buf); - *retbytes = 0; - return (NULL); } + + cpr_free(buf); + *retbytes = 0; + return (NULL); } /* diff --git a/media/webrtc/signaling/src/sipcc/core/sipstack/h/ccsip_sdp.h b/media/webrtc/signaling/src/sipcc/core/sipstack/h/ccsip_sdp.h index 523b1673cdc5..78a40dbd2104 100644 --- a/media/webrtc/signaling/src/sipcc/core/sipstack/h/ccsip_sdp.h +++ b/media/webrtc/signaling/src/sipcc/core/sipstack/h/ccsip_sdp.h @@ -47,7 +47,7 @@ #include "ccapi.h" // RAMC-start -#define CCSIP_SDP_BUF_SIZE 2048 +#define CCSIP_SDP_BUF_SIZE SDP_MAX_LEN /* SDP bitmask values */ #define CCSIP_SRC_SDP_BIT 0x1 From 778e4cc5ca5bd65af83e4bdee4daeecc7e6d9dc9 Mon Sep 17 00:00:00 2001 From: Gary Kwong Date: Mon, 8 Oct 2012 10:32:22 -0700 Subject: [PATCH 4/6] Bug 696305 - Suppress bug 799157, a new Valgrind error, probable regression. DONTBUILD --- build/valgrind/cross-architecture.sup | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build/valgrind/cross-architecture.sup b/build/valgrind/cross-architecture.sup index e70ea165a5e2..bb50643bfb6f 100644 --- a/build/valgrind/cross-architecture.sup +++ b/build/valgrind/cross-architecture.sup @@ -202,3 +202,9 @@ fun:_ZN22nsComponentManagerImpl17ManifestComponentERNS_25ManifestProcessingContextEiPKPc ... } +{ + Bug 799157 + Memcheck:Cond + fun:_ZN2js3ion5Range6updateEPKS1_ + ... +} From b68937dbbf18f8c22a18fd91a604d5696bbae762 Mon Sep 17 00:00:00 2001 From: Alex Keybl Date: Mon, 8 Oct 2012 10:57:38 -0700 Subject: [PATCH 5/6] Added tag FIREFOX_AURORA_18_BASE for changeset 2704e441363f --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 10ba2f40ef76..b23d2bf81f98 100644 --- a/.hgtags +++ b/.hgtags @@ -87,3 +87,4 @@ b6627f28b7ec17e1b46a594df0f780d3a40847e4 FIREFOX_AURORA_13_BASE 9697eadafa13b4e9233b39aaeecfeac79503cb54 FIREFOX_AURORA_16_BASE 6fdf9985acfe6f939da584b2559464ab22264fe7 FIREFOX_AURORA_16_BASE fd72dbbd692012224145be1bf13df1d7675fd277 FIREFOX_AURORA_17_BASE +2704e441363fe2a48e992dfac694482dfd82664a FIREFOX_AURORA_18_BASE From 5e5b54cfae0f2bed5e5466a885ac497715d7a860 Mon Sep 17 00:00:00 2001 From: Alex Keybl Date: Mon, 8 Oct 2012 11:01:15 -0700 Subject: [PATCH 6/6] Merging in version bump NO BUG --- b2g/confvars.sh | 2 +- browser/config/version.txt | 2 +- config/milestone.txt | 2 +- js/src/config/milestone.txt | 2 +- mobile/android/confvars.sh | 2 +- mobile/xul/confvars.sh | 2 +- services/sync/Makefile.in | 2 +- xpcom/components/Module.h | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/b2g/confvars.sh b/b2g/confvars.sh index 3d34540de2df..742f6779a9d5 100755 --- a/b2g/confvars.sh +++ b/b2g/confvars.sh @@ -5,7 +5,7 @@ MOZ_APP_BASENAME=B2G MOZ_APP_VENDOR=Mozilla -MOZ_APP_VERSION=18.0a1 +MOZ_APP_VERSION=19.0a1 MOZ_APP_UA_NAME=Firefox MOZ_UA_OS_AGNOSTIC=1 diff --git a/browser/config/version.txt b/browser/config/version.txt index 3ff4e4f5dac8..b160c362d9c9 100644 --- a/browser/config/version.txt +++ b/browser/config/version.txt @@ -1 +1 @@ -18.0a1 +19.0a1 diff --git a/config/milestone.txt b/config/milestone.txt index 668818598e13..38fef2842b1f 100644 --- a/config/milestone.txt +++ b/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -18.0a1 +19.0a1 diff --git a/js/src/config/milestone.txt b/js/src/config/milestone.txt index 668818598e13..38fef2842b1f 100644 --- a/js/src/config/milestone.txt +++ b/js/src/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -18.0a1 +19.0a1 diff --git a/mobile/android/confvars.sh b/mobile/android/confvars.sh index d505378bc974..52aec9b2fb2d 100755 --- a/mobile/android/confvars.sh +++ b/mobile/android/confvars.sh @@ -5,7 +5,7 @@ MOZ_APP_BASENAME=Fennec MOZ_APP_VENDOR=Mozilla -MOZ_APP_VERSION=18.0a1 +MOZ_APP_VERSION=19.0a1 MOZ_APP_UA_NAME=Firefox MOZ_BRANDING_DIRECTORY=mobile/android/branding/unofficial diff --git a/mobile/xul/confvars.sh b/mobile/xul/confvars.sh index ee7729ca2646..db71fc9ec1d1 100755 --- a/mobile/xul/confvars.sh +++ b/mobile/xul/confvars.sh @@ -5,7 +5,7 @@ MOZ_APP_BASENAME=Fennec MOZ_APP_VENDOR=Mozilla -MOZ_APP_VERSION=18.0a1 +MOZ_APP_VERSION=19.0a1 MOZ_BRANDING_DIRECTORY=mobile/xul/branding/unofficial MOZ_OFFICIAL_BRANDING_DIRECTORY=mobile/xul/branding/official diff --git a/services/sync/Makefile.in b/services/sync/Makefile.in index 04a74b6c55cb..72aa2cddb386 100644 --- a/services/sync/Makefile.in +++ b/services/sync/Makefile.in @@ -10,7 +10,7 @@ VPATH := @srcdir@ include $(DEPTH)/config/autoconf.mk # Definitions used by constants.js. -weave_version := 1.20.0 +weave_version := 1.21.0 weave_channel := rel weave_id := {340c2bbc-ce74-4362-90b5-7c26312808ef} diff --git a/xpcom/components/Module.h b/xpcom/components/Module.h index 1415e759523f..1a1f08fb4e87 100644 --- a/xpcom/components/Module.h +++ b/xpcom/components/Module.h @@ -21,7 +21,7 @@ namespace mozilla { */ struct Module { - static const unsigned int kVersion = 18; + static const unsigned int kVersion = 19; struct CIDEntry;