updated docs, binaries

Author: cshnik

build_curl.md

@@ -61,21 +61,13 @@ CURL_LFLAGS   = /nologo /out:$(DIRDIST)\bin\$(PROGRAM_NAME) /SUBSYSTEM:CONSOLE,5
 ## Compile
 1. Open the command prompt and enter the build directory:
 ```
-cd c:\php-sdk\extensions\curl\curl-7.50.3\winbuild
+cd c:\php-sdk\extensions
 ```
 2. Run:
 ```
-C:\php-sdk\phpdev\vc11\xXX\xpinitxXX.bat
+buildcurlXX.bat
 ```
-3. Run, for **x86**:
-```
-nmake /f Makefile.vc mode=static VC=11 USE_IDN=0 WITH_SSL=static WITH_DEVEL="..\..\..\phpdev\vc11\x86\deps"
-```
-4. Run, for **x64**:
-```
-nmake /f Makefile.vc mode=static VC=11 USE_IDN=0 WITH_SSL=static WITH_DEVEL="..\..\..\phpdev\vc11\x64\deps" MACHINE=x64
-```
-5. Destination folder for binaries:
+3. Destination folder for binaries:
 ```
 C:\php-sdk\extensions\curl-7.50.3\builds\libcurl-vc11-xXX-release-static-ipv6-sspi
 ```

build_php.md

@@ -377,18 +377,7 @@ TLSVar tls_tq_timer = {0};
 ```
 cd c:\php-sdk\phpdev\vc11\xXX
 ```
-2. Run: `buildphp.bat`
+2. Run: `buildphpXX.bat`
 3. Destination folder for binaries:
   * For **x86**: `C:\php-sdk\phpdev\vc11\x86\php-5.6.24-src\Release_TS`
   * For **x64**: `C:\php-sdk\phpdev\vc11\x64\php-5.6.24-src\x64\Release_TS`
-
-## VII. Compile for XDebug
-1. Open the command prompt and switch to the build directory:
-```
-cd c:\php-sdk\phpdev\vc11\xXX
-```
-2. Run: `buildphp-xdebug.bat`
-3. Destination folder for binaries:
-  * For **x86**: `C:\php-sdk\phpdev\vc11\x86\php-5.6.24-src\Release_TS`
-  * For **x64**: `C:\php-sdk\phpdev\vc11\x64\php-5.6.24-src\x64\Release_TS`
-

build_xdebug.md

@@ -102,7 +102,7 @@ static int poll(struct pollfd fds[], int nfds, int timeout)
 ```
 
 ## Compile
-1. Build PHP as described in **Compile for XDebug** section of [build_php.md](https://github.com/ProgerXP/php-5.6-xp/blob/master/build_php.md)
+1. Build PHP as described in [build_php.md](https://github.com/ProgerXP/php-5.6-xp/blob/master/build_php.md)
 2. Open the command prompt and switch to the build directory:
 ```
 cd c:\php-sdk\extensions

extensions/buildcurl64.bat

@@ -0,0 +1,5 @@
+cd curl-7.50.3\winbuild
+SET XPD_PHP_SRC=..\..\phpdev\vc11\x64\php-5.6.24-src
+call %XPD_PHP_SRC%\..\xpinitx64.bat
+nmake /f Makefile.vc mode=static VC=11 USE_IDN=0 WITH_SSL=static WITH_DEVEL="..\..\..\phpdev\vc11\x64\deps" MACHINE=x64
+cd ..\..

extensions/buildcurl86.bat

@@ -0,0 +1,5 @@
+cd curl-7.50.3\winbuild
+SET XPD_PHP_SRC=..\..\phpdev\vc11\x86\php-5.6.24-src
+call %XPD_PHP_SRC%\..\xpinitx86.bat
+nmake /f Makefile.vc mode=static VC=11 USE_IDN=0 WITH_SSL=static WITH_DEVEL="..\..\..\phpdev\vc11\x86\deps"
+cd ..\..

extensions/xdebug-2.5.5.patch

@@ -1,4 +1,3 @@
-Only in xdebug-2.5.5: buildxdebug.bat
 Only in xdebug-2.5.5: config.nice.bat
 Only in xdebug-2.5.5: configure.bat
 Only in xdebug-2.5.5: configure.js
@@ -7,7 +6,7 @@ Only in xdebug-2.5.5: Makefile.objects
 Only in xdebug-2.5.5: Release_TS
 diff -r -u xdebug-2.5.5-origin\xdebug.c xdebug-2.5.5\xdebug.c
 --- xdebug-2.5.5-origin\xdebug.c	Tue Jun 20 17:44:03 2017
-+++ xdebug-2.5.5\xdebug.c	Thu Nov 30 04:39:02 2017
++++ xdebug-2.5.5\xdebug.c	Wed Dec 27 02:55:06 2017
 @@ -37,7 +37,7 @@
  #endif
 
@@ -19,8 +18,16 @@ diff -r -u xdebug-2.5.5-origin\xdebug.c xdebug-2.5.5\xdebug.c
  #include "ext/standard/html.h"
 diff -r -u xdebug-2.5.5-origin\xdebug_com.c xdebug-2.5.5\xdebug_com.c
 --- xdebug-2.5.5-origin\xdebug_com.c	Tue Jun 20 17:44:03 2017
-+++ xdebug-2.5.5\xdebug_com.c	Thu Nov 30 01:44:40 2017
-@@ -49,6 +49,55 @@
++++ xdebug-2.5.5\xdebug_com.c	Wed Dec 27 22:00:13 2017
+@@ -41,7 +41,6 @@
+ # include <mstcpip.h>
+ # pragma comment (lib, "Ws2_32.lib")
+ # define PATH_MAX MAX_PATH
+-# define poll WSAPoll
+ #endif
+ 
+ #include "xdebug_private.h"
+@@ -49,6 +48,59 @@
 
  ZEND_EXTERN_MODULE_GLOBALS(xdebug)
 
@@ -43,42 +50,56 @@ diff -r -u xdebug-2.5.5-origin\xdebug_com.c xdebug-2.5.5\xdebug_com.c
 +#define POLLHUP     0x0002
 +#define POLLNVAL    0x0004
 +
-+#define WSAPoll(fd,nfd,t) poll(fd,nfd,t)
-+
-+// Original source:
-+// http://www.slac.stanford.edu/accel/ilc/codes/ATF2/control-software/epics-3.14.10/support/asyn/asyn-4-11/asyn/drvAsynSerial/drvAsynIPPort.c
-+/*
-+ * Use select() to simulate enough of poll() to get by.
-+ */
-+
 +static int poll(struct pollfd fds[], int nfds, int timeout)
 +{
-+    fd_set fdset;
++    int retval;
++    fd_set rset, wrset, exset;
 +    struct timeval tv, *ptv;
-+
-+    // assert(nfds == 1);
-+    FD_ZERO(&fdset);
-+    FD_SET(fds[0].fd,&fdset);
++    FD_ZERO(&rset);
++    FD_ZERO(&wrset);
++    FD_ZERO(&exset);
++    FD_SET(fds[0].fd, &rset);
++    FD_SET(fds[0].fd, &wrset);
++    FD_SET(fds[0].fd, &exset);
++    fds[0].revents = 0;
 +    if (timeout >= 0) {
 +        tv.tv_sec = timeout / 1000;
 +        tv.tv_usec = (timeout % 1000) * 1000;
 +        ptv = &tv;
 +    } else {
 +        ptv = NULL;
 +    }
-+    return select(fds[0].fd + 1,
-+        (fds[0].events & POLLIN) ? &fdset : NULL,
-+        (fds[0].events & POLLOUT) ? &fdset : NULL,
-+        NULL,
-+        ptv);
++    retval = select(0, &rset, &wrset, &exset, ptv);
++    if (retval == 1) {
++        if (FD_ISSET(fds[0].fd, &rset)) {
++            fds[0].revents |= POLLIN;
++        }
++        if (FD_ISSET(fds[0].fd, &wrset)) {
++            fds[0].revents |= POLLOUT;
++        }
++        if (FD_ISSET(fds[0].fd, &exset)) {
++            fds[0].revents |= POLLERR;
++        }
++    }
++    return retval;
 +}
 +
  int xdebug_create_socket(const char *hostname, int dport TSRMLS_DC)
  {
  	struct addrinfo            hints;
+@@ -159,7 +211,7 @@
+ 
+ #if WIN32|WINNT
+ 				errno = WSAGetLastError();
+-				if (errno == WSAEINPROGRESS || errno == WSAEWOULDBLOCK) {
++				if (errno == WSAEINPROGRESS) {
+ 					/* XXX introduce retry count? */
+ 					continue;
+ 				}
+Only in xdebug-2.5.5: xdebug_com.c.bak
 diff -r -u xdebug-2.5.5-origin\xdebug_handler_dbgp.c xdebug-2.5.5\xdebug_handler_dbgp.c
 --- xdebug-2.5.5-origin\xdebug_handler_dbgp.c	Tue Jun 20 17:44:03 2017
-+++ xdebug-2.5.5\xdebug_handler_dbgp.c	Thu Nov 30 04:39:06 2017
++++ xdebug-2.5.5\xdebug_handler_dbgp.c	Wed Dec 27 02:55:06 2017
 @@ -24,7 +24,7 @@
  #endif
 
@@ -90,7 +111,7 @@ diff -r -u xdebug-2.5.5-origin\xdebug_handler_dbgp.c xdebug-2.5.5\xdebug_handler
  #include "ext/standard/url.h"
 diff -r -u xdebug-2.5.5-origin\xdebug_superglobals.c xdebug-2.5.5\xdebug_superglobals.c
 --- xdebug-2.5.5-origin\xdebug_superglobals.c	Tue Jun 20 17:44:03 2017
-+++ xdebug-2.5.5\xdebug_superglobals.c	Thu Nov 30 04:39:09 2017
++++ xdebug-2.5.5\xdebug_superglobals.c	Wed Dec 27 02:55:06 2017
 @@ -21,7 +21,7 @@
  #include "xdebug_var.h"
  #include "xdebug_compat.h"

phpdev/vc11/x64/buildphp-xdebug.bat

@@ -1,3 +1,3 @@
-set INCLUDE=%ProgramFiles(x86)%\Microsoft SDKs\Windows\v7.1A\Include;%INCLUDE%
-set PATH=%ProgramFiles(x86)%\Microsoft SDKs\Windows\v7.1A\Bin;%PATH%
+set INCLUDE=%ProgramFiles(x86)%\Microsoft SDKs\Windows\v7.1A\Include;%INCLUDE%
+set PATH=%ProgramFiles(x86)%\Microsoft SDKs\Windows\v7.1A\Bin;%PATH%
 set LIB=%ProgramFiles(x86)%\Microsoft SDKs\Windows\v7.1A\Lib\x64;%LIB%

phpdev/vc11/x64/buildphp.bat phpdev/vc11/x64/buildphp64.bat

@@ -2,7 +2,7 @@ phpinfo()
 PHP Version => 5.6.24
 
 System => Windows NT HUMMER 6.1 build 7601 (Windows 7 Ultimate Edition Service Pack 1) AMD64
-Build Date => Nov 29 2017 23:02:42
+Build Date => Dec 27 2017 23:20:15
 Compiler => MSVC11 (Visual C++ 2012)
 Architecture => x64
 Configure Command => cscript /nologo configure.js  "--disable-all" "--enable-cli" "--with-curl" "--enable-calendar" "--enable-ctype" "--enable-fileinfo" "--enable-filter" "--with-gd" "--enable-hash" "--with-iconv" "--enable-json" "--enable-mbstring" "--with-mcrypt" "--with-mysqli" "--with-mysqlnd" "--with-openssl" "--enable-pdo" "--with-pdo-mysql" "--enable-session" "--enable-zlib" "--with-bz2" "--with-libxml" "--with-dom" "--enable-exif" "--with-gettext" "--with-gmp" "--with-mysql" "--with-pdo-pgsql" "--with-pgsql" "--with-pdo-sqlite" "--enable-phar" "--with-simplexml" "--enable-sockets" "--enable-tokenizer" "--with-sqlite3" "--with-xml" "--enable-xmlreader" "--enable-xmlwriter" "--enable-zip" "--with-xmlrpc" "--enable-apache2-4handler"
@@ -153,7 +153,7 @@ date/time support => enabled
 "Olson" Timezone Database Version => 2016.6
 Timezone Database => internal
 
-Warning: phpinfo(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected the timezone 'UTC' for now, but please set date.timezone to select your timezone. in C:\Work\git\php-5.6-xp\php-5.6.24-xp-x64-bin\phpinfo.php on line 2
+Warning: phpinfo(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected the timezone 'UTC' for now, but please set date.timezone to select your timezone. in C:\Work\git\php-5.6-xp\release\x64\phpinfo.php on line 2
 Default timezone => UTC
 
 Directive => Local Value => Master Value
@@ -181,7 +181,7 @@ Regex Library => Bundled library enabled
 exif
 
 EXIF Support => enabled
-EXIF Version => 1.4 $Id: bffe98d3a9e6c6ccc5a3881247b97a4dff781b15 $
+EXIF Version => 1.4 $Id: 5564de4b4a8fd6b32ae8bd44debf9f13b18c7768 $
 Supported EXIF Version => 0220
 Supported filetypes => JPEG,TIFF
 
@@ -196,7 +196,7 @@ exif.encode_unicode => ISO-8859-15 => ISO-8859-15
 filter
 
 Input Validation and Filtering => enabled
-Revision => $Id: da8df1bb3bb0938d3ce41928c41d0d7b9fb15b22 $
+Revision => $Id: 0a967738ca580e8bfdacb06853749743fc79b969 $
 
 Directive => Local Value => Master Value
 filter.default => unsafe_raw => unsafe_raw
@@ -235,7 +235,7 @@ MPIR version => 2.7.2
 hash
 
 hash support => enabled
-Hashing Engines => md2 md4 md5 sha1 sha224 sha256 sha384 sha512 ripemd128 ripemd160 ripemd256 ripemd320 whirlpool tiger128,3 tiger160,3 tiger192,3 tiger128,4 tiger160,4 tiger192,4 snefru snefru256 gost gost-crypto adler32 crc32 crc32b fnv132 fnv1a32 fnv164 fnv1a64 joaat haval128,3 haval160,3 haval192,3 haval224,3 haval256,3 haval128,4 haval160,4 haval192,4 haval224,4 haval256,4 haval128,5 haval160,5 haval192,5 haval224,5 haval256,5
+Hashing Engines => md2 md4 md5 sha1 sha224 sha256 sha384 sha512 ripemd128 ripemd160 ripemd256 ripemd320 whirlpool tiger128,3 tiger160,3 tiger192,3 tiger128,4 tiger160,4 tiger192,4 snefru snefru256 gost gost-crypto adler32 crc32 crc32b fnv132 fnv1a32 fnv164 fnv1a64 joaat haval128,3 haval160,3 haval192,3 haval224,3 haval256,3 haval128,4 haval160,4 haval192,4 haval224,4 haval256,4 haval128,5 haval160,5 haval192,5 haval224,5 haval256,5 
 
 iconv
 
@@ -287,8 +287,8 @@ mcrypt support => enabled
 mcrypt_filter support => enabled
 Version => 2.5.8
 Api No => 20021217
-Supported ciphers => cast-128 gost rijndael-128 twofish cast-256 loki97 rijndael-192 saferplus wake blowfish-compat des rijndael-256 serpent xtea blowfish enigma rc2 tripledes arcfour
-Supported modes => cbc cfb ctr ecb ncfb nofb ofb stream
+Supported ciphers => cast-128 gost rijndael-128 twofish cast-256 loki97 rijndael-192 saferplus wake blowfish-compat des rijndael-256 serpent xtea blowfish enigma rc2 tripledes arcfour 
+Supported modes => cbc cfb ctr ecb ncfb nofb ofb stream 
 
 Directive => Local Value => Master Value
 mcrypt.algorithms_dir => no value => no value
@@ -351,7 +351,7 @@ Tracing => n/a
 Loaded plugins => mysqlnd,debug_trace,auth_plugin_mysql_native_password,auth_plugin_mysql_clear_password
 API Extensions => mysql,mysqli,pdo_mysql
 
-mysqlnd statistics =>
+mysqlnd statistics =>  
 bytes_sent => 0
 bytes_received => 0
 packets_sent => 0
@@ -549,7 +549,7 @@ pdo_pgsql
 PDO Driver for PostgreSQL => enabled
 PostgreSQL(libpq) Version => 9.4.5
 Module version => 1.0.2
-Revision =>  $Id: 4261489546839c995e4a7d6fe4c015b505fcbb79 $
+Revision =>  $Id: 0e858dd2051ca8c2fd3c781909a0670ab5fecd36 $ 
 
 pdo_sqlite
 
@@ -579,7 +579,7 @@ Phar
 Phar: PHP Archive support => enabled
 Phar EXT version => 2.0.2
 Phar API version => 1.1.1
-SVN revision => $Id: 5c9332ae6a1bbfaff769679849f727f96a83cc89 $
+SVN revision => $Id: 14b80e175ed4d5bf11c890e1f30ea8225935b16c $
 Phar-based phar archives => enabled
 Tar-based phar archives => enabled
 ZIP-based phar archives => enabled
@@ -599,13 +599,13 @@ phar.require_hash => On => On
 Reflection
 
 Reflection => enabled
-Version => $Id: 13fa82dc7f81b596eaa69822751011bc4b8879c4 $
+Version => $Id: fbcf7a77ca8e3d4cd7501de8025235b947b8240f $
 
 session
 
 Session Support => enabled
-Registered save handlers => files user
-Registered serializer handlers => php_serialize php php_binary
+Registered save handlers => files user 
+Registered serializer handlers => php_serialize php php_binary 
 
 Directive => Local Value => Master Value
 session.auto_start => Off => Off
@@ -642,7 +642,7 @@ session.use_trans_sid => 0 => 0
 SimpleXML
 
 Simplexml support => enabled
-Revision => $Id: 81eb4d1df57a422dc4bcf9697a14ecf7f3dcb0fe $
+Revision => $Id: 07fc6546e896094aed794aea4691f0151774d955 $
 Schema support => enabled
 
 sockets
@@ -837,9 +837,9 @@ _SERVER["PHP_SELF"] => phpinfo.php
 _SERVER["SCRIPT_NAME"] => phpinfo.php
 _SERVER["SCRIPT_FILENAME"] => phpinfo.php
 _SERVER["PATH_TRANSLATED"] => phpinfo.php
-_SERVER["DOCUMENT_ROOT"] =>
-_SERVER["REQUEST_TIME_FLOAT"] => 1511972604.4414
-_SERVER["REQUEST_TIME"] => 1511972604
+_SERVER["DOCUMENT_ROOT"] => 
+_SERVER["REQUEST_TIME_FLOAT"] => 1514391887.4059
+_SERVER["REQUEST_TIME"] => 1514391887
 _SERVER["argv"] => Array
 (
     [0] => phpinfo.php
@@ -906,4 +906,3 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 If you did not receive a copy of the PHP license, or have any
 questions about PHP licensing, please contact license@php.net.
-