Skip to content
This repository was archived by the owner on Jan 17, 2023. It is now read-only.

Fix acceptable content types. #24

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 63 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
# Xcode
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore

## Build generated
build/
DerivedData/

## Various settings
*.pbxuser
!default.pbxuser
*.mode1v3
!default.mode1v3
*.mode2v3
!default.mode2v3
*.perspectivev3
!default.perspectivev3
xcuserdata/

## Other
*.moved-aside
*.xccheckout
*.xcscmblueprint

## Obj-C/Swift specific
*.hmap
*.ipa
*.dSYM.zip
*.dSYM

# CocoaPods
#
# We recommend against adding the Pods directory to your .gitignore. However
# you should judge for yourself, the pros and cons are mentioned at:
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
#
# Pods/

# Carthage
#
# Add this line if you want to avoid checking in source code from Carthage dependencies.
# Carthage/Checkouts

Carthage/Build

# fastlane
#
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
# screenshots whenever they are needed.
# For more information about the recommended setup visit:
# https://docs.fastlane.tools/best-practices/source-control/#source-control

fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots
fastlane/test_output

# Code Injection
#
# After new code Injection tools there's a generated folder /iOSInjectionProject
# https://github.com/johnno1962/injectionforxcode

iOSInjectionProject/
8 changes: 4 additions & 4 deletions AFJSONRPCClient.podspec
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
Pod::Spec.new do |s|
s.name = 'AFJSONRPCClient'
s.version = '2.1.1'
s.version = '2.1.2'
s.homepage = 'https://github.com/AFNetworking/AFJSONRPCClient'
s.social_media_url = "https://twitter.com/AFNetworking"
s.authors = { 'wiistriker' => 'wiistriker@gmail.com', 'Mattt Thompson' => 'm@mattt.me' }
s.license = 'MIT'
s.summary = 'A JSON-RPC client build on AFNetworking.'
s.source = { :git => 'https://github.com/AFNetworking/AFJSONRPCClient.git',
:tag => '2.1.1' }
s.source = { :git => 'https://github.com/zarochintsev/AFJSONRPCClient.git',
:tag => '2.1.2' }
s.source_files = 'AFJSONRPCClient'
s.requires_arc = true

s.ios.deployment_target = '6.0'
s.ios.deployment_target = '8.0'
s.osx.deployment_target = '10.8'

s.dependency 'AFNetworking', '~> 2.1'
2 changes: 1 addition & 1 deletion AFJSONRPCClient/AFJSONRPCClient.m
Original file line number Diff line number Diff line change
@@ -73,7 +73,7 @@ - (id)initWithEndpointURL:(NSURL *)URL {
self.requestSerializer = [AFJSONRequestSerializer serializer];
[self.requestSerializer setValue:@"application/json" forHTTPHeaderField:@"Accept"];

self.responseSerializer.acceptableContentTypes = [NSSet setWithObjects:@"application/json", @"application/json-rpc", @"application/jsonrequest", nil];
self.responseSerializer.acceptableContentTypes = [NSSet setWithObjects:@"application/json", @"application/json-rpc", @"application/jsonrequest", @"text/html", nil];

self.endpointURL = URL;