php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-29 11:13:36 +02:00
Code Issues Packages Projects Releases Wiki Activity
75,431 Commits 549 Branches 1,486 Tags
fbd01eaecf5685911166f406a14a118acf345acf
Commit Graph

75431 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yasuo Ohgaki fbd01eaecf Merge branch 'PHP-5.5' 
* PHP-5.5:
  Add user contributed test. Bug #61748
 2013-08-02 09:54:51 +09:00
Yasuo Ohgaki 1c32b97bc3 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Add user contributed test. Bug #61748
 2013-08-02 09:52:50 +09:00
Yasuo Ohgaki cb13f8318b Add user contributed test. Bug #61748 2013-08-02 09:52:08 +09:00
Christopher Jones 9cd1ac7b61 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Clean up the 'generated' phar.inc file. When building outside the source tree the copied phar.inc needs to be removed, but when building in the tree, the file must remain since it is part of the source. See the copying logic in ext/phar/Makefile.frag.
 2013-08-01 09:22:47 -07:00
Christopher Jones d884ec15e9 Clean up the 'generated' phar.inc file. 
When building outside the source tree the copied phar.inc needs to be removed,
but when building in the tree, the file must remain since it is part of the source.
See the copying logic in ext/phar/Makefile.frag.
 2013-08-01 09:19:53 -07:00
Christopher Jones 1c91ca990f Merge branch 'PHP-5.5' 
* PHP-5.5:
  Revert "Allow 'make distclean' to clean up the 'generated' phar.inc"
 2013-08-01 08:49:19 -07:00
Christopher Jones 146b933ab4 Revert "Allow 'make distclean' to clean up the 'generated' phar.inc" 
This reverts commit 017145bc57.
 2013-08-01 08:47:13 -07:00
Christopher Jones 1f6b940dd1 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Use PHP's major version when cleaning up Apache .module files
  Allow 'make distclean' to clean up the 'generated' phar.inc
 2013-07-31 12:36:20 -07:00
Christopher Jones c069b5f571 Use PHP's major version when cleaning up Apache .module files 2013-07-31 12:35:10 -07:00
Christopher Jones 2ab080da2d Merge branch 'phardistclean' into PHP-5.5 
* phardistclean:
  Allow 'make distclean' to clean up the 'generated' phar.inc
 2013-07-31 12:34:28 -07:00
Christopher Jones 017145bc57 Allow 'make distclean' to clean up the 'generated' phar.inc 2013-07-31 12:31:50 -07:00
Christopher Jones 8bff800f6a Merge branch 'master' of https://git.php.net/repository/php-src 
* 'master' of https://git.php.net/repository/php-src:
  Constify streams API and a few other calls down the rabbit hole. (`char *` to `const char *` for parameters and few return values) In a few places int len moved to size_t len.
 2013-07-31 12:02:23 -07:00
Christopher Jones 7caea7d182 Clean generated OCI8 DTrace files in 'make distclean' 2013-07-31 12:01:35 -07:00
Christopher Jones d84fa9731a Merge branch 'PHP-5.5' 
* PHP-5.5:
  Give 'make distclean' some love. Clean files created by AC_OUTPUT, shell redirection etc.
 2013-07-31 11:50:57 -07:00
Christopher Jones 4ed18d5955 Give 'make distclean' some love. Clean files created by AC_OUTPUT, shell redirection etc. 2013-07-31 11:49:29 -07:00
Christopher Jones f5521a357a Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed bug #62691 (solaris sed has no -i switch) Make 'make distclean' remove generated DTrace .h file
 2013-07-31 10:00:05 -07:00
Christopher Jones e3a4b87e89 Fixed bug #62691 (solaris sed has no -i switch) 
Make 'make distclean' remove generated DTrace .h file
 2013-07-31 09:58:28 -07:00
Christopher Jones f3c3aa8a67 Merge branch 'master' of https://git.php.net/repository/php-src 
* 'master' of https://git.php.net/repository/php-src:
  Improved fix for bug #44686 (SOAP-ERROR: Parsing WSDL)
  Fixed bug #65018 (SoapHeader problems with SoapServer)
  Added opcache.restrict_api configuration directive that may limit usage of OPcahce API functions only to patricular script(s)
  MFH: fixed #65045: mb_convert_encoding breaks well-formed character.
  Fixed php-5.2 support
  added test script for bug65045.
  MFH: fixed #65045: mb_convert_encoding breaks well-formed character.
  Added support for glob symbols in blacklist entries (?, *, **)
  Fixed bug #65336
 2013-07-31 09:02:06 -07:00
Christopher Jones 0625d5ce67 Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5 
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Improved fix for bug #44686 (SOAP-ERROR: Parsing WSDL)
  Fixed bug #65018 (SoapHeader problems with SoapServer)
  Added opcache.restrict_api configuration directive that may limit usage of OPcahce API functions only to patricular script(s)
  MFH: fixed #65045: mb_convert_encoding breaks well-formed character.
  Fixed php-5.2 support
  added test script for bug65045.
  MFH: fixed #65045: mb_convert_encoding breaks well-formed character.
  Added support for glob symbols in blacklist entries (?, *, **)
  Fixed bug #65336
 2013-07-31 09:01:56 -07:00
Christopher Jones 4590070f31 Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4 
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Improved fix for bug #44686 (SOAP-ERROR: Parsing WSDL)
  Fixed bug #65018 (SoapHeader problems with SoapServer)
  MFH: fixed #65045: mb_convert_encoding breaks well-formed character.
 2013-07-31 09:01:54 -07:00
Dmitry Stogov e8b1739949 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Improved fix for bug #44686 (SOAP-ERROR: Parsing WSDL)
 2013-07-31 17:37:27 +04:00
Dmitry Stogov 5129892788 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Improved fix for bug #44686 (SOAP-ERROR: Parsing WSDL)
 2013-07-31 17:37:08 +04:00
Dmitry Stogov 4395f70207 Improved fix for bug #44686 (SOAP-ERROR: Parsing WSDL) 2013-07-31 17:36:06 +04:00
Dmitry Stogov 380e5d5d03 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed bug #65018 (SoapHeader problems with SoapServer)
  MFH: fixed #65045: mb_convert_encoding breaks well-formed character.
  Fixed bug #65336

Conflicts:
	NEWS
 2013-07-31 16:35:09 +04:00
Dmitry Stogov 35872e101b Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #65018 (SoapHeader problems with SoapServer)
  MFH: fixed #65045: mb_convert_encoding breaks well-formed character.
  Fixed bug #65336

Conflicts:
	NEWS
 2013-07-31 16:34:26 +04:00
Dmitry Stogov fd8f454520 Fixed bug #65018 (SoapHeader problems with SoapServer) 2013-07-31 16:32:26 +04:00
Dmitry Stogov e2a433fc5d Merge branch 'PHP-5.5' 
* PHP-5.5:
  Added opcache.restrict_api configuration directive that may limit usage of OPcahce API functions only to patricular script(s)
  added test script for bug65045.
  MFH: fixed #65045: mb_convert_encoding breaks well-formed character.

Conflicts:
	NEWS
 2013-07-31 14:24:30 +04:00
Dmitry Stogov d69b3d8f59 Added opcache.restrict_api configuration directive that may limit usage of OPcahce API functions only to patricular script(s) 2013-07-31 14:20:56 +04:00
Sara Golemon 2141f394d8 Merge branch 'pull-request/399' 2013-07-31 00:49:30 -07:00
Rui Hirokawa 0a974f14d1 MFH: fixed #65045: mb_convert_encoding breaks well-formed character. 2013-07-31 08:46:54 +09:00
Dmitry Stogov d9e2dc8084 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 
* 'PHP-5.5' of git.php.net:php-src:
  added test script for bug65045.
  MFH: fixed #65045: mb_convert_encoding breaks well-formed character.
 2013-07-31 03:24:04 +04:00
Dmitry Stogov a0fece5201 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed php-5.2 support
 2013-07-31 03:23:10 +04:00
Dmitry Stogov f3aca8bc4d Fixed php-5.2 support 2013-07-31 03:22:34 +04:00
Rui Hirokawa f14ed5bce0 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2013-07-31 08:18:51 +09:00
Rui Hirokawa 7da3315015 added test script for bug65045. 2013-07-31 08:18:39 +09:00
Rui Hirokawa c10d7e1afc MFH: fixed #65045: mb_convert_encoding breaks well-formed character. 2013-07-31 08:17:15 +09:00
Dmitry Stogov 2bd23530d8 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 
* 'PHP-5.5' of git.php.net:php-src:
 2013-07-31 03:04:48 +04:00
Dmitry Stogov fa041cb2f0 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  Remove tabs on blanklines in Makefile sources. This prevents a 'suspicious line' warning when editing & saving Makefile using Emacs.
 2013-07-31 03:04:22 +04:00
Dmitry Stogov 5338bbbf38 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Added support for glob symbols in blacklist entries (?, *, **)

Conflicts:
	NEWS
 2013-07-31 03:04:00 +04:00
Dmitry Stogov 02409669e4 Added support for glob symbols in blacklist entries (?, *, **) 2013-07-31 03:01:19 +04:00
Christopher Jones 3af80d7df3 Merge branch 'master' of https://git.php.net/repository/php-src 
* 'master' of https://git.php.net/repository/php-src:
  Improved implementation of NOP removal pass from O(n^2) to O(n) (hnw)
  A minor fix for configure outpu (Tony)
 2013-07-30 13:39:29 -07:00
Christopher Jones 8ca04e51aa Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5 
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Improved implementation of NOP removal pass from O(n^2) to O(n) (hnw)
  A minor fix for configure outpu (Tony)
 2013-07-30 13:39:20 -07:00
Christopher Jones 6af7526c77 Remove tabs on blanklines in Makefile sources. This prevents a 
'suspicious line' warning when editing & saving Makefile using Emacs.
 2013-07-30 13:36:10 -07:00
Dmitry Stogov 147d5241dc Merge branch 'PHP-5.5' 
* PHP-5.5:
  Improved implementation of NOP removal pass from O(n^2) to O(n) (hnw)
 2013-07-30 22:33:46 +04:00
Dmitry Stogov cb17c99511 Improved implementation of NOP removal pass from O(n^2) to O(n) (hnw) 2013-07-30 22:31:37 +04:00
Dmitry Stogov e831041c5a Merge branch 'PHP-5.5' 
* PHP-5.5:
  A minor fix for configure outpu (Tony)
 2013-07-30 22:04:55 +04:00
Dmitry Stogov e2aba1cf9e A minor fix for configure outpu (Tony) 2013-07-30 22:03:21 +04:00
Dmitry Stogov 0aa342e903 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed bug #65338 (Enabling both php_opcache and php_wincache AVs on shutdown).

Conflicts:
	NEWS
 2013-07-30 17:36:47 +04:00
Dmitry Stogov 3550f3d0aa Fixed bug #65338 (Enabling both php_opcache and php_wincache AVs on shutdown). 2013-07-30 17:35:19 +04:00
Andrey Hristov 92d27ccb05 Constify streams API and a few other calls down the rabbit hole. 
(`char *` to `const char *` for parameters and few return values)
In a few places int len moved to size_t len.
 2013-07-30 12:49:36 +02:00