зеркало из https://github.com/mozilla/gecko-dev.git
Merge mozilla-central into mozilla-inbound
This commit is contained in:
Ehsan Akhgari
Коммит
ac82e1045c
1
.hgtags
1
.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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
18.0a1
|
||||
19.0a1
|
||||
|
|
|
|||
|
|
@ -202,3 +202,9 @@
|
|||
fun:_ZN22nsComponentManagerImpl17ManifestComponentERNS_25ManifestProcessingContextEiPKPc
|
||||
...
|
||||
}
|
||||
{
|
||||
Bug 799157
|
||||
Memcheck:Cond
|
||||
fun:_ZN2js3ion5Range6updateEPKS1_
|
||||
...
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,4 +10,4 @@
|
|||
# hardcoded milestones in the tree from these two files.
|
||||
#--------------------------------------------------------
|
||||
|
||||
18.0a1
|
||||
19.0a1
|
||||
|
|
|
|||
|
|
@ -10,4 +10,4 @@
|
|||
# hardcoded milestones in the tree from these two files.
|
||||
#--------------------------------------------------------
|
||||
|
||||
18.0a1
|
||||
19.0a1
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -42,6 +42,17 @@
|
|||
|
||||
#include <errno.h>
|
||||
|
||||
/* 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'
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ namespace mozilla {
|
|||
*/
|
||||
struct Module
|
||||
{
|
||||
static const unsigned int kVersion = 18;
|
||||
static const unsigned int kVersion = 19;
|
||||
|
||||
struct CIDEntry;
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче