Merge branch 'PHP_5_5' into PHP_5_6

Conflicts:
	php.spec

diff --cc php.spec
index 84f3a68190c48e4303bcd6787c9e8dabd1091a64,73d2fb85d8c3b3112359a24e5b6aafa732c3c195..cebc18be1e43ca6101083007574c98aeae828296
--- 1/php.spec
--- 2/php.spec
+++ b/php.spec
@@@ -319,9 -294,10 +303,10 @@@ BuildRoot:       %{tmpdir}/%{name}-%{version}
  %define               _sysconfdir                     %{php_sysconfdir}
  
  # must be in sync with source. extra check ensuring that it is so is done in %%build
 -%define               php_api_version         20121113
 -%define               zend_module_api         20121212
 -%define               zend_extension_api      220121212
 +%define               php_api_version         20131106
 +%define               zend_module_api         20131226
 +%define               zend_extension_api      220131226
+ %define               php_pdo_api_version     20080721
  
  # Extension versions
  %define               bz2ver          1.0
@@@ -333,10 -309,9 +318,10 @@@
  %define               opcachever      7.0.4-dev
  %define               pharver         2.0.2
  %define               sqlite3ver      0.7-dev
 -%define               zipver          1.11.0
 +%define               zipver          1.12.4
 +%define               phpdbgver       0.4.0
  
- %define               zend_zts                %{!?with_zts:0}%{?with_zts:1}
+ %define               _zend_zts               %{!?with_zts:0}%{?with_zts:1}
  %define               php_debug               %{!?debug:0}%{?debug:1}
  
  %if %{with gcov}
@@@ -2118,12 -2170,6 +2196,12 @@@ if test "$ver" != "%{opcachever}"; the
        : Update the opcachever macro and rebuild.
        exit 1
  fi
-       : Update the opcachever macro and rebuild.
 +ver=$(sed -n '/#define PHPDBG_VERSION /{s/.* "//;s/".*$//;p}' sapi/phpdbg/phpdbg.h)
 +if test "$ver" != "%{phpdbgver}"; then
 +      : Error: Upstream phpdbg version is now ${ver}, expecting %{phpdbgver}.
++      : Update the phpdbgver macro and rebuild.
 +      exit 1
 +fi
  ver=$(sed -rne 's,.*<version>(.+)</version>,\1,p' ext/bz2/package.xml)
  if test "$ver" != "%{bz2ver}"; then
        : Error: Upstream BZIP2 version is now ${ver}, expecting %{bz2ver}.