]> git.ipfire.org Git - thirdparty/freeswitch.git/log
thirdparty/freeswitch.git
13 years agoA line got deleted somewhere along the line. I didn't do it, honest.
Steve Underwood [Tue, 21 Aug 2012 12:09:59 +0000 (20:09 +0800)] 
A line got deleted somewhere along the line. I didn't do it, honest.
Its them damn gremlins.

13 years agoammendment to last commit
Anthony Minessale [Tue, 21 Aug 2012 05:39:56 +0000 (00:39 -0500)] 
ammendment to last commit

13 years agocache session threads and reuse them if possible
Anthony Minessale [Tue, 21 Aug 2012 05:14:43 +0000 (00:14 -0500)] 
cache session threads and reuse them if possible

13 years agoFS-4079 FS-4540 please update and test
Anthony Minessale [Tue, 21 Aug 2012 05:04:58 +0000 (00:04 -0500)] 
FS-4079 FS-4540 please update and test

13 years agomod_sangoma_codec: Remove debug message that is seldom needed anymore and
Moises Silva [Mon, 20 Aug 2012 22:39:04 +0000 (18:39 -0400)] 
mod_sangoma_codec: Remove debug message that is seldom needed anymore and
                   seems to be causing confusion and annoying users

13 years agoFS-4264: --resolve make sure directory exists
Michael Jerris [Mon, 20 Aug 2012 20:49:52 +0000 (16:49 -0400)] 
FS-4264: --resolve make sure directory exists

13 years agogit merge failure fixed. wrong side of the merge was kept in previous commit
William King [Mon, 20 Aug 2012 17:27:39 +0000 (10:27 -0700)] 
git merge failure fixed. wrong side of the merge was kept in previous commit

13 years agoOn accounting start and end properly error checking on new handle creation.
William King [Mon, 20 Aug 2012 17:23:54 +0000 (10:23 -0700)] 
On accounting start and end properly error checking on new handle creation.

13 years agoFS-4548 --resolve such a little patch for a big problem, good find
Anthony Minessale [Mon, 20 Aug 2012 17:11:17 +0000 (12:11 -0500)] 
FS-4548 --resolve such a little patch for a big problem, good find

13 years agoadd _preconfigured_t38_options as a back door for opal
Anthony Minessale [Mon, 20 Aug 2012 17:06:36 +0000 (12:06 -0500)] 
add _preconfigured_t38_options as a back door for opal

13 years agoFix sed pattern on OS X
Travis Cross [Mon, 20 Aug 2012 12:59:44 +0000 (12:59 +0000)] 
Fix sed pattern on OS X

OS X apparently doesn't support \W.

Thanks-to: Peter Olsson <peter.olsson@visionutveckling.se>
FS-4528 --resolve

13 years agoAdd sound/music debian packaging instructions
Travis Cross [Mon, 20 Aug 2012 08:18:02 +0000 (08:18 +0000)] 
Add sound/music debian packaging instructions

Tell people where to go to get the repository for building the
freeswitch-sounds-* and freeswitch-music-* Debian packages, as well as
what to read when they get there.

13 years agoAfter chasing down a few memory leaks that two of which were in the freeradius librar...
William King [Sun, 19 Aug 2012 06:11:54 +0000 (23:11 -0700)] 
After chasing down a few memory leaks that two of which were in the freeradius library, the result is more standardized memory cleanup.

13 years agobump revision
Ken Rice [Sat, 18 Aug 2012 15:20:42 +0000 (10:20 -0500)] 
bump revision

13 years agoFS-4542 --resolve ok if this causes any problems it should lead us back to this commit
Anthony Minessale [Fri, 17 Aug 2012 19:07:20 +0000 (14:07 -0500)] 
FS-4542 --resolve ok if this causes any problems it should lead us back to this commit

13 years agoFS-4079 FS-4540 new patch
Anthony Minessale [Fri, 17 Aug 2012 18:24:20 +0000 (13:24 -0500)] 
FS-4079 FS-4540 new patch

13 years agoFS-4526 --resolve
Jeff Lenk [Sat, 18 Aug 2012 00:46:54 +0000 (19:46 -0500)] 
FS-4526 --resolve

13 years agoFS-4543 --resolve thanks Peter
Jeff Lenk [Sat, 18 Aug 2012 00:31:47 +0000 (19:31 -0500)] 
FS-4543 --resolve thanks Peter

13 years agoFixed a typo in the fixed point image translate code
Steve Underwood [Fri, 17 Aug 2012 10:36:29 +0000 (18:36 +0800)] 
Fixed a typo in the fixed point image translate code

13 years agoFS-4525 --resolve
Anthony Minessale [Thu, 16 Aug 2012 18:34:14 +0000 (13:34 -0500)] 
FS-4525 --resolve

13 years agofix color coding to be OS appropriate
Anthony Minessale [Thu, 16 Aug 2012 18:04:33 +0000 (13:04 -0500)] 
fix color coding to be OS appropriate

13 years agoup date
Anthony Minessale [Thu, 16 Aug 2012 17:30:22 +0000 (12:30 -0500)] 
up date

13 years agoFS-4539 please test this and post new logs if necessary
Anthony Minessale [Thu, 16 Aug 2012 17:10:10 +0000 (12:10 -0500)] 
FS-4539 please test this and post new logs if necessary

13 years agorevert
Anthony Minessale [Thu, 16 Aug 2012 17:09:19 +0000 (12:09 -0500)] 
revert

13 years agoFS-4539 please test this and post new logs if necessary
Anthony Minessale [Thu, 16 Aug 2012 16:56:55 +0000 (11:56 -0500)] 
FS-4539 please test this and post new logs if necessary

13 years agoUpdated mod_opal to latest stable OPAL version.
Robert Jongbloed [Mon, 2 Jul 2012 03:38:31 +0000 (13:38 +1000)] 
Updated mod_opal to latest stable OPAL version.

Enhancements to trace logging, include threads and context ID.

Changed default opal_conf.xml to allow more than just G.711 uLaw and not to clutter log file with debug logs.

Added to opal_conf.xml item for "disable-transcoding".

Updated build/buildopal.sh to use correct ./configure items for PTLib, allow for something other than standard install directory for PTLib/OPAL and be able to easily bind to a specific release of PTLib/OPAL.

13 years agoFS-4079 FS-4540 please update to this version
Anthony Minessale [Thu, 16 Aug 2012 03:51:31 +0000 (22:51 -0500)] 
FS-4079 FS-4540 please update to this version

13 years agoAdding functionality to mod_xml_radius. Now you can do conditional accounting. And...
William King [Wed, 15 Aug 2012 21:52:02 +0000 (14:52 -0700)] 
Adding functionality to mod_xml_radius. Now you can do conditional accounting. And you can pull values from the other leg, specify an alternate variable name in case the variable doesn't exist and you can have default values.

13 years agoadd debug
Anthony Minessale [Wed, 15 Aug 2012 20:20:49 +0000 (15:20 -0500)] 
add debug

13 years agodebug lost read lock
Anthony Minessale [Wed, 15 Aug 2012 20:11:57 +0000 (15:11 -0500)] 
debug lost read lock

13 years agofix format
Anthony Minessale [Wed, 15 Aug 2012 17:15:09 +0000 (12:15 -0500)] 
fix format

13 years agoimprove parsing
Anthony Minessale [Wed, 15 Aug 2012 16:19:11 +0000 (11:19 -0500)] 
improve parsing

13 years agoFreeTDM: Add span start/stop callbacks to ftdm_io_interface.
Stefan Knoblich [Wed, 15 Aug 2012 11:19:38 +0000 (13:19 +0200)] 
FreeTDM: Add span start/stop callbacks to ftdm_io_interface.

Callbacks are invoked from ftdm_span_start/_stop().
I/O is started before SIG and shut down in reverse order.

This is needed for ftmod_misdn, to move the mISDN message handling
into a separate thread (solving the mISDN socket vs. FreeTDM API issues).

With these callbacks, the I/O thread can be started after the span I/O configuration
has been (successfully) completed and stopped before destroying the span.

NOTE: Both SIG and I/O callbacks are called with the span mutex locked,
so threads created or destroyed synchronously in either of the custom
start/stop functions, can not use ftdm_span_*() functions that lock
the span mutex (e.g. ftdm_span_get_channel_count()).

Signed-off-by: Stefan Knoblich <stkn@openisdn.net>
13 years agospandsp: Fix libjpeg checks for --enable-builtin-tiff builds.
Stefan Knoblich [Wed, 15 Aug 2012 10:52:28 +0000 (12:52 +0200)] 
spandsp: Fix libjpeg checks for --enable-builtin-tiff builds.

The --enable-builtin-tiff option appends libs/tiff-3.8.2/libtiff/libtiff.la
to LIBS, causing the AC_CHECK_LIB([jpeg]...) check to fail, because
libtiff.la does not exist at configure time.

Temporarily store tiff and jpeg libs in TIFF_-/JPEG_LIBS variables and
append them to LIBS after all library checks have run.

Example error output:
    configure:20049: checking for jpeg_start_compress in -ljpeg
    configure:20074: cc -o conftest -O2 -pipe -fno-strict-aliasing    -L/usr/local/lib conftest.c -ljpeg  -lm  /usr/home/ports/net/freeswitch-core-devel/work/freeswitch-1.2.1/libs/tiff-3.8.2/libtiff/libtiff.la >&5
    cc: /usr/home/ports/net/freeswitch-core-devel/work/freeswitch-1.2.1/libs/tiff-3.8.2/libtiff/libtiff.la: No such file or directory

Signed-off-by: Stefan Knoblich <stkn@openisdn.net>
13 years agoFix rtp payload number and possibly other params, since we ALWAYS use PCMU all params...
Seven Du [Wed, 15 Aug 2012 06:34:16 +0000 (14:34 +0800)] 
Fix rtp payload number and possibly other params, since we ALWAYS use PCMU all params should be hardcoded

13 years agoSTFU already
Brian West [Wed, 15 Aug 2012 02:10:43 +0000 (21:10 -0500)] 
STFU already

13 years agoFS-4079 revert 4ef9b3fe5622e417e8cd2916491e0058492a3bb7
Anthony Minessale [Tue, 14 Aug 2012 22:06:02 +0000 (17:06 -0500)] 
FS-4079 revert 4ef9b3fe5622e417e8cd2916491e0058492a3bb7

13 years agoadd email function to js
Anthony Minessale [Tue, 14 Aug 2012 16:10:21 +0000 (11:10 -0500)] 
add email function to js

13 years agoMerge branch 'master' of git.freeswitch.org:freeswitch
Steve Underwood [Tue, 14 Aug 2012 14:33:17 +0000 (22:33 +0800)] 
Merge branch 'master' of git.freeswitch.org:freeswitch

13 years agoImprovements to image translation
Steve Underwood [Tue, 14 Aug 2012 14:32:30 +0000 (22:32 +0800)] 
Improvements to image translation

13 years agoFreeSWITCH: Add WIN32 strerror_s() variant to custom switch_strerror_r() helper funct...
Stefan Knoblich [Tue, 14 Aug 2012 12:54:06 +0000 (14:54 +0200)] 
FreeSWITCH: Add WIN32 strerror_s() variant to custom switch_strerror_r() helper function and fix more strerror_r() users.

Convert mod_xml_cdr, mod_json_cdr and mod_conference to the new function.

Signed-off-by: Stefan Knoblich <stkn@openisdn.net>
13 years agoFreeSWITCH: Add switch_strerror_r() to fix problems with XSI and GNU variants of...
Stefan Knoblich [Tue, 14 Aug 2012 12:11:44 +0000 (14:11 +0200)] 
FreeSWITCH: Add switch_strerror_r() to fix problems with XSI and GNU variants of strerror_r().

GNU variant of strerror_r() returns char *, while the XSI version returns int.

To make things worse, glibc ships both and added a unused result warning
in recent versions (2.16) causing the build to fail.

Add our own custom wrapper that always returns a pointer to the message buffer
and additionally make XSI versions of strerror_r() GNU compatible by
returning "Unknown error xxx" if no error message is available.

Fixes:
    src/switch_rtp.c: In function 'rtp_common_read':
    src/switch_rtp.c:3313:15: error: ignoring return value of 'strerror_r',
    declared with attribute warn_unused_result [-Werror=unused-result]
    cc1: all warnings being treated as errors

Signed-off-by: Stefan Knoblich <stkn@openisdn.net>
13 years agoFS-4517 --resolve
Jeff Lenk [Tue, 14 Aug 2012 02:31:46 +0000 (21:31 -0500)] 
FS-4517 --resolve

13 years agoFS-4219 --resolve
Jeff Lenk [Tue, 14 Aug 2012 02:30:10 +0000 (21:30 -0500)] 
FS-4219 --resolve

13 years agoFixing issue with which xml pointer used. oops.
William King [Mon, 13 Aug 2012 21:45:37 +0000 (14:45 -0700)] 
Fixing issue with which xml pointer used. oops.

13 years agobuilding stub module
Anthony Minessale [Mon, 13 Aug 2012 20:50:52 +0000 (15:50 -0500)] 
building stub module

13 years agostub for mod_html5
Anthony Minessale [Mon, 13 Aug 2012 20:20:41 +0000 (15:20 -0500)] 
stub for mod_html5

13 years agolibwebsocket inline configure
Anthony Minessale [Mon, 13 Aug 2012 19:29:04 +0000 (14:29 -0500)] 
libwebsocket inline configure

13 years agofix libwebsocket build
Anthony Minessale [Mon, 13 Aug 2012 19:15:06 +0000 (14:15 -0500)] 
fix libwebsocket build

13 years agoFS-4079 new patch, please test
Anthony Minessale [Mon, 13 Aug 2012 18:48:06 +0000 (13:48 -0500)] 
FS-4079 new patch, please test

13 years agoAdd condition matching capability to only account for one or more subset of channel...
William King [Mon, 13 Aug 2012 04:13:01 +0000 (21:13 -0700)] 
Add condition matching capability to only account for one or more subset of channel directions to radius.

13 years agoMerge branch 'master' of git.freeswitch.org:freeswitch
Steve Underwood [Sun, 12 Aug 2012 14:12:06 +0000 (22:12 +0800)] 
Merge branch 'master' of git.freeswitch.org:freeswitch

13 years agoImprovements to T.4 end of image handling, and the related tests.
Steve Underwood [Sun, 12 Aug 2012 14:11:06 +0000 (22:11 +0800)] 
Improvements to T.4 end of image handling, and the related tests.
A lot of tiny tidy up edits

13 years agoadd chatExecute method to events so you can respond from chatplan in js
Anthony Minessale [Sat, 11 Aug 2012 23:34:42 +0000 (18:34 -0500)] 
add chatExecute method to events so you can respond from chatplan in js

13 years agoFix typo on rtp.c causing compiler error (FS-4511)
Moises Silva [Sat, 11 Aug 2012 20:19:11 +0000 (16:19 -0400)] 
Fix typo on rtp.c causing compiler error (FS-4511)

13 years agoVarious little tweaks
Steve Underwood [Sat, 11 Aug 2012 10:32:00 +0000 (18:32 +0800)] 
Various little tweaks
A bug in end of image handling fixed, which could mean some T.85 images would
screw up.

13 years agoadd javascript chatplan app
Anthony Minessale [Sat, 11 Aug 2012 01:12:20 +0000 (20:12 -0500)] 
add javascript chatplan app

13 years agoftmod_isdn: Avoid stack smashing buffer overflow in isdn_tones_run().
Stefan Knoblich [Fri, 10 Aug 2012 15:05:46 +0000 (17:05 +0200)] 
ftmod_isdn: Avoid stack smashing buffer overflow in isdn_tones_run().

The len variable can, in certain situations (large burst of incoming non-SLIN audio),
exceed the size of the on-stack frame buffer, which causes ftdm_buffer_read_loop() to
overwrite the dt_buffer pointer.

Use ftdm_min() to make sure len (after conversion to SLIN units) isn't larger
than the frame buffer size.

Also adds are couple more code comments.

Signed-off-by: Stefan Knoblich <stkn@openisdn.net>
13 years agomod_freetdm: Fix typo.
Stefan Knoblich [Wed, 8 Aug 2012 15:30:03 +0000 (17:30 +0200)] 
mod_freetdm: Fix typo.

Signed-off-by: Stefan Knoblich <stkn@openisdn.net>
13 years agoFS-4219 -- resolve windows version string. thanks Peter
Jeff Lenk [Fri, 10 Aug 2012 12:47:10 +0000 (07:47 -0500)] 
FS-4219 -- resolve windows version string. thanks Peter

13 years agoFS-4504 --resolve
Jeff Lenk [Fri, 10 Aug 2012 03:39:28 +0000 (21:39 -0600)] 
FS-4504 --resolve

13 years agofix build
Anthony Minessale [Thu, 9 Aug 2012 21:27:15 +0000 (16:27 -0500)] 
fix build

13 years agoFS-4504 vs2008 pro still need express
Jeff Lenk [Thu, 9 Aug 2012 18:42:21 +0000 (13:42 -0500)] 
FS-4504 vs2008 pro still need express

13 years agoadd apr stub to get the real OS socket
Michael Jerris [Thu, 9 Aug 2012 16:56:29 +0000 (11:56 -0500)] 
add apr stub to get the real OS socket

13 years agoAdd default configuration example to mod_speex/conf/autoload_configs
Christopher Rienzo [Thu, 9 Aug 2012 15:57:51 +0000 (15:57 +0000)] 
Add default configuration example to mod_speex/conf/autoload_configs

13 years agoFixed a misplaced #endif that only causes trouble when you hit the right
Steve Underwood [Thu, 9 Aug 2012 14:19:49 +0000 (22:19 +0800)] 
Fixed a misplaced #endif that only causes trouble when you hit the right
combination

13 years agoA couple of typos in spandsp
Steve Underwood [Thu, 9 Aug 2012 13:58:22 +0000 (21:58 +0800)] 
A couple of typos in spandsp
Improvements to image flattening in spandsp's image translate code

13 years agoFS-4504 vs2010 add libjpeg download dependency
Jeff Lenk [Thu, 9 Aug 2012 13:34:26 +0000 (08:34 -0500)] 
FS-4504 vs2010 add libjpeg download dependency

13 years agoFS-4504 vs2010 update x64 download settings for libjpeg
Jeff Lenk [Thu, 9 Aug 2012 13:31:12 +0000 (08:31 -0500)] 
FS-4504 vs2010 update x64 download settings for libjpeg

13 years agoFS-4504 - tweak
Jeff Lenk [Thu, 9 Aug 2012 02:29:06 +0000 (21:29 -0500)] 
FS-4504 - tweak

13 years agoFS-4504 vs2010 only - plus mod_sofia fix - anybody want to help with 2008
Jeff Lenk [Thu, 9 Aug 2012 02:18:06 +0000 (21:18 -0500)] 
FS-4504 vs2010 only -  plus mod_sofia fix - anybody want to help with 2008

13 years agoadd ws
Michael Jerris [Wed, 8 Aug 2012 22:05:01 +0000 (17:05 -0500)] 
add ws

13 years agoadd rtp endpoint contributed by sangoma
Anthony Minessale [Wed, 8 Aug 2012 19:46:38 +0000 (14:46 -0500)] 
add rtp endpoint contributed by sangoma

13 years agoFS-4505 --resolve
Anthony Minessale [Wed, 8 Aug 2012 15:08:29 +0000 (10:08 -0500)] 
FS-4505 --resolve

13 years agoFS-4507 --resolve
Anthony Minessale [Wed, 8 Aug 2012 14:59:36 +0000 (09:59 -0500)] 
FS-4507 --resolve

13 years agoFixed harmless typos in comments
Steve Underwood [Wed, 8 Aug 2012 13:31:45 +0000 (21:31 +0800)] 
Fixed harmless typos in comments

13 years agoMerge branch 'master' of git.freeswitch.org:freeswitch
Steve Underwood [Wed, 8 Aug 2012 13:26:47 +0000 (21:26 +0800)] 
Merge branch 'master' of git.freeswitch.org:freeswitch

13 years agoImage translate moves forward a little, towards colour support
Steve Underwood [Wed, 8 Aug 2012 13:26:06 +0000 (21:26 +0800)] 
Image translate moves forward a little, towards colour support

13 years agoTweaks
Steve Underwood [Wed, 8 Aug 2012 13:16:38 +0000 (21:16 +0800)] 
Tweaks

13 years agomissed this one
Daniel Swarbrick [Wed, 8 Aug 2012 12:14:54 +0000 (14:14 +0200)] 
missed this one

13 years agoMerge branch 'master' of ssh://git.freeswitch.org:222/freeswitch
Daniel Swarbrick [Wed, 8 Aug 2012 12:10:24 +0000 (14:10 +0200)] 
Merge branch 'master' of ssh://git.freeswitch.org:222/freeswitch

13 years agoCGI specifies that REQUEST_URI is relative to the root (and does not include scheme...
Daniel Swarbrick [Wed, 8 Aug 2012 12:08:31 +0000 (14:08 +0200)] 
CGI specifies that REQUEST_URI is relative to the root (and does not include scheme name, hostname, port)

13 years agoSomeone's been doing something odd to t30.h :-\
Steve Underwood [Wed, 8 Aug 2012 11:46:31 +0000 (19:46 +0800)] 
Someone's been doing something odd to t30.h :-\

13 years agoAdd param variable where needed.
William King [Wed, 8 Aug 2012 02:57:58 +0000 (21:57 -0500)] 
Add param variable where needed.

13 years agoFS-4079 try this
Anthony Minessale [Tue, 7 Aug 2012 22:23:01 +0000 (17:23 -0500)] 
FS-4079 try this

13 years agoWork around for compiler issues on centos
SwK [Tue, 7 Aug 2012 18:46:23 +0000 (14:46 -0400)] 
Work around for compiler issues on centos

13 years agoftmod_isdn: Fix channel state handling in NT mode w/ early disconnect.
Stefan Knoblich [Tue, 7 Aug 2012 15:20:18 +0000 (17:20 +0200)] 
ftmod_isdn: Fix channel state handling in NT mode w/ early disconnect.

In this particular case: NO_ROUTE_DESTINATION caused by missing context.

Signed-off-by: Stefan Knoblich <stkn@openisdn.net>
13 years agoftmod_isdn: Use ftdm_time_t for dialtone timeout.
Stefan Knoblich [Tue, 7 Aug 2012 13:57:40 +0000 (15:57 +0200)] 
ftmod_isdn: Use ftdm_time_t for dialtone timeout.

Signed-off-by: Stefan Knoblich <stkn@openisdn.net>
13 years agoAvoid quirky complaints about using the top bit of an integer as an enum
Steve Underwood [Tue, 7 Aug 2012 15:06:17 +0000 (23:06 +0800)] 
Avoid quirky complaints about using the top bit of an integer as an enum

13 years agoImprovements to dithering down colour and gray scale images to bi-level
Steve Underwood [Tue, 7 Aug 2012 14:34:32 +0000 (22:34 +0800)] 
Improvements to dithering down colour and gray scale images to bi-level
images, for images with different illuminants.

13 years agotypo
Anthony Minessale [Tue, 7 Aug 2012 14:03:02 +0000 (09:03 -0500)] 
typo

13 years agoFS-4487 --resolve
Anthony Minessale [Tue, 7 Aug 2012 12:35:41 +0000 (07:35 -0500)] 
FS-4487 --resolve

13 years agoFS-4487 revert 2ed9281d1966de2f71aae4fc15aace2948b740b3
Anthony Minessale [Tue, 7 Aug 2012 12:30:22 +0000 (07:30 -0500)] 
FS-4487 revert 2ed9281d1966de2f71aae4fc15aace2948b740b3

13 years agoFS-4352 --resolve alternate implementation as multiset to avoid regressions on set
Anthony Minessale [Tue, 7 Aug 2012 04:50:39 +0000 (23:50 -0500)] 
FS-4352 --resolve alternate implementation as multiset to avoid regressions on set

13 years agoFS-4348 --resolve
Anthony Minessale [Tue, 7 Aug 2012 03:34:31 +0000 (22:34 -0500)] 
FS-4348 --resolve

13 years agoFS-4487 --resolve
Anthony Minessale [Tue, 7 Aug 2012 03:30:34 +0000 (22:30 -0500)] 
FS-4487 --resolve

13 years agoFS-4501 try this
Anthony Minessale [Tue, 7 Aug 2012 00:38:56 +0000 (19:38 -0500)] 
FS-4501 try this

13 years agoFS-4493 does this work
Anthony Minessale [Mon, 6 Aug 2012 23:30:08 +0000 (18:30 -0500)] 
FS-4493 does this work

13 years agoFS-4079 please test
Anthony Minessale [Mon, 6 Aug 2012 21:12:03 +0000 (16:12 -0500)] 
FS-4079 please test

13 years agoFS-4499 --resolve this is a different fix but this will implicitly fix it
Anthony Minessale [Mon, 6 Aug 2012 16:20:27 +0000 (11:20 -0500)] 
FS-4499 --resolve this is a different fix but this will implicitly fix it