mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-23 18:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity
74,348 Commits 500 Branches 1,381 Tags 796 MiB
c793a65690
Commit Graph

74348 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stanislav Malyshev
c793a65690 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  non living code related typo fixes

Conflicts:
	Zend/zend_compile.c
 2013-08-04 16:06:24 -07:00
Veres Lajos
8d86597d73 non living code related typo fixes 2013-08-04 16:05:36 -07:00
Stanislav Malyshev
3626db6142 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix typo
 2013-08-04 16:02:53 -07:00
Stanislav Malyshev
5f137d080a fix typo 2013-08-04 16:02:27 -07:00
Rasmus Lerdorf
626d96ab6d This doesn't fail in 5.5 anymore 2013-08-03 12:14:47 -04:00
Rasmus Lerdorf
f17f596b27 Merge commit 'a03f094' into PHP-5.5 
* commit 'a03f094':
  We shouldn't load any local ini files for these tests
 2013-08-02 16:23:44 -04:00
Rasmus Lerdorf
a03f0943ca We shouldn't load any local ini files for these tests 2013-08-02 16:23:18 -04:00
Rasmus Lerdorf
d24f31c65e Merge commit 'd60e168' into PHP-5.5 
* commit 'd60e168':
  pcre_quote? No such thing. How did this ever pass?
 2013-08-02 16:13:03 -04:00
Rasmus Lerdorf
d60e168a7a pcre_quote? No such thing. How did this ever pass? 2013-08-02 16:12:21 -04:00
Rasmus Lerdorf
9ca7910661 Merge commit 'ea75b1b' into PHP-5.5 
* commit 'ea75b1b':
  This test needs local infile enabled
 2013-08-02 15:33:40 -04:00
Rasmus Lerdorf
ea75b1b5db This test needs local infile enabled 2013-08-02 15:33:18 -04:00
Rasmus Lerdorf
3d0aca80f2 Merge commit 'e55f08a' into PHP-5.5 
* commit 'e55f08a':
  This test will only work if gc is enabled
 2013-08-02 12:01:12 -04:00
Rasmus Lerdorf
e55f08a5ae This test will only work if gc is enabled 2013-08-02 12:00:48 -04:00
Rasmus Lerdorf
a85e71e655 Merge commit '5753b74' into PHP-5.5 
* commit '5753b74':
  Make sure test.php isn't coming in from the include_path
 2013-08-02 11:47:52 -04:00
Rasmus Lerdorf
5753b74fab Make sure test.php isn't coming in from the include_path 2013-08-02 11:47:12 -04:00
Xinchen Hui
47ac4f8670 Fixed tests (inet_pton behaves differently on Darwin) 2013-08-02 18:43:08 +08:00
Xinchen Hui
6f1a762fab Update NEWS 2013-08-02 18:39:41 +08:00
Xinchen Hui
1e942dde24 Merge branch 'PHP-5.4' into PHP-5.5 2013-08-02 18:39:18 +08:00
Xinchen Hui
ce9169e360 Fixed bug Bug #65372 (Segfault in gc_zval_possible_root when return reference fails) 2013-08-02 18:37:15 +08: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
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
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
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
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
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
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
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
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
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
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
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
02409669e4 Added support for glob symbols in blacklist entries (?, *, **) 2013-07-31 03:01:19 +04: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
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
e2aba1cf9e A minor fix for configure outpu (Tony) 2013-07-30 22:03:21 +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
Dmitry Stogov
ae5e70afac Merge from GitHub 2013-07-28 13:47:13 +04:00
Yasuo Ohgaki
bafe0e5399 Update NEWS 2013-07-27 05:54:33 +09:00
Yasuo Ohgaki
ef3d813d2c Fixed bug #65336 2013-07-27 05:54:33 +09:00