clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-02 15:26:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
75,681 Commits 494 Branches 1,367 Tags 807 MiB
e3619778c9
Commit Graph

32440 Commits

Author SHA1 Message Date
Yasuo Ohgaki
771b06f585 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed Bug #62015 Changed session.auto_start to PHP_INI_PERDIR. It is simply wrong and never worked if the value is changed at runtime
 2013-08-10 18:30:05 +09:00
Yasuo Ohgaki
9d95a1a7d1 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed Bug #62015 Changed session.auto_start to PHP_INI_PERDIR. It is simply wrong and never worked if the value is changed at runtime
 2013-08-10 18:29:29 +09:00
Yasuo Ohgaki
e9b128c1bf Fixed Bug #62015 Changed session.auto_start to PHP_INI_PERDIR. It is simply wrong and never worked if the value is changed at runtime 2013-08-10 18:29:13 +09:00
Yasuo Ohgaki
6941ce3583 Implemented Request #20421 (session_abort() and session_reset() function 2013-08-10 16:57:56 +09:00
Yasuo Ohgaki
54a42f0d0c Implemented Request #11100 (session_gc() function). 2013-08-10 15:20:24 +09:00
Yasuo Ohgaki
f2b5725115 Remove compile warning of commit 554021d21e 2013-08-10 14:35:30 +09:00
Yasuo Ohgaki
554021d21e Implemented Bug #17860 Suggestion: auto detect whether session changed 2013-08-10 13:56:32 +09:00
Yasuo Ohgaki
678ec30655 Implement Bug #54649 Create session_serializer_name() 2013-08-10 09:26:10 +09:00
Dmitry Stogov
2bc886abed Merge branch 'PHP-5.5' 
* PHP-5.5:
  Replce ZEND_FETCH_* instructions with IS_CV if possible

Conflicts:
	ext/opcache/Optimizer/zend_optimizer.c
 2013-08-09 17:52:22 +04:00
Dmitry Stogov
b27f6826d4 Replce ZEND_FETCH_* instructions with IS_CV if possible 2013-08-09 17:47:47 +04:00
Michael Wallner
7c3afd31f9 fix test 2013-08-09 13:30:29 +02:00
Michael Wallner
611122c22e Merge branch '2Guploads' 
* 2Guploads:
  add NEWS entry; add simple test
  more precise condition
  make this work in vc11 too
  Use int64_t and atoll() after discussion with johannes
  ws
  Patch for https://bugs.php.net/bug.php?id=44522 to allow uploading files above 2G.
  unify stdint type usage
 2013-08-09 11:47:25 +02:00
Michael Wallner
5cea7a9047 fix bug #65391 
Unable to send vary header user-agent when
ob_start('ob_gzhandler') is called
 2013-08-09 11:25:54 +02:00
Michael Wallner
b33824bfea Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix bug #65391
  Update NEWS
 2013-08-09 11:21:50 +02:00
Michael Wallner
ac28283beb fix bug #65391 
Unable to send vary header user-agent when
ob_start('ob_gzhandler') is called
 2013-08-09 11:14:04 +02:00
Yasuo Ohgaki
b6b425d2cf Fixed Bug #65315 session.hash_function silently fallback to default md5 2013-08-09 18:05:24 +09:00
Andrey Hristov
42dbc598dd Merge branch 'PHP-5.5' 2013-08-08 13:53:08 +02:00
Andrey Hristov
82a7ec72de add some tracing 2013-08-08 13:51:55 +02:00
Michael Wallner
14caf174ff unify stdint type usage 
if you need C99 stdint types, just include "php_stdint.h"
 2013-08-06 22:49:56 +02:00
Christopher Jones
4c3c9d1fe5 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix long-standing visual pain point: the misalignment of './configure help' text. Whitespace changes and a couple of grammar fixes.
 2013-08-06 11:09:12 -07:00
Christopher Jones
c6d977dd39 Fix long-standing visual pain point: the misalignment of './configure help' text. 
Whitespace changes and a couple of grammar fixes.
 2013-08-06 11:06:09 -07:00
Kalle Sommer Nielsen
cabf38af6d Merge branch 'PHP-5.4' 2013-08-05 17:23:00 +02:00
Kalle Sommer Nielsen
963c1be38d Merge branch 'PHP-5.5' 2013-08-05 17:16:05 +02:00
Kalle Sommer Nielsen
85b7e9f046 Check for NULL ptr from get_stream() before passing it on to php_stream_cast() 2013-08-05 16:58:37 +02:00
Yasuo Ohgaki
8f74384947 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed bug #62978. pg_select()/etc may allow SQL injection when table name is user parameter, users are able to control table names.
 2013-08-05 18:27:19 +09:00
Yasuo Ohgaki
cb8d1fc7f9 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #62978. pg_select()/etc may allow SQL injection when table name is user parameter, users are able to control table names.
 2013-08-05 18:24:07 +09:00
Yasuo Ohgaki
f718684a6c Fixed bug #62978. pg_select()/etc may allow SQL injection when table name is user parameter, users are able to control table names. 2013-08-05 18:23:15 +09:00
Stanislav Malyshev
eb20966f75 Merge branch 'PHP-5.5' 
* PHP-5.5:
  add news about session fix
  fix crash, enable session_id and fix test
  Strict session. Detect session id collision
  Strict session
 2013-08-04 20:05:17 -07:00
Stanislav Malyshev
6f73a0c00f Merge branch 'pr368' into PHP-5.5 
* pr368:
  fix crash, enable session_id and fix test
  Strict session. Detect session id collision
  Strict session
 2013-08-04 20:00:28 -07:00
Stanislav Malyshev
c9c53e0763 Merge branch 'PHP-5.5' 
* PHP-5.5:
  First fixes for a 64bit compatible ftp extension
 2013-08-04 19:36:29 -07:00
Stanislav Malyshev
7d3fa7d8b6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  First fixes for a 64bit compatible ftp extension
 2013-08-04 19:36:01 -07:00
Andreas Streichardt
a93a462dce First fixes for a 64bit compatible ftp extension 2013-08-04 19:31:30 -07:00
Stanislav Malyshev
f20d28a6b1 Fixed bug #63258 (seg fault with PDO and dblib using DBSETOPT(H->link, DBQUOTEDIDENT, 1)) 
The exists test should has covered this bug

Conflicts:

	ext/pdo_dblib/dblib_driver.c
 2013-08-04 19:19:37 -07:00
Stanislav Malyshev
1d6a136051 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix compiler warning, use longs for hashes
 2013-08-04 18:05:18 -07:00
Stanislav Malyshev
e4f9619fad fix compiler warning, use longs for hashes 2013-08-04 18:04:45 -07:00
Stanislav Malyshev
b80d73ce15 fix crash, enable session_id and fix test 2013-08-04 17:43:20 -07:00
Yasuo Ohgaki
82b0e8be99 Strict session. Detect session id collision 2013-08-04 16:36:53 -07:00
Yasuo Ohgaki
25e8fcc88f Strict session 2013-08-04 16:36:45 -07:00
Stanislav Malyshev
68e8326e0e Merge branch 'PHP-5.5' 
* PHP-5.5:
  non living code related typo fixes
 2013-08-04 16:07:13 -07:00
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
Rasmus Lerdorf
b48f7e0c79 Merge commit '626d96a' 
* commit '626d96a':
  This doesn't fail in 5.5 anymore
 2013-08-03 12:15:28 -04:00
Rasmus Lerdorf
626d96ab6d This doesn't fail in 5.5 anymore 2013-08-03 12:14:47 -04:00
Nikita Popov
43cbec0fa9 Fix phar phpinfo test after markup changes 2013-08-03 16:32:02 +02:00
Rasmus Lerdorf
9fa7e8932d Merge commit 'a03f094' 
* commit 'a03f094':
  We shouldn't load any local ini files for these tests
 2013-08-02 16:23:52 -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
4e90145932 Merge commit 'd60e168' 
* commit 'd60e168':
  pcre_quote? No such thing. How did this ever pass?
 2013-08-02 16:13:12 -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
c682f2f68a Merge commit 'ea75b1b' 
* commit 'ea75b1b':
  This test needs local infile enabled
 2013-08-02 15:33:49 -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
d69ec93428 Merge commit 'e55f08a' 
* commit 'e55f08a':
  This test will only work if gc is enabled
 2013-08-02 12:01:20 -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
Xinchen Hui
55d335fa95 Merge branch 'PHP-5.5' 2013-08-02 18:43:17 +08:00
Xinchen Hui
47ac4f8670 Fixed tests (inet_pton behaves differently on Darwin) 2013-08-02 18:43:08 +08:00
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
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
017145bc57 Allow 'make distclean' to clean up the 'generated' phar.inc 2013-07-31 12:31:50 -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
Sara Golemon
2141f394d8 Merge branch 'pull-request/399' 2013-07-31 00:49:30 -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
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
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
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
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
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
Anatol Belski
5e1ac558c3 make simplexml headers available to the outta world 2013-07-29 22:18:55 +02:00
Dmitry Stogov
294335761b Merge branch 'PHP-5.5' 
* PHP-5.5:
  Merge from GitHub
  Update NEWS
  Fixed bug #65336

Conflicts:
	NEWS
 2013-07-28 13:50:13 +04:00
Dmitry Stogov
ae5e70afac Merge from GitHub 2013-07-28 13:47:13 +04:00
Yasuo Ohgaki
d4aee1021e Fixed bug #65336 2013-07-27 05:55:02 +09:00
Yasuo Ohgaki
ef3d813d2c Fixed bug #65336 2013-07-27 05:54:33 +09:00
Yasuo Ohgaki
1d7b6970f2 Fixed bug #65336 2013-07-27 05:54:09 +09:00
Christopher Jones
85b66e9e21 OCI8 extension: Allow Implicit Result Set statement resources to inherit the parent's current prefetch count 2013-07-26 13:34:45 -07:00
Christopher Jones
586fc4909e Fix --enable-maintainer-zts mode in OCI8 2.0 2013-07-25 16:15:32 -07:00
Christopher Jones
fe98ffc227 Update UPGRADING and make typo fixes to OCI8 package.xml 2013-07-25 10:54:03 -07:00
Xinchen Hui
c49de17fe5 Merge branch 'PHP-5.5' 2013-07-25 22:46:21 +08:00