@@ -957,28 +957,7 @@ function $HttpProvider() {
957
957
config . headers = mergeHeaders ( requestConfig ) ;
958
958
config . method = uppercase ( config . method ) ;
959
959
config . paramSerializer = isString ( config . paramSerializer ) ?
960
- $injector . get ( config . paramSerializer ) : config . paramSerializer ;
961
-
962
- var serverRequest = function ( config ) {
963
- var headers = config . headers ;
964
- var reqData = transformData ( config . data , headersGetter ( headers ) , undefined , config . transformRequest ) ;
965
-
966
- // strip content-type if data is undefined
967
- if ( isUndefined ( reqData ) ) {
968
- forEach ( headers , function ( value , header ) {
969
- if ( lowercase ( header ) === 'content-type' ) {
970
- delete headers [ header ] ;
971
- }
972
- } ) ;
973
- }
974
-
975
- if ( isUndefined ( config . withCredentials ) && ! isUndefined ( defaults . withCredentials ) ) {
976
- config . withCredentials = defaults . withCredentials ;
977
- }
978
-
979
- // send request
980
- return sendReq ( config , reqData ) . then ( transformResponse , transformResponse ) ;
981
- } ;
960
+ $injector . get ( config . paramSerializer ) : config . paramSerializer ;
982
961
983
962
var chain = [ serverRequest , undefined ] ;
984
963
var promise = initiateOutstandingRequest ( config ) ;
@@ -1036,16 +1015,6 @@ function $HttpProvider() {
1036
1015
$browser . $$completeOutstandingRequest ( noop ) ;
1037
1016
}
1038
1017
1039
- function transformResponse ( response ) {
1040
- // make a copy since the response must be cacheable
1041
- var resp = extend ( { } , response ) ;
1042
- resp . data = transformData ( response . data , response . headers , response . status ,
1043
- config . transformResponse ) ;
1044
- return ( isSuccess ( response . status ) )
1045
- ? resp
1046
- : $q . reject ( resp ) ;
1047
- }
1048
-
1049
1018
function executeHeaderFns ( headers , config ) {
1050
1019
var headerContent , processedHeaders = { } ;
1051
1020
@@ -1087,6 +1056,37 @@ function $HttpProvider() {
1087
1056
// execute if header value is a function for merged headers
1088
1057
return executeHeaderFns ( reqHeaders , shallowCopy ( config ) ) ;
1089
1058
}
1059
+
1060
+ function serverRequest ( config ) {
1061
+ var headers = config . headers ;
1062
+ var reqData = transformData ( config . data , headersGetter ( headers ) , undefined , config . transformRequest ) ;
1063
+
1064
+ // strip content-type if data is undefined
1065
+ if ( isUndefined ( reqData ) ) {
1066
+ forEach ( headers , function ( value , header ) {
1067
+ if ( lowercase ( header ) === 'content-type' ) {
1068
+ delete headers [ header ] ;
1069
+ }
1070
+ } ) ;
1071
+ }
1072
+
1073
+ if ( isUndefined ( config . withCredentials ) && ! isUndefined ( defaults . withCredentials ) ) {
1074
+ config . withCredentials = defaults . withCredentials ;
1075
+ }
1076
+
1077
+ // send request
1078
+ return sendReq ( config , reqData ) . then ( transformResponse , transformResponse ) ;
1079
+ }
1080
+
1081
+ function transformResponse ( response ) {
1082
+ // make a copy since the response must be cacheable
1083
+ var resp = extend ( { } , response ) ;
1084
+ resp . data = transformData ( response . data , response . headers , response . status ,
1085
+ config . transformResponse ) ;
1086
+ return ( isSuccess ( response . status ) )
1087
+ ? resp
1088
+ : $q . reject ( resp ) ;
1089
+ }
1090
1090
}
1091
1091
1092
1092
$http . pendingRequests = [ ] ;
0 commit comments