@@ -228,7 +228,7 @@ function fetchCacheData(/** @type {IDBDatabase} */ db, fetch, data, onsuccess, o
228228#endif // ~FETCH_SUPPORT_INDEXEDDB
229229
230230function fetchXHR ( fetch , onsuccess , onerror , onprogress , onreadystatechange ) {
231- var url = HEAPU32 [ fetch + { { { C_STRUCTS . emscripten_fetch_t . url } } } >> 2 ] ;
231+ var url = { { { makeGetValue ( 'fetch' , C_STRUCTS . emscripten_fetch_t . url , '*' ) } } } ;
232232 if ( ! url ) {
233233#if FETCH_DEBUG
234234 dbg ( 'fetch: XHR failed, no URL specified!' ) ;
@@ -239,35 +239,26 @@ function fetchXHR(fetch, onsuccess, onerror, onprogress, onreadystatechange) {
239239 var url_ = UTF8ToString ( url ) ;
240240
241241 var fetch_attr = fetch + { { { C_STRUCTS . emscripten_fetch_t . __attributes } } } ;
242- var requestMethod = UTF8ToString ( fetch_attr ) ;
242+ var requestMethod = UTF8ToString ( { { { makeGetValue ( ' fetch_attr' , C_STRUCTS . emscripten_fetch_attr_t . requestMethod , '*' ) } } } ) ;
243243 if ( ! requestMethod ) requestMethod = 'GET' ;
244- var userData = { { { makeGetValue ( 'fetch_attr' , C_STRUCTS . emscripten_fetch_t . userData , '*' ) } } } ;
245- var fetchAttributes = { { { makeGetValue ( 'fetch_attr' , C_STRUCTS . emscripten_fetch_attr_t . attributes , 'u32' ) } } } ;
246244 var timeoutMsecs = { { { makeGetValue ( 'fetch_attr' , C_STRUCTS . emscripten_fetch_attr_t . timeoutMSecs , 'u32' ) } } } ;
247- var withCredentials = ! ! { { { makeGetValue ( 'fetch_attr' , C_STRUCTS . emscripten_fetch_attr_t . withCredentials , 'u8' ) } } } ;
248- var destinationPath = { { { makeGetValue ( 'fetch_attr' , C_STRUCTS . emscripten_fetch_attr_t . destinationPath , '*' ) } } } ;
249245 var userName = { { { makeGetValue ( 'fetch_attr' , C_STRUCTS . emscripten_fetch_attr_t . userName , '*' ) } } } ;
250246 var password = { { { makeGetValue ( 'fetch_attr' , C_STRUCTS . emscripten_fetch_attr_t . password , '*' ) } } } ;
251247 var requestHeaders = { { { makeGetValue ( 'fetch_attr' , C_STRUCTS . emscripten_fetch_attr_t . requestHeaders , '*' ) } } } ;
252248 var overriddenMimeType = { { { makeGetValue ( 'fetch_attr' , C_STRUCTS . emscripten_fetch_attr_t . overriddenMimeType , '*' ) } } } ;
253249 var dataPtr = { { { makeGetValue ( 'fetch_attr' , C_STRUCTS . emscripten_fetch_attr_t . requestData , '*' ) } } } ;
254250 var dataLength = { { { makeGetValue ( 'fetch_attr' , C_STRUCTS . emscripten_fetch_attr_t . requestDataSize , '*' ) } } } ;
255251
252+ var fetchAttributes = { { { makeGetValue ( 'fetch_attr' , C_STRUCTS . emscripten_fetch_attr_t . attributes , 'u32' ) } } } ;
256253 var fetchAttrLoadToMemory = ! ! ( fetchAttributes & { { { cDefs . EMSCRIPTEN_FETCH_LOAD_TO_MEMORY } } } ) ;
257254 var fetchAttrStreamData = ! ! ( fetchAttributes & { { { cDefs . EMSCRIPTEN_FETCH_STREAM_DATA } } } ) ;
258- #if FETCH_SUPPORT_INDEXEDDB
259- var fetchAttrPersistFile = ! ! ( fetchAttributes & { { { cDefs . EMSCRIPTEN_FETCH_PERSIST_FILE } } } ) ;
260- #endif
261- var fetchAttrAppend = ! ! ( fetchAttributes & { { { cDefs . EMSCRIPTEN_FETCH_APPEND } } } ) ;
262- var fetchAttrReplace = ! ! ( fetchAttributes & { { { cDefs . EMSCRIPTEN_FETCH_REPLACE } } } ) ;
263255 var fetchAttrSynchronous = ! ! ( fetchAttributes & { { { cDefs . EMSCRIPTEN_FETCH_SYNCHRONOUS } } } ) ;
264- var fetchAttrWaitable = ! ! ( fetchAttributes & { { { cDefs . EMSCRIPTEN_FETCH_WAITABLE } } } ) ;
265256
266257 var userNameStr = userName ? UTF8ToString ( userName ) : undefined ;
267258 var passwordStr = password ? UTF8ToString ( password ) : undefined ;
268259
269260 var xhr = new XMLHttpRequest ( ) ;
270- xhr . withCredentials = withCredentials ;
261+ xhr . withCredentials = ! ! { { { makeGetValue ( 'fetch_attr' , C_STRUCTS . emscripten_fetch_attr_t . withCredentials , 'u8' ) } } } ; ;
271262#if FETCH_DEBUG
272263 dbg ( 'fetch: xhr.timeout: ' + xhr . timeout + ', xhr.withCredentials: ' + xhr . withCredentials ) ;
273264 dbg ( 'fetch: xhr.open(requestMethod="' + requestMethod + '", url: "' + url_ + '", userName: ' + userNameStr + ', password: ' + passwordStr + ');' ) ;
@@ -449,13 +440,10 @@ function startFetch(fetch, successcb, errorcb, progresscb, readystatechangecb) {
449440 var onprogress = HEAPU32 [ fetch_attr + { { { C_STRUCTS . emscripten_fetch_attr_t . onprogress } } } >> 2 ] ;
450441 var onreadystatechange = HEAPU32 [ fetch_attr + { { { C_STRUCTS . emscripten_fetch_attr_t . onreadystatechange } } } >> 2 ] ;
451442 var fetchAttributes = HEAPU32 [ fetch_attr + { { { C_STRUCTS . emscripten_fetch_attr_t . attributes } } } >> 2 ] ;
452- var fetchAttrLoadToMemory = ! ! ( fetchAttributes & { { { cDefs . EMSCRIPTEN_FETCH_LOAD_TO_MEMORY } } } ) ;
453- var fetchAttrStreamData = ! ! ( fetchAttributes & { { { cDefs . EMSCRIPTEN_FETCH_STREAM_DATA } } } ) ;
454443#if FETCH_SUPPORT_INDEXEDDB
455444 var fetchAttrPersistFile = ! ! ( fetchAttributes & { { { cDefs . EMSCRIPTEN_FETCH_PERSIST_FILE } } } ) ;
456445 var fetchAttrNoDownload = ! ! ( fetchAttributes & { { { cDefs . EMSCRIPTEN_FETCH_NO_DOWNLOAD } } } ) ;
457446#endif
458- var fetchAttrAppend = ! ! ( fetchAttributes & { { { cDefs . EMSCRIPTEN_FETCH_APPEND } } } ) ;
459447 var fetchAttrReplace = ! ! ( fetchAttributes & { { { cDefs . EMSCRIPTEN_FETCH_REPLACE } } } ) ;
460448 var fetchAttrSynchronous = ! ! ( fetchAttributes & { { { cDefs . EMSCRIPTEN_FETCH_SYNCHRONOUS } } } ) ;
461449
0 commit comments