clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 23:06:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
72,895 Commits 494 Branches 1,367 Tags 802 MiB
41433a52d6
Commit Graph

72895 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatoliy Belsky
41433a52d6 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fixed build
  NEWS for bug #63893
 2013-01-15 22:40:31 +01:00
Anatoliy Belsky
18e160411e Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fixed build
  NEWS for bug #63893

Conflicts:
	NEWS
 2013-01-15 22:39:49 +01:00
Anatoliy Belsky
9498cf6194 fixed build 2013-01-15 22:36:29 +01:00
Lars Strojny
85a949d9d4 Merge branch 'PHP-5.5' 2013-01-15 22:12:09 +01:00
Jille Timmermans
dba22c0864 Dereferencing process-handles no longer waits on those processes. 
Implements FR #46487
 2013-01-15 21:50:35 +01:00
Gustavo Lopes
5466fd1866 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed inconsequential bug in strtr()
  UPGRADING.INTERNALS: document zend_qsort_r
  Add zend_qsort_r & use it in strtr
  NEWS for bug #63893
  Remove _GNU_SOURCE, add local heap sort
  The compiler can figure this out
  Remove unused block
  strtr() with 2nd param array - optimization
  Refactoring, bugs & leaks
  Optimize strtr w/ 2nd arg array
 2013-01-15 21:47:33 +01:00
Gustavo Lopes
1bd193ed36 Merge remote-tracking branch 'remotes/cataphract/strtr_wu94_55' into PHP-5.5 
* remotes/cataphract/strtr_wu94_55:
  Fixed inconsequential bug in strtr()
  UPGRADING.INTERNALS: document zend_qsort_r
  Add zend_qsort_r & use it in strtr
  NEWS for bug #63893
  Remove _GNU_SOURCE, add local heap sort
  The compiler can figure this out
  Remove unused block
  strtr() with 2nd param array - optimization
  Refactoring, bugs & leaks
  Optimize strtr w/ 2nd arg array
 2013-01-15 21:45:22 +01:00
Gustavo Lopes
4c38003dbd NEWS for bug #63893 2013-01-15 21:07:21 +01:00
Gustavo Lopes
93e35137aa Merge remote-tracking branch 'remotes/cataphract/strtr_wu94_54' into PHP-5.4 
* remotes/cataphract/strtr_wu94_54:
  Fixed inconsequential bug in strtr()
  Remove _GNU_SOURCE, add local heap sort
  The compiler can figure this out
  Remove unused block
  strtr() with 2nd param array - optimization
  Refactoring, bugs & leaks
  Optimize strtr w/ 2nd arg array
 2013-01-15 21:05:21 +01:00
Gustavo Lopes
88b82ae54d Merge branch 'strtr_wu94_54' into strtr_wu94_55 2013-01-15 17:26:24 +01:00
Gustavo Lopes
930ef9ddd6 Fixed inconsequential bug in strtr() 2013-01-15 17:25:59 +01:00
Andrey Hristov
9be02af4ef Merge branch 'PHP-5.5' 2013-01-15 12:21:22 +01:00
Andrey Hristov
5cfa916aad revert change. now it doesn't compile again...someone should fix ext/date... 2013-01-15 12:20:58 +01:00
Andrey Hristov
31f3f2d37d Merge branch 'PHP-5.5' 2013-01-15 12:20:24 +01:00
Andrey Hristov
acc24d1f9e Use two dtors thus allow allocation based on the alloc model of the 
connection.
 2013-01-15 12:19:52 +01:00
Andrey Hristov
69f010c99d Merge branch 'PHP-5.5' 2013-01-15 11:33:07 +01:00
Andrey Hristov
d377a266b2 plug a leak - forgot ot use the dtor already written 2013-01-15 11:32:44 +01:00
Andrey Hristov
0b0f87e822 Merge branch 'master' of ssh://git.php.net/php-src 2013-01-15 11:07:58 +01:00
Andrey Hristov
5718568830 Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5 2013-01-15 11:07:32 +01:00
Andrey Hristov
a7fc90703f Merge branch 'PHP-5.5' 2013-01-15 11:07:08 +01:00
Andrey Hristov
22ba2b95ce Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	NEWS
 2013-01-15 11:06:59 +01:00
Adam Harvey
ef86530a56 Revert "Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa." 
This reverts commit 0510701474.
 2013-01-15 17:40:30 +08:00
Adam Harvey
cab290d2ad Revert "Update fputcsv() to escape all characters equally." 
On second thoughts, while the behaviour _is_ broken, this isn't the right fix.

This reverts commit 9b5cb0e805.
 2013-01-15 17:40:30 +08:00
Adam Harvey
40c1122dcc Revert "Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa." 
This reverts commit 0510701474.
 2013-01-15 17:40:23 +08:00
Adam Harvey
232cf4a640 Revert "Update fputcsv() to escape all characters equally." 
On second thoughts, while the behaviour _is_ broken, this isn't the right fix.

This reverts commit 9b5cb0e805.
 2013-01-15 17:40:23 +08:00
Andrey Hristov
c77fe090ea Merge branch 'master' of ssh://git.php.net/php-src 
Conflicts:
	NEWS
 2013-01-15 10:40:15 +01:00
Adam Harvey
83864b470b Revert "Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa." 
This reverts commit 0510701474.
 2013-01-15 17:37:21 +08:00
Adam Harvey
b1bf524140 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Revert "Update fputcsv() to escape all characters equally."
 2013-01-15 17:35:34 +08:00
Adam Harvey
c077074c13 Revert "Update fputcsv() to escape all characters equally." 
On second thoughts, while the behaviour _is_ broken, this isn't the right fix.

This reverts commit 9b5cb0e805.
 2013-01-15 17:33:54 +08:00
Andrey Hristov
c4fe37bd8c Merge branch 'PHP-5.5' 
Conflicts:
	NEWS
 2013-01-15 10:12:54 +01:00
Andrey Hristov
dc495bbe95 Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5 2013-01-15 10:05:54 +01:00
Andrey Hristov
1ff4352263 Add support for connect attributes, as of MySQL 5.6 2013-01-15 10:04:59 +01:00
Lars Strojny
9d88c8d904 Merge branch 'PHP-5.5' 2013-01-15 09:35:47 +01:00
Lars Strojny
eb40f73ca0 Bug #62489: dba_insert not working as expected 2013-01-15 09:30:44 +01:00
Stanislav Malyshev
c3a63f580c Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix NEWS
 2013-01-15 00:08:44 -08:00
Stanislav Malyshev
6dc80f080e Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix NEWS
 2013-01-15 00:08:29 -08:00
Stanislav Malyshev
374ebc8741 fix NEWS 2013-01-15 00:08:12 -08:00
Stanislav Malyshev
71330a771d Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix NEWS
 2013-01-15 00:07:22 -08:00
Stanislav Malyshev
10cd61386e Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix NEWS
 2013-01-15 00:07:07 -08:00
Stanislav Malyshev
643e7a54ec fix NEWS 2013-01-15 00:06:35 -08:00
Adam Harvey
587ea700cd Merge branch 'PHP-5.5' 
* PHP-5.5:
  Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa.
 2013-01-15 15:52:12 +08:00
Adam Harvey
8bf937f9bf Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa.
 2013-01-15 15:50:57 +08:00
Adam Harvey
0510701474 Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa. 2013-01-15 15:49:52 +08:00
Xinchen Hui
0b5e833db8 Merge branch 'PHP-5.5' 2013-01-15 15:34:10 +08:00
Xinchen Hui
4fa5c1d22d Merge branch 'PHP-5.4' into PHP-5.5 2013-01-15 15:33:26 +08:00
Xinchen Hui
3bc7490370 Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 2013-01-15 15:32:42 +08:00
Xinchen Hui
4fcf4e0845 Fixed bug #57702 (Multi-row BLOB fetches) 2013-01-15 15:31:49 +08:00
Adam Harvey
1794ef4736 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Update fputcsv() to escape all characters equally.
 2013-01-15 15:26:50 +08:00
Adam Harvey
ba32970710 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Update fputcsv() to escape all characters equally.
 2013-01-15 15:26:25 +08:00
Adam Harvey
a4191b0aad Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Update fputcsv() to escape all characters equally.
 2013-01-15 15:24:21 +08:00