CDPP / AMDA_IHM

Commit 38ee7afc22ab5538e04016eaa968b4367f5b2014

Authored by Elena.Budnik
1 parent e0303530
Exists in master and in 111 other branches 10098, 10178, 5390, 6629, 6728, 6920, 7494, 7497, 7616, 8459, 8528, 8928, 9014, 9016Bis, 9017, 9049, 9084, 9259, 9326, 9345, 9505, 9660, 9750, 9750.bck, 9800, 9980, FER_10285, FER_10400, FER_10435, FER_10557, FER_10663, FER_10765, FER_10828, FER_10828_2, FER_10829, FER_10836, FER_10852, FER_10934, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_5119, FER_5165, FER_6265, FER_6860, FER_6899, FER_6951, FER_7618, FER_7862, FER_8455, FER_9629, FER_9660, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, akkodis/amdadev, alias, amdadev, amdadev_test, anr_tempete, catalog-histo, create-user, cu2022, data-activities, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, install-rework, master_vge, minimize, mlplasmas, multiplot, new-save-plot-request, openam, plot-request, plot-request-update, plot-tt-catalog, remoteData, rm_5118, rm_5776, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, save-plot, save-plot-request, shared-objects-updater, special-params, sum-components-indexes, test-merge, ws_get_catalog

correction of merge with master

Showing 1 changed file with 1 additions and 6 deletions   Show diff stats
Inline Side-by-side
php/config.php
  Diff comments   View file @38ee7af
... ... @@ -47,15 +47,10 @@ define('DDSERVICE_PRIVATEKEY', '!%p856Dc');
47 47 define('EPNTAP_APIS', 'http://voparis-tap.obspm.fr/__system__/tap/run/tap/sync');
48 48 define('EPNTAP_AMDA', 'http://cdpp-epntap.irap.omp.eu/__system__/tap/run/tap/sync');
49 49  
50   -<<<<<<< HEAD
51   -/*----------------------- PHP run-time settings --------*/
52   -ini_set('memory_limit', 128000000);
53   -ini_set('max_execution_time', 600); // max PHP execution
54   -=======
55 50 // PHP run-time settings
56 51 ini_set('memory_limit',128000000);
57 52 ini_set('max_execution_time',600); // max PHP execution
58   ->>>>>>> master
  53 +
59 54 ini_set('default_socket_timeout', 600); //TODO if this is needed ? IMPEX LONG DURATION WEBSERVICES
60 55 // to avoid 403 error while copying from URL
61 56 ini_set('user_agent', 'Mozilla/5.0 (X11; U; Linux i686; en-US; rv:7.0) Gecko/201001012 Firefox/7.0');
... ...