Skip to content
This repository was archived by the owner on Oct 2, 2019. It is now read-only.

Commit 7b3b746

Browse files
author
Dale Sikkema
committed
Merge tag 'release-1.12.15' into MAGETWO-42973-1-12-15
Zend Framework 1.12.15 - [582: Incorrect application of timeout option in curl http client adapter](zendframework#582) - [587: "Invalid header line detected" error if HTTP header value is empty](zendframework#587) - [591: ZF2015-06 fix broke the ZF on PHP 5.2](zendframework#591) - [593: fix typo in PHPDoc @throws annotation of Zend&zendframework#95;Registry::get()](zendframework#593) - [595: Removing annoying warning.](zendframework#595) - [597: Fix setting of CURLOPT&zendframework#95;TIMEOUT](zendframework#597) Conflicts: README.md library/Zend/Db/Select.php library/Zend/Service/DeveloperGarden/BaseUserService.php library/Zend/Service/DeveloperGarden/Client/ClientAbstract.php library/Zend/Service/DeveloperGarden/Client/Exception.php library/Zend/Service/DeveloperGarden/Client/Soap.php library/Zend/Service/DeveloperGarden/ConferenceCall.php library/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceSchedule.php library/Zend/Service/DeveloperGarden/ConferenceCall/Exception.php library/Zend/Service/DeveloperGarden/ConferenceCall/Participant.php library/Zend/Service/DeveloperGarden/ConferenceCall/ParticipantDetail.php library/Zend/Service/DeveloperGarden/ConferenceCall/ParticipantStatus.php library/Zend/Service/DeveloperGarden/Credential.php library/Zend/Service/DeveloperGarden/Exception.php library/Zend/Service/DeveloperGarden/IpLocation.php library/Zend/Service/DeveloperGarden/IpLocation/IpAddress.php library/Zend/Service/DeveloperGarden/LocalSearch.php library/Zend/Service/DeveloperGarden/LocalSearch/Exception.php library/Zend/Service/DeveloperGarden/LocalSearch/SearchParameters.php library/Zend/Service/DeveloperGarden/Request/ConferenceCall/AddConferenceTemplateParticipantRequest.php library/Zend/Service/DeveloperGarden/Request/ConferenceCall/CommitConferenceRequest.php library/Zend/Service/DeveloperGarden/Request/ConferenceCall/CreateConferenceRequest.php library/Zend/Service/DeveloperGarden/Request/ConferenceCall/CreateConferenceTemplateRequest.php library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceListRequest.php library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceStatusRequest.php library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateListRequest.php library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateParticipantRequest.php library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateRequest.php library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetParticipantStatusRequest.php library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetRunningConferenceRequest.php library/Zend/Service/DeveloperGarden/Request/ConferenceCall/NewParticipantRequest.php library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceRequest.php library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceTemplateParticipantRequest.php library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceTemplateRequest.php library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveParticipantRequest.php library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceRequest.php library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceTemplateParticipantRequest.php library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceTemplateRequest.php library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateParticipantRequest.php library/Zend/Service/DeveloperGarden/Request/Exception.php library/Zend/Service/DeveloperGarden/Request/IpLocation/LocateIPRequest.php library/Zend/Service/DeveloperGarden/Request/LocalSearch/LocalSearchRequest.php library/Zend/Service/DeveloperGarden/Request/SendSms/SendFlashSMS.php library/Zend/Service/DeveloperGarden/Request/SendSms/SendSMS.php library/Zend/Service/DeveloperGarden/Request/SendSms/SendSmsAbstract.php library/Zend/Service/DeveloperGarden/Request/SmsValidation/GetValidatedNumbers.php library/Zend/Service/DeveloperGarden/Request/SmsValidation/Invalidate.php library/Zend/Service/DeveloperGarden/Request/SmsValidation/SendValidationKeyword.php library/Zend/Service/DeveloperGarden/Request/SmsValidation/Validate.php library/Zend/Service/DeveloperGarden/Request/VoiceButler/CallStatus.php library/Zend/Service/DeveloperGarden/Request/VoiceButler/NewCall.php library/Zend/Service/DeveloperGarden/Request/VoiceButler/NewCallSequenced.php library/Zend/Service/DeveloperGarden/Request/VoiceButler/TearDownCall.php library/Zend/Service/DeveloperGarden/Request/VoiceButler/VoiceButlerAbstract.php library/Zend/Service/DeveloperGarden/Response/BaseType.php library/Zend/Service/DeveloperGarden/Response/BaseUserService/ChangeQuotaPoolResponse.php library/Zend/Service/DeveloperGarden/Response/BaseUserService/GetAccountBalanceResponse.php library/Zend/Service/DeveloperGarden/Response/BaseUserService/GetQuotaInformationResponse.php library/Zend/Service/DeveloperGarden/Response/ConferenceCall/AddConferenceTemplateParticipantResponse.php library/Zend/Service/DeveloperGarden/Response/ConferenceCall/AddConferenceTemplateParticipantResponseType.php library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CCSResponseType.php library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CommitConferenceResponse.php library/Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceResponse.php library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceResponseType.php library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceTemplateResponse.php library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceTemplateResponseType.php library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceListResponse.php library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceListResponseType.php library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceStatusResponse.php library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceStatusResponseType.php library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateListResponse.php library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateListResponseType.php library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateParticipantResponse.php library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateParticipantResponseType.php library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateResponse.php library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateResponseType.php library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetParticipantStatusResponse.php library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetParticipantStatusResponseType.php library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetRunningConferenceResponse.php library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetRunningConferenceResponseType.php library/Zend/Service/DeveloperGarden/Response/ConferenceCall/NewParticipantResponse.php library/Zend/Service/DeveloperGarden/Response/ConferenceCall/NewParticipantResponseType.php library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceResponse.php library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceTemplateParticipantResponse.php library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceTemplateResponse.php library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveParticipantResponse.php library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceResponse.php library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceTemplateParticipantResponse.php library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceTemplateResponse.php library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateParticipantResponse.php library/Zend/Service/DeveloperGarden/Response/Exception.php library/Zend/Service/DeveloperGarden/Response/IpLocation/CityType.php library/Zend/Service/DeveloperGarden/Response/IpLocation/GeoCoordinatesType.php library/Zend/Service/DeveloperGarden/Response/IpLocation/IPAddressLocationType.php library/Zend/Service/DeveloperGarden/Response/IpLocation/LocateIPResponse.php library/Zend/Service/DeveloperGarden/Response/IpLocation/LocateIPResponseType.php library/Zend/Service/DeveloperGarden/Response/IpLocation/RegionType.php library/Zend/Service/DeveloperGarden/Response/LocalSearch/LocalSearchResponse.php library/Zend/Service/DeveloperGarden/Response/LocalSearch/LocalSearchResponseType.php library/Zend/Service/DeveloperGarden/Response/ResponseAbstract.php library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/Exception.php library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/GetTokensResponse.php library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/SecurityTokenResponse.php library/Zend/Service/DeveloperGarden/Response/SendSms/SendFlashSMSResponse.php library/Zend/Service/DeveloperGarden/Response/SendSms/SendSMSResponse.php library/Zend/Service/DeveloperGarden/Response/SendSms/SendSmsAbstract.php library/Zend/Service/DeveloperGarden/Response/SmsValidation/GetValidatedNumbersResponse.php library/Zend/Service/DeveloperGarden/Response/SmsValidation/InvalidateResponse.php library/Zend/Service/DeveloperGarden/Response/SmsValidation/SendValidationKeywordResponse.php library/Zend/Service/DeveloperGarden/Response/SmsValidation/ValidateResponse.php library/Zend/Service/DeveloperGarden/Response/VoiceButler/CallStatus2Response.php library/Zend/Service/DeveloperGarden/Response/VoiceButler/CallStatusResponse.php library/Zend/Service/DeveloperGarden/Response/VoiceButler/NewCallResponse.php library/Zend/Service/DeveloperGarden/Response/VoiceButler/NewCallSequencedResponse.php library/Zend/Service/DeveloperGarden/Response/VoiceButler/TearDownCallResponse.php library/Zend/Service/DeveloperGarden/Response/VoiceButler/VoiceButlerAbstract.php library/Zend/Service/DeveloperGarden/SecurityTokenServer.php library/Zend/Service/DeveloperGarden/SecurityTokenServer/Cache.php library/Zend/Service/DeveloperGarden/SendSms.php library/Zend/Service/DeveloperGarden/SmsValidation.php library/Zend/Service/DeveloperGarden/VoiceCall.php library/Zend/Service/Technorati.php library/Zend/Service/Technorati/Author.php library/Zend/Service/Technorati/BlogInfoResult.php library/Zend/Service/Technorati/CosmosResult.php library/Zend/Service/Technorati/CosmosResultSet.php library/Zend/Service/Technorati/DailyCountsResult.php library/Zend/Service/Technorati/DailyCountsResultSet.php library/Zend/Service/Technorati/GetInfoResult.php library/Zend/Service/Technorati/Result.php library/Zend/Service/Technorati/ResultSet.php library/Zend/Service/Technorati/SearchResult.php library/Zend/Service/Technorati/SearchResultSet.php library/Zend/Service/Technorati/TagResult.php library/Zend/Service/Technorati/TagResultSet.php library/Zend/Service/Technorati/TagsResult.php library/Zend/Service/Technorati/TagsResultSet.php library/Zend/Service/Technorati/Utils.php library/Zend/Service/Technorati/Weblog.php library/Zend/Xml/Security.php tests/Zend/Xml/TestAsset/Security.php
2 parents 3a65a18 + c7d193c commit 7b3b746

File tree

288 files changed

+707
-36252
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

288 files changed

+707
-36252
lines changed

‎.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
language: php
22

3+
sudo: false
4+
35
php:
46
- 5.2
57
- 5.3

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
INFORMATION
22
===================
33

4-
This is a fork from Zend Framework 1.12.13 Release.
4+
This is a fork from Zend Framework 1.12.15 Release.
55

66
PURPOSE
77
---------------------------

‎documentation/manual/de/module_specs/Zend_Service.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
<listitem><para><link linkend="zend.service.recaptcha">ReCaptcha</link></para></listitem>
3636
<listitem><para><link linkend="zend.service.slideshare">SlideShare</link></para></listitem>
3737
<listitem><para><link linkend="zend.service.strikeiron">StrikeIron</link></para></listitem>
38-
<listitem><para><link linkend="zend.service.technorati">Technorati</link></para></listitem>
3938
<listitem><para><link linkend="zend.service.twitter">Twitter</link></para></listitem>
4039

4140
<listitem>

0 commit comments

Comments
 (0)