php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-26 01:18:19 +02:00
Code Issues Packages Projects Releases Wiki Activity
75,499 Commits 549 Branches 1,485 Tags
679fa1fc6854dce7d5d0ff7def65a5bbdbb18094
Commit Graph

32367 Commits

Author SHA1 Message Date
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
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