clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-02 23:36:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
75,475 Commits 494 Branches 1,367 Tags 809 MiB
eb20966f75
Commit Graph

75475 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
169b78eb79 add news about session fix 2013-08-04 20:04:42 -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
Stanislav Malyshev
c620a51a32 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix typo
 2013-08-04 16:03:02 -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
b48f7e0c79 Merge commit '626d96a' 
* commit '626d96a':
  This doesn't fail in 5.5 anymore
 2013-08-03 12:15:28 -04:00
Rasmus Lerdorf
cadbec2fa0 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  Fix phar phpinfo test after markup changes
 2013-08-03 12:15:16 -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
Rasmus Lerdorf
0fce1b4f72 Merge commit '5753b74' 
* commit '5753b74':
  Make sure test.php isn't coming in from the include_path
 2013-08-02 11:48:07 -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
Michael Wallner
a8bc184207 fix generating config.nice 
Configure runs like:
$./configure -C CFLAGS="-ggdb" --enable-debug --prefix=$(pwd)/usr
did result in an empty config.nice

* allow single dash flags like -C, -s etc.
* allow passing evnironment variables as arguments
 2013-08-02 13:15:55 +02: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
Xinchen Hui
78673d1bad Merge branch 'PHP-5.5' 2013-08-02 18:39:58 +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
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