@@ -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 = $q . when ( config ) ;
@@ -1025,16 +1004,6 @@ function $HttpProvider() {
1025
1004
1026
1005
return promise ;
1027
1006
1028
- function transformResponse ( response ) {
1029
- // make a copy since the response must be cacheable
1030
- var resp = extend ( { } , response ) ;
1031
- resp . data = transformData ( response . data , response . headers , response . status ,
1032
- config . transformResponse ) ;
1033
- return ( isSuccess ( response . status ) )
1034
- ? resp
1035
- : $q . reject ( resp ) ;
1036
- }
1037
-
1038
1007
function executeHeaderFns ( headers , config ) {
1039
1008
var headerContent , processedHeaders = { } ;
1040
1009
@@ -1076,6 +1045,37 @@ function $HttpProvider() {
1076
1045
// execute if header value is a function for merged headers
1077
1046
return executeHeaderFns ( reqHeaders , shallowCopy ( config ) ) ;
1078
1047
}
1048
+
1049
+ function serverRequest ( config ) {
1050
+ var headers = config . headers ;
1051
+ var reqData = transformData ( config . data , headersGetter ( headers ) , undefined , config . transformRequest ) ;
1052
+
1053
+ // strip content-type if data is undefined
1054
+ if ( isUndefined ( reqData ) ) {
1055
+ forEach ( headers , function ( value , header ) {
1056
+ if ( lowercase ( header ) === 'content-type' ) {
1057
+ delete headers [ header ] ;
1058
+ }
1059
+ } ) ;
1060
+ }
1061
+
1062
+ if ( isUndefined ( config . withCredentials ) && ! isUndefined ( defaults . withCredentials ) ) {
1063
+ config . withCredentials = defaults . withCredentials ;
1064
+ }
1065
+
1066
+ // send request
1067
+ return sendReq ( config , reqData ) . then ( transformResponse , transformResponse ) ;
1068
+ }
1069
+
1070
+ function transformResponse ( response ) {
1071
+ // make a copy since the response must be cacheable
1072
+ var resp = extend ( { } , response ) ;
1073
+ resp . data = transformData ( response . data , response . headers , response . status ,
1074
+ config . transformResponse ) ;
1075
+ return ( isSuccess ( response . status ) )
1076
+ ? resp
1077
+ : $q . reject ( resp ) ;
1078
+ }
1079
1079
}
1080
1080
1081
1081
$http . pendingRequests = [ ] ;
0 commit comments