@@ -228,7 +228,7 @@ function fetchCacheData(/** @type {IDBDatabase} */ db, fetch, data, onsuccess, o
228
228
#endif // ~FETCH_SUPPORT_INDEXEDDB
229
229
230
230
function 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 , '*' ) } } } ;
232
232
if ( ! url ) {
233
233
#if FETCH_DEBUG
234
234
dbg ( 'fetch: XHR failed, no URL specified!' ) ;
@@ -239,35 +239,26 @@ function fetchXHR(fetch, onsuccess, onerror, onprogress, onreadystatechange) {
239
239
var url_ = UTF8ToString ( url ) ;
240
240
241
241
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 , '*' ) } } } ) ;
243
243
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' ) } } } ;
246
244
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 , '*' ) } } } ;
249
245
var userName = { { { makeGetValue ( 'fetch_attr' , C_STRUCTS . emscripten_fetch_attr_t . userName , '*' ) } } } ;
250
246
var password = { { { makeGetValue ( 'fetch_attr' , C_STRUCTS . emscripten_fetch_attr_t . password , '*' ) } } } ;
251
247
var requestHeaders = { { { makeGetValue ( 'fetch_attr' , C_STRUCTS . emscripten_fetch_attr_t . requestHeaders , '*' ) } } } ;
252
248
var overriddenMimeType = { { { makeGetValue ( 'fetch_attr' , C_STRUCTS . emscripten_fetch_attr_t . overriddenMimeType , '*' ) } } } ;
253
249
var dataPtr = { { { makeGetValue ( 'fetch_attr' , C_STRUCTS . emscripten_fetch_attr_t . requestData , '*' ) } } } ;
254
250
var dataLength = { { { makeGetValue ( 'fetch_attr' , C_STRUCTS . emscripten_fetch_attr_t . requestDataSize , '*' ) } } } ;
255
251
252
+ var fetchAttributes = { { { makeGetValue ( 'fetch_attr' , C_STRUCTS . emscripten_fetch_attr_t . attributes , 'u32' ) } } } ;
256
253
var fetchAttrLoadToMemory = ! ! ( fetchAttributes & { { { cDefs . EMSCRIPTEN_FETCH_LOAD_TO_MEMORY } } } ) ;
257
254
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 } } } ) ;
263
255
var fetchAttrSynchronous = ! ! ( fetchAttributes & { { { cDefs . EMSCRIPTEN_FETCH_SYNCHRONOUS } } } ) ;
264
- var fetchAttrWaitable = ! ! ( fetchAttributes & { { { cDefs . EMSCRIPTEN_FETCH_WAITABLE } } } ) ;
265
256
266
257
var userNameStr = userName ? UTF8ToString ( userName ) : undefined ;
267
258
var passwordStr = password ? UTF8ToString ( password ) : undefined ;
268
259
269
260
var xhr = new XMLHttpRequest ( ) ;
270
- xhr . withCredentials = withCredentials ;
261
+ xhr . withCredentials = ! ! { { { makeGetValue ( 'fetch_attr' , C_STRUCTS . emscripten_fetch_attr_t . withCredentials , 'u8' ) } } } ; ;
271
262
#if FETCH_DEBUG
272
263
dbg ( 'fetch: xhr.timeout: ' + xhr . timeout + ', xhr.withCredentials: ' + xhr . withCredentials ) ;
273
264
dbg ( 'fetch: xhr.open(requestMethod="' + requestMethod + '", url: "' + url_ + '", userName: ' + userNameStr + ', password: ' + passwordStr + ');' ) ;
@@ -449,13 +440,10 @@ function startFetch(fetch, successcb, errorcb, progresscb, readystatechangecb) {
449
440
var onprogress = HEAPU32 [ fetch_attr + { { { C_STRUCTS . emscripten_fetch_attr_t . onprogress } } } >> 2 ] ;
450
441
var onreadystatechange = HEAPU32 [ fetch_attr + { { { C_STRUCTS . emscripten_fetch_attr_t . onreadystatechange } } } >> 2 ] ;
451
442
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 } } } ) ;
454
443
#if FETCH_SUPPORT_INDEXEDDB
455
444
var fetchAttrPersistFile = ! ! ( fetchAttributes & { { { cDefs . EMSCRIPTEN_FETCH_PERSIST_FILE } } } ) ;
456
445
var fetchAttrNoDownload = ! ! ( fetchAttributes & { { { cDefs . EMSCRIPTEN_FETCH_NO_DOWNLOAD } } } ) ;
457
446
#endif
458
- var fetchAttrAppend = ! ! ( fetchAttributes & { { { cDefs . EMSCRIPTEN_FETCH_APPEND } } } ) ;
459
447
var fetchAttrReplace = ! ! ( fetchAttributes & { { { cDefs . EMSCRIPTEN_FETCH_REPLACE } } } ) ;
460
448
var fetchAttrSynchronous = ! ! ( fetchAttributes & { { { cDefs . EMSCRIPTEN_FETCH_SYNCHRONOUS } } } ) ;
461
449
0 commit comments